X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FCreateNewMicroServiceModel.java;h=af789569591db8053c4ccccdec66031d73ae0e11;hb=401b48bc573561f097960a9ca7abe6d788456f28;hp=fd9e49c7efe0626cb738ee3cdc074c76aa6de502;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
index fd9e49c7e..af7895695 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
@@ -70,7 +70,7 @@ public class CreateNewMicroServiceModel {
 		this.newModel.setUserCreatedBy(userInfo);
 		String cleanUpFile = null;
 	
-	    HashMap<String, MSAttributeObject> tempMap = new HashMap<>();
+	    Map<String, MSAttributeObject> tempMap = new HashMap<>();
 	    //Need to delete the file
 	    if (importFile.contains(".zip")){
 	    	extractFolder(randomID + ".zip");
@@ -90,7 +90,7 @@ public class CreateNewMicroServiceModel {
 				File deleteFile = new File(cleanUpFile); 
 				FileUtils.forceDelete(deleteFile);
 			} catch (IOException e) {
-				logger.error("Failed to unzip model file " + randomID);
+				logger.error("Failed to unzip model file " + randomID, e);
 			}
 	    }else {
 		    tempMap = utils.processEpackage("ExtractDir" + File.separator + randomID+".xmi", MODEL_TYPE.XMI);
@@ -143,16 +143,14 @@ public class CreateNewMicroServiceModel {
 		            int currentByte;
 
 		            byte data[] = new byte[BUFFER];
-	
-		            FileOutputStream fos = new FileOutputStream(destFile);
-		            BufferedOutputStream dest = new BufferedOutputStream(fos,
-		            BUFFER);
-	
-		            while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
-		                dest.write(data, 0, currentByte);
-		            }
-		            dest.flush();
-		            dest.close();
+					try(FileOutputStream fos = new FileOutputStream(destFile);
+						BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER)) {
+
+						while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
+							dest.write(data, 0, currentByte);
+						}
+						dest.flush();
+					}
 		            is.close();
 		        }
 	
@@ -177,7 +175,7 @@ public class CreateNewMicroServiceModel {
 		
 		Map<String, String> successMap = new HashMap<>();
 		MSAttributeObject mainClass  = null;
-		ArrayList<String> dependency = null;
+		List<String> dependency = null;
 		String subAttribute = null;
 		
 		if (!classMap.containsKey(this.newModel.getModelName())){