Restructure for authorative models

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

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaTopologyTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplate.java
similarity index 84%
rename from models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaTopologyTemplate.java
rename to models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplate.java
index 5b21ca0..095435a 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaTopologyTemplate.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplate.java
@@ -55,7 +55,7 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ToscaTopologyTemplate extends PfConcept {
+public class JpaToscaTopologyTemplate extends PfConcept {
     private static final long serialVersionUID = 8969698734673232603L;
 
     public static final String DEFAULT_LOCAL_NAME = "ToscaTopologyTemplateSimple";
@@ -67,23 +67,23 @@ public class ToscaTopologyTemplate extends PfConcept {
     private String description;
 
     @OneToOne(cascade = CascadeType.ALL)
-    private ToscaPolicies policies;
+    private JpaToscaPolicies policies;
 
     /**
-     * The Default Constructor creates a {@link ToscaTopologyTemplate} object with a null key.
+     * The Default Constructor creates a {@link JpaToscaTopologyTemplate} object with a null key.
      */
-    public ToscaTopologyTemplate() {
-        this(new PfReferenceKey(ToscaServiceTemplate.DEFAULT_NAME, ToscaServiceTemplate.DEFAULT_VERSION,
+    public JpaToscaTopologyTemplate() {
+        this(new PfReferenceKey(JpaToscaServiceTemplate.DEFAULT_NAME, JpaToscaServiceTemplate.DEFAULT_VERSION,
                 DEFAULT_LOCAL_NAME));
     }
 
     /**
-     * The Key Constructor creates a {@link ToscaTopologyTemplate} object with the given concept
+     * The Key Constructor creates a {@link JpaToscaTopologyTemplate} object with the given concept
      * key.
      *
      * @param key the key
      */
-    public ToscaTopologyTemplate(@NonNull final PfReferenceKey key) {
+    public JpaToscaTopologyTemplate(@NonNull final PfReferenceKey key) {
         this.key = key;
     }
 
@@ -92,7 +92,7 @@ public class ToscaTopologyTemplate extends PfConcept {
      *
      * @param copyConcept the concept to copy from
      */
-    public ToscaTopologyTemplate(final ToscaTopologyTemplate copyConcept) {
+    public JpaToscaTopologyTemplate(final JpaToscaTopologyTemplate copyConcept) {
         super(copyConcept);
     }
 
@@ -153,7 +153,7 @@ public class ToscaTopologyTemplate extends PfConcept {
             return this.hashCode() - otherConcept.hashCode();
         }
 
-        final ToscaTopologyTemplate other = (ToscaTopologyTemplate) otherConcept;
+        final JpaToscaTopologyTemplate other = (JpaToscaTopologyTemplate) otherConcept;
         if (!key.equals(other.key)) {
             return key.compareTo(other.key);
         }
@@ -171,10 +171,10 @@ public class ToscaTopologyTemplate extends PfConcept {
         final Object copyObject = target;
         Assertions.instanceOf(copyObject, PfConcept.class);
 
-        final ToscaTopologyTemplate copy = ((ToscaTopologyTemplate) copyObject);
+        final JpaToscaTopologyTemplate copy = ((JpaToscaTopologyTemplate) copyObject);
         copy.setKey(new PfReferenceKey(key));
         copy.setDescription(description);
-        copy.setPolicies(policies != null ? new ToscaPolicies(policies) : null);
+        copy.setPolicies(policies != null ? new JpaToscaPolicies(policies) : null);
 
         return copy;
     }