Change the package name of these class. org.openo.commontosca.catalog.model.parser...

Change-Id: I02c7f3468205f0341bedf03fbd66a2fed07a2155
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

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 acd0206..7d4b2e2 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
@@ -17,6 +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 java.util.HashMap;
 import java.util.Map;

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/YamlParseServiceConsumer.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/YamlParseServiceConsumer.java
similarity index 84%
rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/YamlParseServiceConsumer.java
rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/YamlParseServiceConsumer.java
index 2b5ee9a..14ac8a3 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/YamlParseServiceConsumer.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/YamlParseServiceConsumer.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.openo.commontosca.catalog.model.parser.yaml;
+package org.openo.commontosca.catalog.model.parser.yaml.zte;
 
 import com.google.gson.Gson;
-
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 import org.glassfish.jersey.client.ClientConfig;
 import org.openo.commontosca.catalog.common.MsbUtil;
 import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult;
+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/model/parser/yaml/entity/EnumYamlServiceTemplateInfo.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/EnumYamlServiceTemplateInfo.java
similarity index 93%
rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/EnumYamlServiceTemplateInfo.java
rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/EnumYamlServiceTemplateInfo.java
index 54540bf..9380c8c 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/EnumYamlServiceTemplateInfo.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/EnumYamlServiceTemplateInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.commontosca.catalog.model.parser.yaml.entity;
+package org.openo.commontosca.catalog.model.parser.yaml.zte.entity;
 
 
 public enum EnumYamlServiceTemplateInfo {

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlRequestParemeter.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java
similarity index 95%
rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlRequestParemeter.java
rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java
index 8bfb165..9dbb7a1 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlRequestParemeter.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.commontosca.catalog.model.parser.yaml.entity;
+package org.openo.commontosca.catalog.model.parser.yaml.zte.entity;
 
 import java.util.List;
 

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlResult.java
similarity index 99%
rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java
rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlResult.java
index 61014a1..5d2b864 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.commontosca.catalog.model.parser.yaml.entity;
+package org.openo.commontosca.catalog.model.parser.yaml.zte.entity;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/IYamlParseRest.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/IYamlParseRest.java
similarity index 85%
rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/IYamlParseRest.java
rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/IYamlParseRest.java
index 39e419c..4069c82 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/IYamlParseRest.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/IYamlParseRest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.openo.commontosca.catalog.model.parser.yaml;
+package org.openo.commontosca.catalog.model.parser.yaml.zte.service;
 
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;
+import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlRequestParemeter;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ToscaYamlModelParser.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/ToscaYamlModelParser.java
similarity index 92%
rename from catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ToscaYamlModelParser.java
rename to catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/ToscaYamlModelParser.java
index 739ed5e..243cc36 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/ToscaYamlModelParser.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/service/ToscaYamlModelParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.commontosca.catalog.model.parser;
+package org.openo.commontosca.catalog.model.parser.yaml.zte.service;
 
 import org.openo.commontosca.catalog.common.MsbAddrConfig;
 import org.openo.commontosca.catalog.common.ToolUtil;
@@ -30,15 +30,17 @@ import org.openo.commontosca.catalog.model.entity.RelationShip;
 import org.openo.commontosca.catalog.model.entity.ServiceTemplate;
 import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
 import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;
-import org.openo.commontosca.catalog.model.parser.yaml.YamlParseServiceConsumer;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.EnumYamlServiceTemplateInfo;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.Plan;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.Plan.PlanValue.PlanInput;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.TopologyTemplate.Input;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.TopologyTemplate.NodeTemplate.Relationship;
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.TopologyTemplate.Output;
+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;
+import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult.Plan;
+import org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult.Plan.PlanValue.PlanInput;
+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.plan.wso2.Wso2ServiceConsumer;
 import org.openo.commontosca.catalog.model.plan.wso2.entity.DeployPackageResponse;
 import org.openo.commontosca.catalog.wrapper.PackageWrapper;
@@ -197,7 +199,7 @@ public class ToscaYamlModelParser extends AbstractModelParser {
       return null;
     }
 
-    org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult
+    org.openo.commontosca.catalog.model.parser.yaml.zte.entity.ParseYamlResult
         .TopologyTemplate.SubstitutionMapping stm =
         result.getTopologyTemplate().getSubstitutionMappings();
     return new SubstitutionMapping(serviceTemplateId, type, stm.getRequirementList(),

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 658a2f4..29d20d5 100644 (file)
--- 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.ToscaYamlModelParser;
+import org.openo.commontosca.catalog.model.parser.yaml.zte.service.ToscaYamlModelParser;
 import org.openo.commontosca.catalog.model.service.ModelService;
 import org.openo.commontosca.catalog.model.wrapper.ServiceTemplateWrapper;
 import org.slf4j.Logger;