SdcCtxBuder:Upd Rsp w NOK to CxtAggr aft error occ

This fix also includes the Tosca parser upgraded to the current latest
version.

Issue-ID: LOG-1015
Issue-ID: LOG-823

Change-Id: Ic59ac988afcd07d2bbf1c996c8625225f85cd972
Signed-off-by: Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java
index dceb4ef..e0a837e 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java
@@ -29,6 +29,9 @@ import java.nio.file.StandardOpenOption;
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
+
+import javax.ws.rs.core.Response.Status;
+
 import org.onap.pomba.contextbuilder.sdc.ToscaBuilderConfig;
 import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
 import org.onap.pomba.contextbuilder.sdc.model.ArtifactInfo;
@@ -81,7 +84,8 @@ public class ToscaCsarArtifactHandler {
 
         if(helper == null) {
             log.debug("CSAR artifact not found for model-version-id: " + modelVersionId);
-            response.setModelData("");
+            response.setModelData("CSAR artifact not found for model-version-id: " + modelVersionId);
+            response.setHttpStatus(Status.NOT_FOUND);
             return response;
         }
 
@@ -99,7 +103,6 @@ public class ToscaCsarArtifactHandler {
      * @throws ToscaCsarException
      */
     private ISdcCsarHelper retrieveToscaCsarArtifact(String modelVersionId) throws ToscaCsarException {
-
         if (config.getTestToscaCsarFile() != null && !config.getTestToscaCsarFile().isEmpty()) {
             return getSdcToscaContext(config.getTestToscaCsarFile());
         }