Restructure for authorative models

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

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
similarity index 92%
rename from models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java
rename to models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
index f2ae051..e7d51a5 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
@@ -53,7 +53,7 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 @MappedSuperclass
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ToscaEntityType extends PfConcept {
+public class JpaToscaEntityType extends PfConcept {
     private static final long serialVersionUID = -1330661834220739393L;
 
     @EmbeddedId
@@ -77,18 +77,18 @@ public class ToscaEntityType extends PfConcept {
     // @formatter:on
 
     /**
-     * The Default Constructor creates a {@link ToscaEntityType} object with a null key.
+     * The Default Constructor creates a {@link JpaToscaEntityType} object with a null key.
      */
-    public ToscaEntityType() {
+    public JpaToscaEntityType() {
         this(new PfConceptKey());
     }
 
     /**
-     * The Key Constructor creates a {@link ToscaEntityType} object with the given concept key.
+     * The Key Constructor creates a {@link JpaToscaEntityType} object with the given concept key.
      *
      * @param key the key
      */
-    public ToscaEntityType(@NonNull final PfConceptKey key) {
+    public JpaToscaEntityType(@NonNull final PfConceptKey key) {
         this.key = key;
     }
 
@@ -97,7 +97,7 @@ public class ToscaEntityType extends PfConcept {
      *
      * @param copyConcept the concept to copy from
      */
-    public ToscaEntityType(final ToscaEntityType copyConcept) {
+    public JpaToscaEntityType(final JpaToscaEntityType copyConcept) {
         super(copyConcept);
     }
 
@@ -176,7 +176,7 @@ public class ToscaEntityType extends PfConcept {
             return this.hashCode() - otherConcept.hashCode();
         }
 
-        final ToscaEntityType other = (ToscaEntityType) otherConcept;
+        final JpaToscaEntityType other = (JpaToscaEntityType) otherConcept;
         if (!key.equals(other.key)) {
             return key.compareTo(other.key);
         }
@@ -199,7 +199,7 @@ public class ToscaEntityType extends PfConcept {
         final Object copyObject = target;
         Assertions.instanceOf(copyObject, PfConcept.class);
 
-        final ToscaEntityType copy = ((ToscaEntityType) copyObject);
+        final JpaToscaEntityType copy = ((JpaToscaEntityType) copyObject);
         copy.setKey(new PfConceptKey(key));
         copy.setDerivedFrom(derivedFrom != null ? new PfConceptKey(derivedFrom) : null);