aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuanyu Chen <chenchuanyu@huawei.com>2017-09-23 01:39:48 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-23 01:39:48 +0000
commit6e17dce812652d7e5f48f133141b768b9802f73c (patch)
treef8d274620420637299342193b2eff3f4cba21d98
parent721f86c7ff0fa2b9687816c56f97921ce1784de1 (diff)
parent7a3a92244477e0b4f165657eeea9de3921cb3400 (diff)
Merge "Replaced with Diamond symbol"
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java4
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java4
-rw-r--r--adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/TypedRequestTunables.java8
3 files changed, 8 insertions, 8 deletions
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java
index 9b9c214129..c4e22e0680 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java
@@ -135,7 +135,7 @@ public class SDNCEvent implements Serializable {
public void addParam(String name, String value) {
if (params == null) {
- params = new LinkedHashMap<String, String>();
+ params = new LinkedHashMap<>();
}
params.put(name, value);
}
@@ -152,4 +152,4 @@ public class SDNCEvent implements Serializable {
+ getClass().getSimpleName() + " to JSON", e);
}
}
-} \ No newline at end of file
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java
index 818b916c6f..65d8a25dff 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java
@@ -84,8 +84,8 @@ public class SDNCServiceResponse extends SDNCResponseCommon implements Serializa
public void addParam(String name, String value) {
if (params == null) {
- params = new LinkedHashMap<String, String>();
+ params = new LinkedHashMap<>();
}
params.put(name, value);
}
-} \ No newline at end of file
+}
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/TypedRequestTunables.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/TypedRequestTunables.java
index 6638263d1a..72fca989f6 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/TypedRequestTunables.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/TypedRequestTunables.java
@@ -148,7 +148,7 @@ public class TypedRequestTunables {
String value = properties.getProperty(key, "");
- if (value.equals("")) {
+ if ("".equals(value)) {
error = "Missing configuration for: " + key;
LOGGER.error(MessageEnum.RA_SDNC_MISS_CONFIG_PARAM, key, "SDNC", "", MsoLogger.ErrorCode.DataError, "Missing config param");
ALARMLOGGER.sendAlarm("MsoInternalError", MsoAlarmLogger.CRITICAL, error);
@@ -173,7 +173,7 @@ public class TypedRequestTunables {
String urlPropKey = Constants.REQUEST_TUNABLES + "." + parts[2];
sdncUrl = properties.getProperty(urlPropKey, "");
- if (sdncUrl.equals("")) {
+ if ("".equals(sdncUrl)) {
error = "Missing configuration for: " + urlPropKey;
LOGGER.error(MessageEnum.RA_SDNC_MISS_CONFIG_PARAM, urlPropKey, "SDNC", "", MsoLogger.ErrorCode.DataError, "Missing config param");
ALARMLOGGER.sendAlarm("MsoInternalError", MsoAlarmLogger.CRITICAL, error);
@@ -190,7 +190,7 @@ public class TypedRequestTunables {
myUrl = properties.getProperty(Constants.MY_URL_PROP, "");
- if (myUrl.equals("")) {
+ if ("".equals(myUrl)) {
error = "Missing configuration for: " + Constants.MY_URL_PROP;
LOGGER.error(MessageEnum.RA_SDNC_MISS_CONFIG_PARAM, Constants.MY_URL_PROP, "SDNC", "",
MsoLogger.ErrorCode.DataError, "Missing config param");
@@ -221,4 +221,4 @@ public class TypedRequestTunables {
+ (myUrl == null ? "" : ", myUrl=" + myUrl)
+ "]";
}
-} \ No newline at end of file
+}