summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuanyu Chen <chenchuanyu@huawei.com>2017-09-23 01:39:36 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-23 01:39:36 +0000
commit721f86c7ff0fa2b9687816c56f97921ce1784de1 (patch)
tree2e769b26103fb8fff7da561ab62d3e98bb125ee7
parentbf60056a60403fca5612dd57a5655c2643211102 (diff)
parentf55f9a5b3f48e14a010838739111ec71728d84fe (diff)
Merge "Removed useless parentheses"
-rw-r--r--adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequest.java4
-rw-r--r--adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterPortTypeImpl.java5
-rw-r--r--adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/Utils.java16
3 files changed, 11 insertions, 14 deletions
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequest.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequest.java
index 464b65fdd2..06c2c83f4d 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequest.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/client/SDNCAdapterCallbackRequest.java
@@ -125,12 +125,12 @@ public class SDNCAdapterCallbackRequest {
m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
StringWriter w = new StringWriter();
m.marshal(this, w);
- return (w.toString());
+ return w.toString();
}
catch (Exception e)
{
msoLogger.error(MessageEnum.RA_MARSHING_ERROR, "", "", MsoLogger.ErrorCode.DataError, "Exception - MARSHING_ERROR", e);
}
- return("");
+ return "";
}
}
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterPortTypeImpl.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterPortTypeImpl.java
index b248cc02e0..c9c75d89fa 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterPortTypeImpl.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterPortTypeImpl.java
@@ -42,8 +42,6 @@ public class SDNCAdapterPortTypeImpl implements SDNCAdapterPortType {
private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
private static MsoAlarmLogger alarmLogger = new MsoAlarmLogger();
- private static final String LOG_SERVICE_NAME = "MSO-BPMN:MSO-SDNCAdapter.";
- private static final String LOG_REPLY_NAME = "MSO-SDNCAdapter:MSO-BPMN.";
public static final String MSO_PROP_SDNC_ADAPTER="MSO_PROP_SDNC_ADAPTER";
@PostConstruct
@@ -82,7 +80,6 @@ public class SDNCAdapterPortTypeImpl implements SDNCAdapterPortType {
msoLogger.info(MessageEnum.RA_RECEIVE_BPEL_REQUEST, bpelReqId, callbackUrl, "SDNC", "");
SDNCRestClient sdncClient = new SDNCRestClient(bpelRequest,msoPropertiesFactory);
- long subStartTime = System.currentTimeMillis ();
try {
Thread sdncClientThread = new Thread(sdncClient);
sdncClientThread.start();
@@ -100,6 +97,6 @@ public class SDNCAdapterPortTypeImpl implements SDNCAdapterPortType {
msoLogger.debug("Sending synchronous response to BPEL");
SDNCAdapterResponse wsResp = new SDNCAdapterResponse();
msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successful");
- return (wsResp);
+ return wsResp;
}
}
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/Utils.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/Utils.java
index ab3133b8ae..525002f73d 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/Utils.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/Utils.java
@@ -92,12 +92,12 @@ public class Utils {
String s = domToStr(newdoc);
msoLogger.debug("Formatted SdncReq:\n" + s);
- return (s);
+ return s;
} catch (Exception e) {
msoLogger.error(MessageEnum.RA_ERROR_CREATE_SDNC_REQUEST, "SDNC", "", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in genSdncReq", e);
}
- return(null);
+ return null;
}
public static String genSdncPutReq(Document reqDoc, RequestTunables rt) {
@@ -126,12 +126,12 @@ public class Utils {
String s = domToStr(newdoc);
msoLogger.debug("Formatted SdncPutReq:\n" + s);
- return (s);
+ return s;
} catch (Exception e) {
msoLogger.error(MessageEnum.RA_ERROR_CREATE_SDNC_REQUEST, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception in genSdncPutReq", e);
}
- return(null);
+ return null;
}
public static String genMsoFailResp(SDNCResponse resp) {
@@ -160,12 +160,12 @@ public class Utils {
String s = domToStr(newdoc);
msoLogger.debug("Formatted SdncReq:" + s);
- return (s);
+ return s;
} catch (Exception e) {
msoLogger.error(MessageEnum.RA_ERROR_CREATE_SDNC_RESPONSE, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception in genMsoFailResp", e);
}
- return(null);
+ return null;
}
@@ -185,11 +185,11 @@ public class Utils {
// This is an awful fix for now but we don't want that xmlns="" to be generated
s = s.replaceAll("xmlns=\"\"", "");
- return(s);
+ return s;
} catch (Exception e) {
msoLogger.error(MessageEnum.RA_ERROR_CONVERT_XML2STR, "", "", MsoLogger.ErrorCode.DataError, "Exception - domToStr", e);
}
}
- return(null);
+ return null;
}
}