Sync Integ to Master
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / servlets / CsarBuildServlet.java
index 4f8bffa..faf02dc 100644 (file)
 
 package org.openecomp.sdc.be.servlets;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-
+import com.jcabi.aspects.Loggable;
+import org.openecomp.sdc.be.resources.data.ESArtifactData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -33,122 +31,78 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 
-import org.openecomp.sdc.be.resources.data.ESArtifactData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.jcabi.aspects.Loggable;
-//import org.openecomp.sdc.be.builders.tosca.api.TopologyService;
-//import org.openecomp.sdc.be.tosca.parsers.ParserMode;
-
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/services")
 public class CsarBuildServlet extends ToscaDaoServlet {
 
-       private static Logger log = LoggerFactory.getLogger(CsarBuildServlet.class.getName());
-
-       @GET
-       @Path("/{serviceName}/{serviceVersion}")
-       public Response getDefaultTemplate(@Context final HttpServletRequest request, @PathParam("serviceName") final String serviceName, @PathParam("serviceVersion") final String serviceVersion) {
-
-               return null;// buildToscaCsar(request, serviceName, serviceVersion);
-
-       }
-
-       @GET
-       @Path("/{serviceName}/{serviceVersion}/csar")
-       public Response getToscaCsarTemplate(@Context final HttpServletRequest request, @PathParam("serviceName") final String serviceName, @PathParam("serviceVersion") final String serviceVersion) {
-
-               return null; // buildToscaCsar(request, serviceName, serviceVersion);
-
-       }
-
-       /*
-        * private Response buildToscaCsar(final HttpServletRequest request, String serviceName, String serviceVersion) { log.debug("Building CSAR for service:{} , version:{}", serviceName, serviceVersion); ServletContext context =
-        * request.getSession().getServletContext(); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream); String fileName =
-        * serviceName+"_"+serviceVersion+".zip";
-        * 
-        * IResourceUploader resourceUploader = getResourceUploader(context); TopologyService topologyService = getToscaYamlBuilder(context).getServiceYaml(serviceName, serviceVersion, ParserMode.CSAR, "Scripts"); try {
-        * 
-        * 
-        * //Add Service yml to Zip addZipEntry(zipOutputStream, "Definitions/"+serviceName+".yaml", topologyService.getTopologyServiceYaml());
-        * 
-        * //Add Resources to Zip addResourcesToZip(zipOutputStream, topologyService);
-        * 
-        * //Add Artifacts to Zip addArtifactsToZip(serviceName, serviceVersion, zipOutputStream, resourceUploader);
-        * 
-        * //Prepare Tosca metadata addToscaMetaToZip(zipOutputStream, topologyService, resourceUploader);
-        * 
-        * }
-        * 
-        * catch (IOException e) { log.error("Failed to create CSAR file", e); return null; } finally{ try { byteArrayOutputStream.close(); zipOutputStream.close(); } catch (IOException e) { log.error("Failed to close output srream", e); }
-        * 
-        * } return buildResponse(fileName, byteArrayOutputStream);
-        * 
-        * 
-        * }
-        */
-
-       public static final String TOSCA_META_PATH = "TOSCA-Metadata/TOSCA.meta";
-
-       protected String[] prepareToscaMetaHeader(String serviceName) {
-               return new String[] { "TOSCA-Meta-File-Version: 1.0\n", "CSAR-Version: 1.1\n", "Created-By: INTERWISE\n", "\n", "Entry-Definitions: Definitions/" + serviceName + ".yaml\n", "\n", "Name: Definitions/" + serviceName + ".yaml\n",
-                               "Content-Type: application/vnd.oasis.tosca.definitions.yaml\n" };
-       }
-
-       protected String getAppliactionMime(String fileName) {
-               String mimeType;
-               if (fileName.contains(".sh")) {
-                       mimeType = "x-sh";
-               } else if (fileName.contains(".yang")) {
-                       mimeType = "yang";
-               }
-
-               else if (fileName.contains(".rar")) {
-                       mimeType = "x-rar-compressed";
-               }
-
-               else if (fileName.contains(".zip")) {
-                       mimeType = "zip";
-               }
-
-               else if (fileName.contains(".tar")) {
-                       mimeType = "x-tar";
-               }
-
-               else if (fileName.contains(".7z")) {
-                       mimeType = "x-7z-compressed";
-               }
-
-               else {
-                       // Undefined
-                       mimeType = "undefined";
-               }
-               return mimeType;
-       }
-
-       protected String getArtifactPath(String nodeTamplateName, ESArtifactData artifactData) {
-               // return "Scripts/"+nodeTamplateName+"/"+
-               // artifactData.getArtifactName();
-               return "Scripts/" + nodeTamplateName + "/" + artifactData.getId();
-       }
-
-       protected String getResourcePath(String resourceName) {
-               return "Definitions/" + resourceName + ".yaml";
-       }
-
-       private byte[] encodeString(String data) throws CharacterCodingException {
-               Charset charset = Charset.forName("UTF-8");
-               CharsetEncoder encoder = charset.newEncoder();
-               ByteBuffer bb = encoder.encode(CharBuffer.wrap(data.toCharArray()));
-               byte[] ba = new byte[bb.limit()];
-               bb.get(ba);
-               return ba;
-       }
-
-       @Override
-       public Logger getLogger() {
-               return log;
-       }
+    private static final Logger log = LoggerFactory.getLogger(CsarBuildServlet.class);
+
+    @GET
+    @Path("/{serviceName}/{serviceVersion}")
+    public Response getDefaultTemplate(@Context final HttpServletRequest request, @PathParam("serviceName") final String serviceName, @PathParam("serviceVersion") final String serviceVersion) {
+
+        return null;// buildToscaCsar(request, serviceName, serviceVersion);
+
+    }
+
+    @GET
+    @Path("/{serviceName}/{serviceVersion}/csar")
+    public Response getToscaCsarTemplate(@Context final HttpServletRequest request, @PathParam("serviceName") final String serviceName, @PathParam("serviceVersion") final String serviceVersion) {
+
+        return null; // buildToscaCsar(request, serviceName, serviceVersion);
+
+    }
+
+
+    public static final String TOSCA_META_PATH = "TOSCA-Metadata/TOSCA.meta";
+
+    protected String[] prepareToscaMetaHeader(String serviceName) {
+        return new String[] { "TOSCA-Meta-File-Version: 1.0\n", "CSAR-Version: 1.1\n", "Created-By: INTERWISE\n", "\n", "Entry-Definitions: Definitions/" + serviceName + ".yaml\n", "\n", "Name: Definitions/" + serviceName + ".yaml\n",
+                "Content-Type: application/vnd.oasis.tosca.definitions.yaml\n" };
+    }
+
+    protected String getAppliactionMime(String fileName) {
+        String mimeType;
+        if (fileName.contains(".sh")) {
+            mimeType = "x-sh";
+        } else if (fileName.contains(".yang")) {
+            mimeType = "yang";
+        }
+
+        else if (fileName.contains(".rar")) {
+            mimeType = "x-rar-compressed";
+        }
+
+        else if (fileName.contains(".zip")) {
+            mimeType = "zip";
+        }
+
+        else if (fileName.contains(".tar")) {
+            mimeType = "x-tar";
+        }
+
+        else if (fileName.contains(".7z")) {
+            mimeType = "x-7z-compressed";
+        }
+
+        else {
+            // Undefined
+            mimeType = "undefined";
+        }
+        return mimeType;
+    }
+
+    protected String getArtifactPath(String nodeTamplateName, ESArtifactData artifactData) {
+        return "Scripts/" + nodeTamplateName + "/" + artifactData.getId();
+    }
+
+    protected String getResourcePath(String resourceName) {
+        return "Definitions/" + resourceName + ".yaml";
+    }
+
+    @Override
+    public Logger getLogger() {
+        return log;
+    }
 
 }