Remove Entity annotation from PfConceptContainer

[policy/models.git] / models-base / src / main / java / org / onap / policy / models / base / PfConceptContainer.java

diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java
index b949004..14d6585 100644 (file)
--- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java
@@ -21,6 +21,7 @@
 
 package org.onap.policy.models.base;
 
+import com.google.re2j.Pattern;
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -32,7 +33,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.function.Function;
-
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -42,11 +42,9 @@ import javax.persistence.ManyToMany;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Table;
 import javax.ws.rs.core.Response;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.models.base.PfValidationResult.ValidationResult;
 
@@ -64,7 +62,6 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult;
  */
 //@formatter:on
 @MappedSuperclass
-@Entity
 @Table(name = "PfConceptContainer")
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -73,6 +70,8 @@ public class PfConceptContainer<C extends PfConcept, A extends PfNameVersion> ex
     implements PfConceptGetter<C>, PfAuthorative<List<Map<String, A>>> {
     private static final long serialVersionUID = -324211738823208318L;
 
+    private static final Pattern KEY_ID_PATTERN = Pattern.compile(PfKey.KEY_ID_REGEXP);
+
     @EmbeddedId
     private PfConceptKey key;
 
@@ -106,7 +105,7 @@ public class PfConceptContainer<C extends PfConcept, A extends PfNameVersion> ex
      * @param key the concept key
      */
     public PfConceptContainer(@NonNull final PfConceptKey key) {
-        this(key, new TreeMap<PfConceptKey, C>());
+        this(key, new TreeMap<>());
     }
 
     /**
@@ -183,7 +182,7 @@ public class PfConceptContainer<C extends PfConcept, A extends PfNameVersion> ex
             for (Entry<String, A> incomingConceptEntry : incomingConceptMap.entrySet()) {
 
                 PfConceptKey conceptKey = new PfConceptKey();
-                if (incomingConceptEntry.getKey().matches(PfKey.KEY_ID_REGEXP)) {
+                if (KEY_ID_PATTERN.matches(incomingConceptEntry.getKey())) {
                     conceptKey = new PfConceptKey(incomingConceptEntry.getKey());
                 } else {
                     conceptKey.setName(incomingConceptEntry.getKey());