aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/CamundaDBSetup.java10
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java2
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java9
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java33
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/JsonWrapper.java28
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/DecomposeJsonUtil.java40
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java43
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java28
-rw-r--r--bpmn/MSOMockServer/pom.xml5
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java12
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java11
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java10
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java9
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java14
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java13
-rw-r--r--bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java14
-rw-r--r--bpmn/MSORESTClient/pom.xml5
-rw-r--r--bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/RESTClient.java8
19 files changed, 176 insertions, 121 deletions
diff --git a/.gitignore b/.gitignore
index ae9adeaaca..04bad35c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ target
*.log
*.tmp
packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql
-packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/main-schemas/MySQL-Requests-schema.sql \ No newline at end of file
+packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/main-schemas/MySQL-Requests-schema.sql
+/bin/
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/CamundaDBSetup.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/CamundaDBSetup.java
index aba43eb522..74bb59c908 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/CamundaDBSetup.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/CamundaDBSetup.java
@@ -5,12 +5,14 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import org.openecomp.mso.logger.MsoLogger;
+
/**
* Sets up the unit test (H2) database for Camunda.
*/
public class CamundaDBSetup {
private static boolean isDBConfigured = false;
-
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
public static synchronized void configure() throws SQLException {
if (isDBConfigured) {
return;
@@ -66,13 +68,13 @@ public class CamundaDBSetup {
isDBConfigured = true;
} catch (SQLException e) {
System.out.println("CamundaDBSetup caught " + e.getClass().getSimpleName());
- e.printStackTrace();
+ LOGGER.debug("SQLException :",e);
} finally {
if (stmt != null) {
try {
stmt.close();
} catch (Exception e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
@@ -80,7 +82,7 @@ public class CamundaDBSetup {
try {
connection.close();
} catch (Exception e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
index eb1cd51efb..55f6221dfb 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
@@ -3,6 +3,7 @@
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -200,6 +201,7 @@ public class HealthCheckHandler {
UUID uuid = UUID.fromString(id);
return uuid.toString().equalsIgnoreCase(id);
} catch (IllegalArgumentException iae) {
+ msoLogger.debug("IllegalArgumentException :",iae);
return false;
}
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
index 9d3af1c3be..70f67a5a77 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
@@ -3,6 +3,7 @@
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -167,7 +168,7 @@ public class PropertyConfiguration {
fileWatcherThread.join(waitInSeconds * 1000);
} catch (InterruptedException e) {
LOGGER.debug("FileWatcherThread " + System.identityHashCode(fileWatcherThread)
- + " shutdown did not occur within " + waitInSeconds + " seconds");
+ + " shutdown did not occur within " + waitInSeconds + " seconds",e);
}
LOGGER.debug("Finished shutting down FileWatcherThread " + System.identityHashCode(fileWatcherThread));
@@ -257,7 +258,7 @@ public class PropertyConfiguration {
reader.close();
LOGGER.debug("Closed " + fileName);
} catch (Exception e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
}
@@ -351,12 +352,14 @@ public class PropertyConfiguration {
}
}
} catch (InterruptedException e) {
+ LOGGER.debug("InterruptedException :",e);
break;
} catch (ClosedWatchServiceException e) {
LOGGER.info(
MessageEnum.BPMN_GENERAL_INFO,
"BPMN",
"FileWatcherThread shut down because the watch service was closed");
+ LOGGER.debug("ClosedWatchServiceException :",e);
break;
} catch (Exception e) {
LOGGER.error(
@@ -379,7 +382,7 @@ public class PropertyConfiguration {
watchService.close();
} catch (IOException e) {
LOGGER.debug("FileWatcherThread caught " + e.getClass().getSimpleName()
- + " while closing the watch service");
+ + " while closing the watch service",e);
}
LOGGER.info(MessageEnum.BPMN_GENERAL_INFO, "BPMN",
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java
index f58efe79c8..ce171b56e4 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java
@@ -1,3 +1,24 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.openecomp.mso.bpmn.core;
import java.io.FileOutputStream;
@@ -11,6 +32,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.openecomp.mso.logger.MsoLogger;
+
import org.openecomp.mso.bpmn.core.PropertyConfiguration;
/**
@@ -22,6 +45,8 @@ public class PropertyConfigurationSetup {
private static Path bpmnPropertiesPath = null;
private static Path bpmnUrnPropertiesPath = null;
private static boolean modifiedConfiguration = false;
+
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
/**
* Ensures that the the PropertyConfiguration is initialized and that the
@@ -232,7 +257,7 @@ public class PropertyConfigurationSetup {
try {
fileReader.close();
} catch (IOException e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
@@ -240,7 +265,7 @@ public class PropertyConfigurationSetup {
try {
outputStream.close();
} catch (IOException e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
}
@@ -279,7 +304,7 @@ public class PropertyConfigurationSetup {
try {
fileReader.close();
} catch (IOException e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
@@ -287,7 +312,7 @@ public class PropertyConfigurationSetup {
try {
outputStream.close();
} catch (IOException e) {
- // Ignore
+ LOGGER.debug("Exception :",e);
}
}
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/JsonWrapper.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/JsonWrapper.java
index 10e52d1b0d..dc87304795 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/JsonWrapper.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/JsonWrapper.java
@@ -16,7 +16,7 @@ import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
+import org.openecomp.mso.logger.MsoLogger;
//import org.codehaus.jackson.map.SerializationConfig.Feature;
@@ -29,6 +29,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@JsonInclude(Include.NON_NULL)
public abstract class JsonWrapper implements Serializable {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
@JsonInclude(Include.NON_NULL)
public String toJsonString(){
@@ -54,7 +55,7 @@ public abstract class JsonWrapper implements Serializable {
// }
} catch (Exception e){
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return jsonString;
}
@@ -72,17 +73,13 @@ public abstract class JsonWrapper implements Serializable {
try {
json = new JSONObject(mapper.writeValueAsString(this));
} catch (JsonGenerationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return json;
}
@@ -95,14 +92,11 @@ public abstract class JsonWrapper implements Serializable {
try {
jsonString = mapper.writeValueAsString(list);
} catch (JsonGenerationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return jsonString;
}
@@ -120,7 +114,7 @@ public abstract class JsonWrapper implements Serializable {
jsonString = ow.writeValueAsString(this);
} catch (Exception e){
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return jsonString;
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/DecomposeJsonUtil.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/DecomposeJsonUtil.java
index 32c4776daf..738ec49590 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/DecomposeJsonUtil.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/DecomposeJsonUtil.java
@@ -14,8 +14,10 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.openecomp.mso.logger.MsoLogger;
+
public class DecomposeJsonUtil implements Serializable {
-
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
/**
*
*/
@@ -40,14 +42,11 @@ public class DecomposeJsonUtil implements Serializable {
try {
serviceDecomposition = om.readValue(jsonString, ServiceDecomposition.class);
} catch (JsonParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("JsonParseException :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("JsonMappingException :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("IOException :",e);
}
return serviceDecomposition;
@@ -72,14 +71,11 @@ public class DecomposeJsonUtil implements Serializable {
try {
vnfResource = om.readValue(jsonString, VnfResource.class);
} catch (JsonParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("JsonParseException :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("JsonMappingException :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("IOException :",e);
}
return vnfResource;
}
@@ -103,14 +99,11 @@ public class DecomposeJsonUtil implements Serializable {
try {
networkResource = om.readValue(jsonString, NetworkResource.class);
} catch (JsonParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return networkResource;
}
@@ -134,14 +127,11 @@ public class DecomposeJsonUtil implements Serializable {
try {
allottedResource = om.readValue(jsonString, AllottedResource.class);
} catch (JsonParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return allottedResource;
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java
index f7f6264de0..54a5732e1c 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonUtils.java
@@ -3,6 +3,7 @@
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -67,7 +68,7 @@ public class JsonUtils {
return jsonObj.toString(MSOJsonIndentFactor);
}
} catch (Exception e){
- msoLogger.debug("xml2json(): unable to parse xml and convert to json. Exception was: " + e.toString());
+ msoLogger.debug("xml2json(): unable to parse xml and convert to json. Exception was: " + e.toString(), e);
return null;
}
}
@@ -106,7 +107,7 @@ public class JsonUtils {
return toXMLString(jsonObj, null);
}
} catch (Exception e){
- msoLogger.debug("json2xml(): unable to parse json and convert to xml. Exception was: " + e.toString());
+ msoLogger.debug("json2xml(): unable to parse json and convert to xml. Exception was: " + e.toString(), e);
return null;
}
}
@@ -264,7 +265,7 @@ public class JsonUtils {
JSONObject jsonObj = new JSONObject(jsonStr);
return jsonObj.toString(MSOJsonIndentFactor);
} catch (Exception e){
- msoLogger.debug("prettyJson(): unable to parse/format json input. Exception was: " + e.toString());
+ msoLogger.debug("prettyJson(): unable to parse/format json input. Exception was: " + e.toString(), e);
return null;
}
}
@@ -334,7 +335,7 @@ public class JsonUtils {
}
}
} catch (Exception e) {
- msoLogger.debug("getJsonValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString(),e);
}
return null;
}
@@ -363,7 +364,7 @@ public class JsonUtils {
}
}
} catch (Exception e) {
- msoLogger.debug("getJsonNodeValue(): unable to parse json to retrieve node for field=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonNodeValue(): unable to parse json to retrieve node for field=" + keys + ". Exception was: " + e.toString(), e);
}
return null;
}
@@ -395,7 +396,7 @@ public class JsonUtils {
}
}
} catch (Exception e) {
- msoLogger.debug("getJsonValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString(), e);
}
return 0;
}
@@ -424,7 +425,7 @@ public class JsonUtils {
}
}
} catch (Exception e) {
- msoLogger.debug("getJsonValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString(),e);
}
return false;
}
@@ -500,9 +501,9 @@ public class JsonUtils {
}
} catch (JSONException je) {
// JSONObject::get() throws this exception if one of the specified keys is not found
- msoLogger.debug("getJsonParamValue(): caught JSONException attempting to retrieve param value for keys:" + keys + ", name=" + name);
+ msoLogger.debug("getJsonParamValue(): caught JSONException attempting to retrieve param value for keys:" + keys + ", name=" + name, je);
} catch (Exception e) {
- msoLogger.debug("getJsonParamValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonParamValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString(), e);
}
return null;
}
@@ -523,7 +524,7 @@ public class JsonUtils {
return getJsonValueForKey(jsonObj, key);
}
} catch (Exception e) {
- msoLogger.debug("getJsonValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString(), e);
}
return null;
}
@@ -567,10 +568,10 @@ public class JsonUtils {
}
} catch (JSONException je) {
// JSONObject::get() throws this exception if one of the specified keys is not found
- msoLogger.debug("getJsonValueForKey(): caught JSONException attempting to retrieve value for key=" + key);
+ msoLogger.debug("getJsonValueForKey(): caught JSONException attempting to retrieve value for key=" + key, je);
keyValue = null;
} catch (Exception e) {
- msoLogger.debug("getJsonValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString(), e);
}
return keyValue;
}
@@ -610,10 +611,10 @@ public class JsonUtils {
}
} catch (JSONException je) {
// JSONObject::get() throws this exception if one of the specified keys is not found
- msoLogger.debug("getJsonValueForKey(): caught JSONException attempting to retrieve value for key=" + key);
+ msoLogger.debug("getJsonValueForKey(): caught JSONException attempting to retrieve value for key=" + key, je);
keyValue = null;
} catch (Exception e) {
- msoLogger.debug("getJsonValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString(),e);
}
return keyValue;
}
@@ -653,10 +654,10 @@ public class JsonUtils {
}
} catch (JSONException je) {
// JSONObject::get() throws this exception if one of the specified keys is not found
- msoLogger.debug("getJsonBooleanValueForKey(): caught JSONException attempting to retrieve value for key=" + key);
+ msoLogger.debug("getJsonBooleanValueForKey(): caught JSONException attempting to retrieve value for key=" + key,je);
keyValue = null;
} catch (Exception e) {
- msoLogger.debug("getJsonBooleanValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonBooleanValueForKey(): unable to parse json to retrieve value for field=" + key + ". Exception was: " + e.toString(),e);
}
return keyValue;
}
@@ -800,9 +801,9 @@ public class JsonUtils {
} catch (JSONException je) {
// JSONObject::get() throws this exception if one of the specified keys is not found
- msoLogger.debug("getJsonRawValue(): caught JSONException attempting to retrieve raw value for key=" + keyStr);
+ msoLogger.debug("getJsonRawValue(): caught JSONException attempting to retrieve raw value for key=" + keyStr,je);
} catch (Exception e) {
- msoLogger.debug("getJsonRawValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("getJsonRawValue(): unable to parse json to retrieve value for field=" + keys + ". Exception was: " + e.toString(),e);
}
return null;
}
@@ -842,10 +843,10 @@ public class JsonUtils {
} catch (JSONException je) {
// JSONObject::get() throws this exception if one of the specified keys is not found
- msoLogger.debug("putJsonValue(): caught JSONException attempting to retrieve value for key=" + keyStr);
+ msoLogger.debug("putJsonValue(): caught JSONException attempting to retrieve value for key=" + keyStr,je);
return null;
} catch (Exception e) {
- msoLogger.debug("putJsonValue(): unable to parse json to put value for key=" + keys + ". Exception was: " + e.toString());
+ msoLogger.debug("putJsonValue(): unable to parse json to put value for key=" + keys + ". Exception was: " + e.toString(),e);
}
return null;
}
@@ -961,7 +962,7 @@ public class JsonUtils {
return true;
}
} catch (Exception e) {
- msoLogger.debug("jsonElementExist(): unable to determine if json element exist. Exception is: " + e.toString());
+ msoLogger.debug("jsonElementExist(): unable to determine if json element exist. Exception is: " + e.toString(),e);
}
return true;
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java
index 8898f27b23..ac514b967f 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java
@@ -15,12 +15,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
+import org.openecomp.mso.logger.MsoLogger;
+
@JsonInclude(Include.NON_NULL)
public abstract class JsonWrapper implements Serializable {
private static final long serialVersionUID = 8633550139273639875L;
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
@JsonInclude(Include.NON_NULL)
public String toJsonString(){
@@ -45,7 +48,7 @@ public abstract class JsonWrapper implements Serializable {
// }
} catch (Exception e){
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return jsonString;
}
@@ -63,17 +66,13 @@ public abstract class JsonWrapper implements Serializable {
try {
json = new JSONObject(mapper.writeValueAsString(this));
} catch (JsonGenerationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return json;
}
@@ -86,14 +85,11 @@ public abstract class JsonWrapper implements Serializable {
try {
jsonString = mapper.writeValueAsString(list);
} catch (JsonGenerationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return jsonString;
}
@@ -111,7 +107,7 @@ public abstract class JsonWrapper implements Serializable {
jsonString = ow.writeValueAsString(this);
} catch (Exception e){
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
return jsonString;
}
diff --git a/bpmn/MSOMockServer/pom.xml b/bpmn/MSOMockServer/pom.xml
index 34f7a2331d..500535d740 100644
--- a/bpmn/MSOMockServer/pom.xml
+++ b/bpmn/MSOMockServer/pom.xml
@@ -76,6 +76,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.openecomp.so</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java
index 33a65e6fe1..1f17a8bf31 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java
@@ -2,7 +2,8 @@
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -22,6 +23,7 @@ package org.openecomp.mso.bpmn.mock;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.common.FileSource;
@@ -29,6 +31,7 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import org.openecomp.mso.logger.MsoLogger;
/**
*
* Simulates SDNC Adapter Callback response
@@ -36,6 +39,7 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;
*/
public class SDNCAdapterMockTransformer extends ResponseTransformer {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private String callbackResponse;
private String requestId;
@@ -121,8 +125,7 @@ public class SDNCAdapterMockTransformer extends ResponseTransformer {
//Delay sending callback response
sleep(delay);
} catch (InterruptedException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :",e1);
}
System.out.println("Sending callback response:" + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
@@ -132,8 +135,7 @@ public class SDNCAdapterMockTransformer extends ResponseTransformer {
ClientResponse result = request.post();
//System.err.println("Successfully posted callback:" + result.getStatus());
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
index 673ac005a8..b782c05d38 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
@@ -2,7 +2,8 @@
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -29,8 +30,12 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import org.openecomp.mso.logger.MsoLogger;
+
public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransformer {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
private String callbackResponse;
private String requestId;
@@ -110,7 +115,7 @@ public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransform
sleep(delay);
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :",e1);
}
System.out.println("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
@@ -122,7 +127,7 @@ public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransform
} catch (Exception e) {
// TODO Auto-generated catch block
System.out.println("catch error in - request.post() ");
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java
index 1e32077ff1..ebedca8550 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java
@@ -6,6 +6,7 @@
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -27,6 +28,7 @@ import javax.xml.ws.Endpoint;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.common.FileSource;
@@ -34,12 +36,15 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Please describe the VnfAdapterCreateMockTransformer.java class
*
*/
public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
private String notifyCallbackResponse;
private String ackResponse;
@@ -71,6 +76,7 @@ public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
updatedResponse = ackResponse.replace(responseMessageId, messageId);
} catch (Exception ex) {
+ LOGGER.debug("Exception :",ex);
System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfCreateSimResponse.xml'");
responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
@@ -124,7 +130,7 @@ public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
sleep(delay);
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :",e1);
}
System.out.println("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
@@ -138,7 +144,7 @@ public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
} catch (Exception e) {
// TODO Auto-generated catch block
System.out.println("catch error in - request.post() ");
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java
index 553aed6c3d..b2c25fc108 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java
@@ -6,6 +6,7 @@
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -25,19 +26,20 @@ package org.openecomp.mso.bpmn.mock;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.common.FileSource;
import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
-
/**
* Please describe the VnfAdapterCreateMockTransformer.java class
*
*/
public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private String notifyCallbackResponse;
private String ackResponse;
@@ -72,6 +74,7 @@ public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
updatedResponse = ackResponse.replace(responseMessageId, messageId);
} catch (Exception ex) {
+ LOGGER.debug("Exception :",ex);
System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfDeleteSimResponse.xml'");
responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
@@ -125,7 +128,7 @@ public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
sleep(delay);
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :",e1);
}
System.out.println("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
@@ -138,7 +141,7 @@ public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
} catch (Exception e) {
// TODO Auto-generated catch block
System.out.println("catch error in - request.post() ");
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java
index c1d27d5b39..5aae3394aa 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java
@@ -2,7 +2,8 @@
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -25,6 +26,7 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.common.FileSource;
@@ -32,6 +34,7 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Please describe the VnfAdapterQueryMockTransformer.java class
*
@@ -40,6 +43,8 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;
public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
private String notifyCallbackResponse;
private String ackResponse;
private String messageId;
@@ -84,6 +89,7 @@ public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
updatedResponse = ackResponse.replace(responseMessageId, messageId);
} catch (Exception ex) {
+ LOGGER.debug("Exception :",ex);
System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfQuerySimResponse.xml'");
responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
@@ -139,8 +145,7 @@ public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
//Delay sending callback response
sleep(delay);
} catch (InterruptedException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :",e1);
}
ClientRequest request = new ClientRequest(callbackUrl);
request.body("text/xml", payLoad);
@@ -149,8 +154,7 @@ public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
ClientResponse result = request.post();
//System.err.println("Successfully posted callback:" + result.getStatus());
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java
index 5207fa02b2..45a67dea4f 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java
@@ -5,7 +5,8 @@
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -32,12 +33,15 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Please describe the VnfAdapterCreateMockTransformer.java class
*
*/
public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
private String notifyCallbackResponse;
private String ackResponse;
private String messageId;
@@ -74,6 +78,7 @@ public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
updatedResponse = ackResponse.replace(responseMessageId, messageId);
} catch (Exception ex) {
+ LOGGER.debug("Exception :",ex);
System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfRollbackSimResponse.xml'");
responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
@@ -125,8 +130,7 @@ public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
//Delay sending callback response
sleep(delay);
} catch (InterruptedException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :",e1);
}
System.out.println("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
@@ -137,9 +141,8 @@ public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
System.out.println("Successfully posted callback? Status: " + result.getStatus());
//System.err.println("Successfully posted callback:" + result.getStatus());
} catch (Exception e) {
- // TODO Auto-generated catch block
System.out.println("catch error in - request.post() ");
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java
index e84e57c63c..d67ffcdb56 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java
@@ -5,7 +5,8 @@
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -25,6 +26,7 @@ package org.openecomp.mso.bpmn.mock;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.common.FileSource;
@@ -32,12 +34,15 @@ import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Please describe the VnfAdapterUpdateMockTransformer.java class
*
*/
public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
private String notifyCallbackResponse;
private String requestId;
private String ackResponse;
@@ -74,6 +79,7 @@ public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
updatedResponse = ackResponse.replace(responseMessageId, messageId);
} catch (Exception ex) {
+ LOGGER.debug("Exception :",ex);
System.out.println(" ******* Use default response file in 'vnfAdapter/vnfUpdateSimResponse.xml'");
responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
@@ -125,8 +131,7 @@ public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
//Delay sending callback response
sleep(delay);
} catch (InterruptedException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ LOGGER.debug("Exception :", e1);
}
System.out.println("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
@@ -137,9 +142,8 @@ public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
System.out.println("Successfully posted callback? Status: " + result.getStatus());
//System.err.println("Successfully posted callback:" + result.getStatus());
} catch (Exception e) {
- // TODO Auto-generated catch block
System.out.println("catch error in - request.post() ");
- e.printStackTrace();
+ LOGGER.debug("Exception :",e);
}
}
diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml
index b042a9e82c..1bcb3b705d 100644
--- a/bpmn/MSORESTClient/pom.xml
+++ b/bpmn/MSORESTClient/pom.xml
@@ -35,6 +35,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openecomp.so</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<finalName>MSORESTClient</finalName>
diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/RESTClient.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/RESTClient.java
index 259f3d4075..6504615f7a 100644
--- a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/RESTClient.java
+++ b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/RESTClient.java
@@ -3,6 +3,7 @@
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -54,6 +55,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.message.AbstractHttpMessage;
import org.apache.http.util.EntityUtils;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Client used to send RESTFul requests.
* <p>
@@ -82,6 +84,8 @@ import org.apache.http.util.EntityUtils;
* @since 1.0
*/
public class RESTClient {
+
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private final String proxyHost;
private final int proxyPort;
@@ -166,8 +170,7 @@ public class RESTClient {
}
}
} catch (UnsupportedEncodingException e) {
- // should not occur
- e.printStackTrace();
+ LOGGER.debug("Exception :", e);
}
return sb.toString();
}
@@ -197,6 +200,7 @@ public class RESTClient {
clientBuilder = HttpClientBuilder.create().setConnectionManager(
manager);
} catch (Exception ex) {
+ LOGGER.debug("Exception :", ex);
throw new RESTException(ex.getMessage());
}
clientBuilder.disableRedirectHandling();