From 87a397631307a4c03607fdbac1c420fd810ee395 Mon Sep 17 00:00:00 2001 From: YuanHu Date: Tue, 13 Sep 2016 15:17:22 +0800 Subject: [PATCH] Change the package name of these classes. Change-Id: I5d900f9d02f7abacceba7b499fe7c03cba7b3511 Signed-off-by: YuanHu --- .../openo/commontosca/catalog/model/parser/ModelParserFactory.java | 2 +- .../model/parser/yaml/zte/{service => }/ToscaYamlModelParser.java | 4 ++-- .../model/parser/yaml/zte/{ => service}/YamlParseServiceConsumer.java | 3 +-- .../org/openo/commontosca/catalog/resources/TemplateResource.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/{service => }/ToscaYamlModelParser.java (99%) rename catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/{ => service}/YamlParseServiceConsumer.java (92%) 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 7d4b2e22..a0de8473 100644 --- 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 @@ -17,7 +17,7 @@ package org.openo.commontosca.catalog.model.parser; import org.openo.commontosca.catalog.db.exception.CatalogResourceException; -import org.openo.commontosca.catalog.model.parser.yaml.zte.service.ToscaYamlModelParser; +import org.openo.commontosca.catalog.model.parser.yaml.zte.ToscaYamlModelParser; import java.util.HashMap; import java.util.Map; diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/ToscaYamlModelParser.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/ToscaYamlModelParser.java similarity index 99% rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/ToscaYamlModelParser.java rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/ToscaYamlModelParser.java index 243cc361..88a5ba47 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/ToscaYamlModelParser.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/ToscaYamlModelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.commontosca.catalog.model.parser.yaml.zte.service; +package org.openo.commontosca.catalog.model.parser.yaml.zte; import org.openo.commontosca.catalog.common.MsbAddrConfig; import org.openo.commontosca.catalog.common.ToolUtil; @@ -32,7 +32,6 @@ import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation; import org.openo.commontosca.catalog.model.entity.SubstitutionMapping; import org.openo.commontosca.catalog.model.parser.AbstractModelParser; import org.openo.commontosca.catalog.model.parser.EnumTemplateType; -import org.openo.commontosca.catalog.model.parser.yaml.zte.YamlParseServiceConsumer; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.EnumYamlServiceTemplateInfo; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlRequestParemeter; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult; @@ -41,6 +40,7 @@ import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResul import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult.TopologyTemplate.Input; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult.TopologyTemplate.Output; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult.TopologyTemplate.NodeTemplate.Relationship; +import org.openo.commontosca.catalog.model.parser.yaml.zte.service.YamlParseServiceConsumer; import org.openo.commontosca.catalog.model.plan.wso2.Wso2ServiceConsumer; import org.openo.commontosca.catalog.model.plan.wso2.entity.DeployPackageResponse; import org.openo.commontosca.catalog.wrapper.PackageWrapper; diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/YamlParseServiceConsumer.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/YamlParseServiceConsumer.java similarity index 92% rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/YamlParseServiceConsumer.java rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/YamlParseServiceConsumer.java index 14ac8a37..707b5f3e 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/YamlParseServiceConsumer.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/YamlParseServiceConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.commontosca.catalog.model.parser.yaml.zte; +package org.openo.commontosca.catalog.model.parser.yaml.zte.service; import com.google.gson.Gson; import com.eclipsesource.jaxrs.consumer.ConsumerFactory; @@ -24,7 +24,6 @@ import org.openo.commontosca.catalog.common.MsbUtil; import org.openo.commontosca.catalog.db.exception.CatalogResourceException; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlRequestParemeter; import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult; -import org.openo.commontosca.catalog.model.parser.yaml.zte.service.IYamlParseRest; public class YamlParseServiceConsumer { diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/resources/TemplateResource.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/resources/TemplateResource.java index 29d20d5c..ecc3301e 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/resources/TemplateResource.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/resources/TemplateResource.java @@ -35,7 +35,7 @@ import org.openo.commontosca.catalog.model.entity.QueryRawDataCondition; import org.openo.commontosca.catalog.model.entity.ServiceTemplate; import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation; import org.openo.commontosca.catalog.model.entity.ServiceTemplateRawData; -import org.openo.commontosca.catalog.model.parser.yaml.zte.service.ToscaYamlModelParser; +import org.openo.commontosca.catalog.model.parser.yaml.zte.ToscaYamlModelParser; import org.openo.commontosca.catalog.model.service.ModelService; import org.openo.commontosca.catalog.model.wrapper.ServiceTemplateWrapper; import org.slf4j.Logger; -- 2.16.6