-oxm.apiVersion=v14\r
-oxm.apiVersionList=v10,v11,v12,v13,v14\r
-\r
-oxm.schemaServiceTranslatorList=config\r
-oxm.schemaServiceBaseUrl=https://<hostname>:<port>/onap/schema-service/v1/\r
-oxm.schemaServiceKeystore=file:${CONFIG_HOME}/auth/tomcat_keystore\r
-oxm.schemaServiceTruststore=file:${CONFIG_HOME}/auth/tomcat_keystore\r
-oxm.schemaServiceKeystorePassword=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10\r
-oxm.schemaServiceTruststorePassword=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10\r
-\r
-# Schema Service need this variable for the time being with 7.0.1-SNAPSHOT\r
+oxm.apiVersion=v14
+oxm.apiVersionList=v10,v11,v12,v13,v14
+
+oxm.schemaServiceTranslatorList=config
+oxm.schemaServiceBaseUrl=https://<hostname>:<port>/onap/schema-service/v1/
+oxm.schemaServiceKeystore=file:${CONFIG_HOME}/auth/tomcat_keystore
+oxm.schemaServiceTruststore=file:${CONFIG_HOME}/auth/tomcat_keystore
+oxm.schemaServiceKeystorePassword=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+oxm.schemaServiceTruststorePassword=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+
+# Schema Service need this variable for the time being with 7.0.1-SNAPSHOT
spring.applicationName=sparky
\ No newline at end of file
--- /dev/null
+/**
+ * ============LICENSE_START=======================================================
+ * SPARKY (AAI UI service)
+ * ================================================================================
+ * Copyright � 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright � 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.sparky;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.onap.aai.sparky.exception.GenericServiceException;
+import org.onap.aai.sparky.exception.ProxyErrorDetails;
+import org.onap.aai.sparky.exception.ProxyServiceException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+
+@ControllerAdvice
+@RestController
+public class ExceptionConfiguration extends ResponseEntityExceptionHandler {
+
+ @ExceptionHandler(ProxyServiceException.class)
+ public final ResponseEntity<ProxyErrorDetails> handleProxyException(ProxyServiceException ex, WebRequest request) {
+ Date curDate = new Date();
+ SimpleDateFormat format = new SimpleDateFormat ("E yyyy.MM.dd 'at' hh:mm:ss a zzz");
+ String DateToStr = format.format(curDate);
+ ProxyErrorDetails errorDetails = new ProxyErrorDetails(
+ DateToStr, ex.getMessage(),request.getDescription(false),"REQUEST PROCESSING ERROR","500");
+ return new ResponseEntity<>(errorDetails, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+ @ExceptionHandler(GenericServiceException.class)
+ public final ResponseEntity<ProxyErrorDetails> handleGenericException(GenericServiceException ex, WebRequest request) {
+ Date curDate = new Date();
+ SimpleDateFormat format = new SimpleDateFormat ("E yyyy.MM.dd 'at' hh:mm:ss a zzz");
+ String DateToStr = format.format(curDate);
+ String[] msg = ex.getMessage().split("resultCode:");
+ int statusCode = Integer.valueOf(msg[1]);
+ HttpStatus hs = HttpStatus.valueOf(statusCode);
+ Matcher m = Pattern.compile("\\[\"(.*?)\"\\,").matcher(msg[0]);
+
+ String message="";
+ while(m.find()) {
+ message=m.group(0);
+ }
+ message=message.replaceAll("\\[\\\"", "").replaceAll("\"\\,","");
+ ProxyErrorDetails errorDetails = new ProxyErrorDetails(
+ DateToStr,message,request.getDescription(false),hs.name().toString().toUpperCase(),msg[1]);
+ return new ResponseEntity<>(errorDetails, hs);
+ }
+}
\ No newline at end of file
import org.onap.aai.restclient.client.OperationResult;
import org.onap.aai.sparky.security.portal.PortalRestAPICentralServiceImpl;
import org.onap.aai.sparky.util.ProxyClient;
+import org.onap.aai.sparky.exception.GenericServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.core.env.Environment;
}
}
response.setHeader("Access-Control-Expose-Headers", headerTags);
- /*if(or.getResultCode() != 200) {
+ if(or.getResultCode() != 200) {
throw new GenericServiceException(String.valueOf(or.getFailureCause()+"resultCode:"+or.getResultCode()));
- }*/
+ }
}
}
\ No newline at end of file
--- /dev/null
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.sparky.exception;
+
+public class GenericServiceException extends RuntimeException {
+
+
+ private static final long serialVersionUID = 1L;
+
+ public GenericServiceException(String exception) {
+ super(exception);
+ }
+
+}
--- /dev/null
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.sparky.exception;
+
+import java.util.Date;
+
+public class ProxyErrorDetails {
+ private String message;
+ private String details;
+ private String statusType;
+ private String status;
+ private String Date;
+
+
+ public ProxyErrorDetails(String Date, String message, String details,String statusType,String status) {
+ super();
+ this.Date = Date;
+ this.message = message;
+ this.details = details;
+ this.statusType = statusType;
+ this.status = status;
+ }
+
+
+ public String getDate() {
+ return Date;
+ }
+ public String getMessage() {
+ return message;
+ }
+
+ public String getDetails() {
+ return details;
+ }
+
+ public String getStatusType() {
+ return statusType;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+}
+
Code Review / aai / sparky-be.git / commitdiff