1 files changed, 65 insertions, 40 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 3f62e12..62b5acb 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
@@ -1,49 +1,74 @@
 package org.openecomp.sdc.tosca.parser.impl;
 
-import java.io.IOException;
-import java.util.List;
-
+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.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;
 import org.openecomp.sdc.toscaparser.api.ToscaTemplate;
 import org.openecomp.sdc.toscaparser.api.common.JToscaException;
 
-public class SdcToscaParserFactory{
-
-	private static SdcToscaParserFactory instance;
-	
-	private SdcToscaParserFactory(){}
-
-	/**
-	 * Get an SdcToscaParserFactory instance.
-	 * After parsing work is done, it must be closed using the close() method.
-	 */
-	public static SdcToscaParserFactory getInstance() {
-		if (instance == null) {
-			synchronized (SdcToscaParserFactory.class) {
-				if (instance == null) {
-					instance = new SdcToscaParserFactory();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Get an ISdcCsarHelper object for this CSAR file.
-	 * @param csarPath - the path to CSAR file.
-	 * @return ISdcCsarHelper object.
-	 * @throws SdcToscaParserException - in case the path or CSAR are invalid.
-	 * @throws JToscaException 
-	 */
-	public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws SdcToscaParserException, JToscaException, IOException{
-		//TODO add logic to check if legal file and csar
-		synchronized (SdcToscaParserFactory.class) {
-			ToscaTemplate tosca = new ToscaTemplate(csarPath, null, true, null);
-			SdcCsarHelperImpl sdcCsarHelperImpl = new SdcCsarHelperImpl(tosca);
-			return sdcCsarHelperImpl;
-		}
-	}
+import java.io.IOException;
+
+public class SdcToscaParserFactory {
+
+    private static volatile SdcToscaParserFactory instance;
+    private static Configuration configuration;
+
+    private SdcToscaParserFactory() {
+
+    }
+
+    /**
+     * Get an SdcToscaParserFactory instance.
+     * After parsing work is done, it must be closed using the close() method.
+     */
+    public static SdcToscaParserFactory getInstance() throws IOException {
+        if (instance == null) {
+            synchronized (SdcToscaParserFactory.class) {
+                if (instance == null) {
+                    instance = new SdcToscaParserFactory();
+                    configuration = ConfigurationManager.getInstance().getConfiguration();
+                }
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * Get an ISdcCsarHelper object for this CSAR file.
+     *
+     * @param csarPath - the absolute path to CSAR file.
+     * @return ISdcCsarHelper object.
+     * @throws SdcToscaParserException - in case the path or CSAR are invalid.
+     * @throws JToscaException
+     */
+    public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws JToscaException, IOException, SdcToscaParserException {
+        //TODO add logic to check if legal file and csar
+        synchronized (SdcToscaParserFactory.class) {
+
+
+            ToscaTemplate tosca = new ToscaTemplate(csarPath, null, true, null);
+            SdcCsarHelperImpl sdcCsarHelperImpl = new SdcCsarHelperImpl(tosca);
+            if (sdcCsarHelperImpl != null) {
+                validateCsarVersion(sdcCsarHelperImpl.getConformanceLevel());
+            }
+            return sdcCsarHelperImpl;
+        }
+    }
+
+    private void validateCsarVersion(String cSarVersion) throws SdcToscaParserException {
+        ConformanceLevel level = configuration.getConformanceLevel();
+        String minVersion = level.getMinVersion();
+        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);
+            }
+        } else {
+            throw new SdcToscaParserException("Model is not supported. Parser supports versions " + minVersion + " to " + maxVersion);
+        }
+    }
 
 }
 \ No newline at end of file