Consolidate PolicyRestAdapter setup

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / components / CreateNewMicroServiceModel.java

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 103928c..9b8854f 100644 (file)
--- 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
@@ -22,6 +22,7 @@
 package org.onap.policy.pap.xacml.rest.components;
 
 import com.google.gson.Gson;
 package org.onap.policy.pap.xacml.rest.components;
 
 import com.google.gson.Gson;

+

 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;


@@ -36,6 +37,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;

+

 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.onap.policy.common.logging.eelf.MessageCodes;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.onap.policy.common.logging.eelf.MessageCodes;


@@ -55,7 +57,6 @@ public class CreateNewMicroServiceModel {
     private MicroServiceModels newModel = null;
     private HashMap<String, MSAttributeObject> classMap = new HashMap<>();
 
     private MicroServiceModels newModel = null;
     private HashMap<String, MSAttributeObject> classMap = new HashMap<>();
 

-

     private MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsOnapName(), XACMLPapServlet.getMsPolicyName());
 
     public CreateNewMicroServiceModel(String fileName, String serviceName, String string, String version) {
     private MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsOnapName(), XACMLPapServlet.getMsPolicyName());
 
     public CreateNewMicroServiceModel(String fileName, String serviceName, String string, String version) {


@@ -145,7 +146,6 @@ public class CreateNewMicroServiceModel {
 
         try {
 
 
         try {
 

-

             utils.parseTosca(fileName);
 
             MSAttributeObject msAttributes = new MSAttributeObject();
             utils.parseTosca(fileName);
 
             MSAttributeObject msAttributes = new MSAttributeObject();


@@ -269,7 +269,6 @@ public class CreateNewMicroServiceModel {
         }
         mainClass = classMap.get(this.newModel.getModelName());
 
         }
         mainClass = classMap.get(this.newModel.getModelName());
 

-

         if (".yml".equalsIgnoreCase(type)) {
 
             newModel.setDependency("[]");
         if (".yml".equalsIgnoreCase(type)) {
 
             newModel.setDependency("[]");