Add PolicyIdentOptVersion

[policy/models.git] / models-pdp / src / main / java / org / onap / policy / models / pdp / concepts / PolicyTypeIdent.java

diff --git a/models-base/src/main/java/org/onap/policy/models/base/keys/PolicyTypeIdent.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
similarity index 80%
rename from models-base/src/main/java/org/onap/policy/models/base/keys/PolicyTypeIdent.java
rename to models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
index 09e0381..ef67de8 100644 (file)
--- a/models-base/src/main/java/org/onap/policy/models/base/keys/PolicyTypeIdent.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
@@ -18,11 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.models.base.keys;
+package org.onap.policy.models.pdp.concepts;
 
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import org.onap.policy.models.base.PfConceptKey;
+import org.onap.policy.models.base.PfValidationResult;
+import org.onap.policy.models.base.Validated;
 
 /**
  * Identifies a policy type. Both the name and version must be non-null.
@@ -31,6 +33,7 @@ import org.onap.policy.models.base.PfConceptKey;
 @NoArgsConstructor
 public class PolicyTypeIdent extends PfConceptKey {
     private static final long serialVersionUID = 1L;
+    private static final Validated validator = new Validated();
 
     public PolicyTypeIdent(String name, String version) {
         super(name, version);
@@ -39,4 +42,9 @@ public class PolicyTypeIdent extends PfConceptKey {
     public PolicyTypeIdent(PolicyTypeIdent source) {
         super(source);
     }
+
+    @Override
+    public PfValidationResult validate(PfValidationResult result) {
+        return super.validate(validator.validateNotNull(this, result));
+    }
 }