Delete the redundant Configuration Items. Such as opentoscaServerAddr, yamlParseAddr...

[vfc/nfvo/catalog.git] / catalog-core / catalog-mgr / src / main / java / org / openo / commontosca / catalog / model / parser / ModelParserFactory.java

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java
index a0de847..32442b9 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ModelParserFactory.java
@@ -16,7 +16,9 @@
 
 package org.openo.commontosca.catalog.model.parser;
 
+import org.openo.commontosca.catalog.common.Config;
 import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.model.parser.yaml.aria.AriaModelParser;
 import org.openo.commontosca.catalog.model.parser.yaml.zte.ToscaYamlModelParser;
 
 import java.util.HashMap;
@@ -36,7 +38,18 @@ public class ModelParserFactory {
   private ModelParserFactory() {
     // PackageParseMap.put(EnumPackageFormat.TOSCA_XML, new
     // ToscaXmlModelParser());
-    pkgType2ParseMap.put(EnumPackageFormat.TOSCA_YAML, new ToscaYamlModelParser());
+    if (isAriaParser()) {
+      pkgType2ParseMap.put(EnumPackageFormat.TOSCA_YAML, new AriaModelParser());
+    } else {
+      pkgType2ParseMap.put(EnumPackageFormat.TOSCA_YAML, new ToscaYamlModelParser());
+    }
+  }
+
+  /**
+   * @return
+   */
+  private boolean isAriaParser() {
+    return "aria".equalsIgnoreCase(Config.getConfigration().getParserType());
   }
 
   /**