X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fxml%2Fgenerator%2FModelGenerator.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fxml%2Fgenerator%2FModelGenerator.java;h=f94da4a85d50b26e1547adac2bdc412b74499842;hb=7f592e87a5ba61a8538d6f399f3778b884a9b3ce;hp=66952417a79fee5890152ade32d3e2cfffac0757;hpb=de97feac66e234a0ebea9bf0774aa01136f3c04f;p=aai%2Fbabel.git

diff --git a/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
index 6695241..f94da4a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
@@ -36,15 +36,17 @@ import org.onap.aai.babel.xml.generator.data.Artifact;
 import org.onap.aai.babel.xml.generator.data.GenerationData;
 import org.onap.aai.babel.xml.generator.data.GeneratorUtil;
 import org.onap.aai.babel.xml.generator.data.GroupType;
-import org.onap.aai.cl.api.Logger;
+import javax.ws.rs.core.Response;
 
 /**
  * This class is responsible for generating XML model artifacts from a collection of CSAR artifacts.
  */
 public class ModelGenerator implements ArtifactGenerator {
 
-    private static final Logger logger = LogHelper.INSTANCE;
+    private static final LogHelper logger = LogHelper.INSTANCE;
 
+    private static final String VERSION_DELIMITER = ".";
+    private static final String VERSION_DELIMITER_REGEXP = "\\" + VERSION_DELIMITER;
     private static final String DEFAULT_SERVICE_VERSION = "1.0";
 
     /**
@@ -117,6 +119,8 @@ public class ModelGenerator implements ArtifactGenerator {
         try {
             return String.valueOf(Float.parseFloat(artifactVersion));
         } catch (Exception e) {
+            logger.setContextValue(LogHelper.MdcParameter.RESPONSE_CODE, String.valueOf(Response.Status.BAD_REQUEST.getStatusCode()));
+            logger.setContextValue(LogHelper.MdcParameter.RESPONSE_DESCRIPTION, "Invalid Artifact version");
             logger.warn(ApplicationMsgs.DISTRIBUTION_EVENT,
                     "Error generating service version from artifact version: " + artifactVersion
                             + ". Using default service version of: " + DEFAULT_SERVICE_VERSION + ". Error details: "