summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-09-25 12:07:09 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-25 12:07:09 +0000
commitc5b6a14d88ee45d4152503cb429629ad172f8e83 (patch)
tree1782915490affe27b0ac87a470f5c0c277a6aabe
parent18953088cfedfb0889fcef3746a12d37468f1811 (diff)
parentbad9cbaa553f9029360f34a5617e8cbd940a60a6 (diff)
Merge "Replaced with Diamond symbol"
-rw-r--r--adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java4
-rw-r--r--adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/BpelRestClient.java11
2 files changed, 8 insertions, 7 deletions
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 c2d5fe241c..8c503aa43e 100644
--- 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 67e263c3a7..a4f1046df9 100644
--- 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));