diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-02-27 19:57:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-27 19:57:34 +0000 |
| commit | 005ae324e9b123ecf7d5fbcc9f6a6e6b1cf44040 (patch) | |
| tree | 576a2f89b81873e2450461bb8bf913a065667df5 /POLICY-SDK-APP | |
| parent | ccc932599675c927519040399b031ff1d10d9510 (diff) | |
| parent | 3a7fd993131f3d6a1a192262be419aa3f5b0d64e (diff) | |
Merge "Policy:Major"
Diffstat (limited to 'POLICY-SDK-APP')
| -rw-r--r-- | POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java index d1043f709..ab4ea6d2d 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java @@ -989,9 +989,9 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController { LOGGER.info("allkeys : " + allkeys); } - String allManyTrueKeys = ""; + String nameOfTrueKey = ""; if(allkeys != null){ - allManyTrueKeys = allkeys.toString(); + nameOfTrueKey = allkeys.toString(); } String jsonModel = createMicroSeriveJson(returnModel, allkeys); @@ -1035,10 +1035,10 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController { PrintWriter out = response.getWriter(); String responseString = mapper.writeValueAsString(returnModel); JSONObject j; - if("".equals(allManyTrueKeys)){ + if("".equals(nameOfTrueKey)){ j = new JSONObject("{dcaeModelData: " + responseString + ",jsonValue: " + jsonModel + "}"); }else{ - j = new JSONObject("{dcaeModelData: " + responseString + ",jsonValue: " + jsonModel + ",allManyTrueKeys: " + allManyTrueKeys+ "}"); + j = new JSONObject("{dcaeModelData: " + responseString + ",jsonValue: " + jsonModel + ",allManyTrueKeys: " + nameOfTrueKey+ "}"); } list.add(j); out.write(list.toString()); @@ -1716,9 +1716,9 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController { } private List<File> listModelFiles(String directoryName) { - File directory = new File(directoryName); + File fileDirectory = new File(directoryName); List<File> resultList = new ArrayList<>(); - File[] fList = directory.listFiles(); + File[] fList = fileDirectory.listFiles(); for (File file : fList) { if (file.isFile()) { resultList.add(file); |