Restructure for authorative models

[policy/models.git] / models-tosca / src / main / java / org / onap / policy / models / tosca / simple / concepts / JpaToscaServiceTemplate.java

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaServiceTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplate.java
similarity index 83%
rename from models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaServiceTemplate.java
rename to models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplate.java
index c3bb916..fa2d2aa 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaServiceTemplate.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplate.java
@@ -57,7 +57,7 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ToscaServiceTemplate extends ToscaEntityType {
+public class JpaToscaServiceTemplate extends JpaToscaEntityType {
     private static final long serialVersionUID = 8084846046148349401L;
 
     public static final String DEFAULT_NAME = "ToscaServiceTemplateSimple";
@@ -69,40 +69,40 @@ public class ToscaServiceTemplate extends ToscaEntityType {
 
     @OneToOne(cascade = CascadeType.ALL)
     @SerializedName("data_types")
-    private ToscaDataTypes dataTypes;
+    private JpaToscaDataTypes dataTypes;
 
     @OneToOne(cascade = CascadeType.ALL)
     @SerializedName("policy_types")
-    private ToscaPolicyTypes policyTypes;
+    private JpaToscaPolicyTypes policyTypes;
 
     @SerializedName("topology_template")
-    private ToscaTopologyTemplate topologyTemplate;
+    private JpaToscaTopologyTemplate topologyTemplate;
 
 
     /**
-     * The Default Constructor creates a {@link ToscaServiceTemplate} object with a null key.
+     * The Default Constructor creates a {@link JpaToscaServiceTemplate} object with a null key.
      */
-    public ToscaServiceTemplate() {
+    public JpaToscaServiceTemplate() {
         this(new PfConceptKey(DEFAULT_NAME, DEFAULT_VERSION));
     }
 
     /**
-     * The Key Constructor creates a {@link ToscaServiceTemplate} object with the given concept key.
+     * The Key Constructor creates a {@link JpaToscaServiceTemplate} object with the given concept key.
      *
      * @param key the key
      */
-    public ToscaServiceTemplate(@NonNull final PfConceptKey key) {
+    public JpaToscaServiceTemplate(@NonNull final PfConceptKey key) {
         this(key, "");
     }
 
     /**
-     * The full constructor creates a {@link ToscaServiceTemplate} object with all mandatory
+     * The full constructor creates a {@link JpaToscaServiceTemplate} object with all mandatory
      * parameters.
      *
      * @param key the key
      * @param toscaDefinitionsVersion the TOSCA version string
      */
-    public ToscaServiceTemplate(@NonNull final PfConceptKey key, @NonNull final String toscaDefinitionsVersion) {
+    public JpaToscaServiceTemplate(@NonNull final PfConceptKey key, @NonNull final String toscaDefinitionsVersion) {
         super(key);
         this.toscaDefinitionsVersion = toscaDefinitionsVersion;
     }
@@ -112,7 +112,7 @@ public class ToscaServiceTemplate extends ToscaEntityType {
      *
      * @param copyConcept the concept to copy from
      */
-    public ToscaServiceTemplate(final ToscaServiceTemplate copyConcept) {
+    public JpaToscaServiceTemplate(final JpaToscaServiceTemplate copyConcept) {
         super(copyConcept);
     }
 
@@ -184,7 +184,7 @@ public class ToscaServiceTemplate extends ToscaEntityType {
             return this.hashCode() - otherConcept.hashCode();
         }
 
-        final ToscaServiceTemplate other = (ToscaServiceTemplate) otherConcept;
+        final JpaToscaServiceTemplate other = (JpaToscaServiceTemplate) otherConcept;
         if (!super.equals(other)) {
             return super.compareTo(other);
         }
@@ -212,13 +212,13 @@ public class ToscaServiceTemplate extends ToscaEntityType {
         final Object copyObject = target;
         Assertions.instanceOf(copyObject, PfConcept.class);
 
-        final ToscaServiceTemplate copy = ((ToscaServiceTemplate) copyObject);
+        final JpaToscaServiceTemplate copy = ((JpaToscaServiceTemplate) copyObject);
         super.copyTo(target);
         copy.setToscaDefinitionsVersion(toscaDefinitionsVersion);
 
-        copy.setDataTypes(dataTypes != null ? new ToscaDataTypes(dataTypes) : null);
-        copy.setPolicyTypes(policyTypes != null ? new ToscaPolicyTypes(policyTypes) : null);
-        copy.setTopologyTemplate(topologyTemplate != null ? new ToscaTopologyTemplate(topologyTemplate) : null);
+        copy.setDataTypes(dataTypes != null ? new JpaToscaDataTypes(dataTypes) : null);
+        copy.setPolicyTypes(policyTypes != null ? new JpaToscaPolicyTypes(policyTypes) : null);
+        copy.setTopologyTemplate(topologyTemplate != null ? new JpaToscaTopologyTemplate(topologyTemplate) : null);
 
         return copy;
     }