diff options
author | YuanHu <yuan.hu1@zte.com.cn> | 2016-10-25 14:29:07 +0800 |
---|---|---|
committer | YuanHu <yuan.hu1@zte.com.cn> | 2016-10-25 14:30:17 +0800 |
commit | 678a9afb0339665afaf764ca51316f5fc3d7aed2 (patch) | |
tree | 3a75504a7de4ce088306c51658e56433ccf20a9c | |
parent | 584fceecfb3d598113f09894431b22dcdab9b30e (diff) |
Set property element Type to 'inputs' of 'Plan'.
Change-Id: I61f150f3a9787ee112c355b5e87367e53e6f4b0b
Issue-id: TOSCA-141
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
-rw-r--r-- | catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java index e1e89d19..ffb4a4dc 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java @@ -15,16 +15,6 @@ */ package org.openo.commontosca.catalog.model.common; -import org.openo.commontosca.catalog.db.exception.CatalogResourceException; -import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.Plan; -import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.ServiceTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.esotericsoftware.yamlbeans.YamlConfig; -import com.esotericsoftware.yamlbeans.YamlException; -import com.esotericsoftware.yamlbeans.YamlReader; - import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.FileInputStream; @@ -37,6 +27,17 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; +import org.openo.commontosca.catalog.db.exception.CatalogResourceException; +import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.Input; +import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.Plan; +import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.ServiceTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.esotericsoftware.yamlbeans.YamlConfig; +import com.esotericsoftware.yamlbeans.YamlException; +import com.esotericsoftware.yamlbeans.YamlReader; + public class TemplateUtils { private static final Logger logger = LoggerFactory.getLogger(TemplateUtils.class); @@ -76,6 +77,7 @@ public class TemplateUtils { */ private static void adjustConfig(YamlConfig config) { config.setPropertyElementType(ServiceTemplate.class, "plans", Plan.class); + config.setPropertyElementType(Plan.class, "inputs", Input.class); } |