X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FCreateDcaeMicroServiceController.java;h=ab4ea6d2d028276ecb55c4219d2aebbcc7b4686f;hb=f39febaa77ab395b8e755c19ef85cc984b8da072;hp=431482d40b40ffbf7d25383ae6b46c39a9997408;hpb=401b48bc573561f097960a9ca7abe6d788456f28;p=policy%2Fengine.git

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 431482d40..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
@@ -701,6 +701,7 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 				//List Datatype
 				Set<String> keys= keyValues.keySet();
 				Iterator<String> itr=keys.iterator();
+				boolean isDefinedType = false;
 				while(itr.hasNext()){
 					String key= itr.next();
 					if(!("type").equals(key) ||("required").equals(key))
@@ -713,18 +714,19 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 							    constraints.add(keyValues.get(key));
 							}
 						}else{
-							//This is user defined string
+							//This is user defined type
 							String trimValue=value.substring(value.lastIndexOf('.')+1);
 							StringBuilder referenceIndividualStringBuilder= new StringBuilder();
 							referenceIndividualStringBuilder.append(keySetString+"="+trimValue+":MANY-true");
 							referenceStringBuilder.append(referenceIndividualStringBuilder+",");
+							isDefinedType = true;
 						}
 					}				
 
 				}
 
-				if(keyValues.get("type").equalsIgnoreCase(LIST) &&
-					(constraints == null || constraints.isEmpty()) ) {
+				if(!isDefinedType && keyValues.get("type").equalsIgnoreCase(LIST) &&
+					(constraints == null || constraints.isEmpty()) ) {   //type is list but no constraints defined.
 						referenceStringBuilder.append(keySetString+"=MANY-true"+",");
 				}
 			}else{
@@ -987,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);
@@ -1033,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());
@@ -1714,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);