1 files changed, 22 insertions, 7 deletions
diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
index 14c332c..2ddde1f 100644
--- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
+++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
@@ -2,17 +2,18 @@ package org.openecomp.sdc.tosca.parser.impl;
 
 import org.openecomp.sdc.tosca.parser.api.ConformanceLevel;
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.config.Configuration;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
+import org.openecomp.sdc.tosca.parser.config.*;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;
 import org.openecomp.sdc.toscaparser.api.ToscaTemplate;
 import org.openecomp.sdc.toscaparser.api.common.JToscaException;
+import org.openecomp.sdc.toscaparser.api.utils.JToscaErrorCodes;
 
 public class SdcToscaParserFactory {
 
     private static volatile SdcToscaParserFactory instance;
     private static Configuration configuration;
+    private static ErrorConfiguration errorConfiguration;
 
     private SdcToscaParserFactory() {
 
@@ -28,6 +29,7 @@ public class SdcToscaParserFactory {
                 if (instance == null) {
                     instance = new SdcToscaParserFactory();
                     configuration = ConfigurationManager.getInstance().getConfiguration();
+                    errorConfiguration = ConfigurationManager.getInstance().getErrorConfiguration();
                 }
             }
         }
@@ -40,11 +42,15 @@ public class SdcToscaParserFactory {
      * @param csarPath - the absolute path to CSAR file.
      * @return ISdcCsarHelper object.
      * @throws SdcToscaParserException - in case the path or CSAR are invalid.
-     * @throws JToscaException - in case the path or CSAR are invalid.
      */
-    public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws JToscaException, SdcToscaParserException {
+    public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws SdcToscaParserException {
         synchronized (SdcToscaParserFactory.class) {
-            ToscaTemplate tosca = new ToscaTemplate(csarPath, null, true, null);
+            ToscaTemplate tosca = null;
+            try {
+                tosca = new ToscaTemplate(csarPath, null, true, null);
+            } catch (JToscaException e) {
+                throwSdcToscaParserException(e);
+            }
             SdcCsarHelperImpl sdcCsarHelperImpl = new SdcCsarHelperImpl(tosca);
             validateCsarVersion(sdcCsarHelperImpl.getConformanceLevel());
             return sdcCsarHelperImpl;
@@ -57,11 +63,20 @@ public class SdcToscaParserFactory {
         String maxVersion = level.getMaxVersion();
         if (cSarVersion != null) {
             if ((GeneralUtility.conformanceLevelCompare(cSarVersion, minVersion) < 0) || (GeneralUtility.conformanceLevelCompare(cSarVersion, maxVersion) > 0)) {
-                throw new SdcToscaParserException("Model is not supported. Parser supports versions " + minVersion + " to " + maxVersion);
+                throwConformanceLevelException(minVersion, maxVersion);
             }
         } else {
-            throw new SdcToscaParserException("Model is not supported. Parser supports versions " + minVersion + " to " + maxVersion);
+            throwConformanceLevelException(minVersion, maxVersion);
         }
     }
 
+    private void throwConformanceLevelException(String minVersion, String maxVersion) throws SdcToscaParserException {
+        ErrorInfo errorInfo = errorConfiguration.getErrorInfo(SdcToscaParserErrors.CONFORMANCE_LEVEL_ERROR.toString());
+        throw new SdcToscaParserException(String.format(errorInfo.getMessage(), minVersion, maxVersion), errorInfo.getCode());
+    }
+
+    private void throwSdcToscaParserException(JToscaException e) throws SdcToscaParserException {
+        ErrorInfo errorInfo = errorConfiguration.getErrorInfo(SdcToscaParserErrors.getSdcErrorByJToscaError(JToscaErrorCodes.getByCode(e.getCode())).toString());
+        throw new SdcToscaParserException(errorInfo.getMessage(), errorInfo.getCode());
+    }
 }
 \ No newline at end of file