Replaced with Diamond symbol

Change-Id: I439daab53236cd35e43e3a503ddc4b3218f7d992
Issue-Id:SO-118
Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>

diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
index c2d5fe2..8c503aa 100644 (file)
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
@@ -64,7 +64,7 @@ public class VfcManager {
     private static Map<String, String> nfvoUrlMap;
 
     static {
-        nfvoUrlMap = new HashMap<String, String>();
+        nfvoUrlMap = new HashMap<>();
         nfvoUrlMap.put(Step.CREATE, CommonConstant.NFVO_CREATE_URL);
         nfvoUrlMap.put(Step.INSTANTIATE, CommonConstant.NFVO_INSTANTIATE_URL);
         nfvoUrlMap.put(Step.TERMINATE, CommonConstant.NFVO_TERMINATE_URL);
@@ -399,7 +399,7 @@ public class VfcManager {
      */
     private String getUrl(String variable, String step) {
 
-        String url = CommonConstant.STR_EMPTY;
+        String url;
         String originalUrl;
         originalUrl = (String)nfvoUrlMap.get(step);
         url = String.format(originalUrl, variable);

diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/BpelRestClient.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/BpelRestClient.java
index 67e263c..a4f1046 100644 (file)
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/BpelRestClient.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/BpelRestClient.java
@@ -142,9 +142,10 @@ public class BpelRestClient {
        }
 
        public void setRetryCount(int retryCount) {
-               if (retryCount < 0)
-                       retryCount = DEFAULT_RETRY_COUNT;
-               this.retryCount = retryCount;
+               int newRetryCount = retryCount;
+               if (newRetryCount < 0)
+                       newRetryCount = DEFAULT_RETRY_COUNT;
+               this.retryCount = newRetryCount;
        }
 
        public int getRetryInterval() {
@@ -164,14 +165,14 @@ public class BpelRestClient {
        }
 
        public String getRetryList() {
-               if (retryList.size() == 0)
+               if (retryList.isEmpty())
                        return "";
                String t = retryList.toString();
                return t.substring(1, t.length()-1);
        }
 
        public void setRetryList(String retryList) {
-               Set<Integer> s = new TreeSet<Integer>();
+               Set<Integer> s = new TreeSet<>();
                for (String t : retryList.split("[, ]")) {
                        try {
                                s.add(Integer.parseInt(t));