aboutsummaryrefslogtreecommitdiffstats
path: root/models-pdp
diff options
context:
space:
mode:
Diffstat (limited to 'models-pdp')
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java30
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java41
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java30
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java28
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java49
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java28
6 files changed, 65 insertions, 141 deletions
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java
index 6d6b6fedd..a62d90090 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdent.java
@@ -20,31 +20,31 @@
package org.onap.policy.models.pdp.concepts;
+import lombok.Data;
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. Both the name and version must be non-null.
*/
-@NonNull
+@Data
@NoArgsConstructor
-public class PolicyIdent extends PfConceptKey {
- private static final long serialVersionUID = 1L;
- private static final Validated validator = new Validated();
+public class PolicyIdent {
- public PolicyIdent(String name, String version) {
- super(name, version);
- }
+ @NonNull
+ private String name;
- public PolicyIdent(PolicyIdent source) {
- super(source);
+ @NonNull
+ private String version;
+
+
+ public PolicyIdent(@NonNull String name, @NonNull String version) {
+ this.name = name;
+ this.version = version;
}
- @Override
- public PfValidationResult validate(PfValidationResult result) {
- return super.validate(validator.validateNotNull(this, result));
+ public PolicyIdent(PolicyIdent source) {
+ this.name = source.name;
+ this.version = source.version;
}
}
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java
index a68a271f2..f86a3c46d 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyIdentOptVersion.java
@@ -20,42 +20,39 @@
package org.onap.policy.models.pdp.concepts;
+import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
-import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfKey;
-import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.base.Validated;
/**
* Policy identifier with an optional version; only the "name" is required.
*/
-@NonNull
+@Data
@NoArgsConstructor
-public class PolicyIdentOptVersion extends PfConceptKey {
- private static final long serialVersionUID = 1L;
- private static final Validated validator = new Validated();
+public class PolicyIdentOptVersion {
+ @NonNull
+ private String name;
+
+ private String version;
+
+
+ public PolicyIdentOptVersion(@NonNull String name, String version) {
+ this.name = name;
+ this.version = version;
+ }
public PolicyIdentOptVersion(PolicyIdentOptVersion source) {
- super(source);
+ this.name = source.name;
+ this.version = source.version;
}
/**
- * Validates the object.
+ * Determines if the version is null/missing.
*
- * @param resultIn where to place any errors
- * @return a validation result
+ * @return {@code true} if the version is null/missing, {@code false}
*/
- public PfValidationResult validate(@NonNull final PfValidationResult resultIn) {
- PfValidationResult result = resultIn;
-
- String name = getName();
- if (PfConceptKey.NULL_KEY_NAME.equals(name)) {
- validator.addError(this, "name", result, "null");
- }
- result = validator.validateText(this, "name", name, PfKey.NAME_REGEXP, result);
-
- return validator.validateText(this, "version", getVersion(), PfKey.VERSION_REGEXP, result);
+ public boolean isNullVersion() {
+ return (version == null);
}
}
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
index ef67de86e..44ca168f5 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PolicyTypeIdent.java
@@ -20,31 +20,31 @@
package org.onap.policy.models.pdp.concepts;
+import lombok.Data;
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.
*/
-@NonNull
+@Data
@NoArgsConstructor
-public class PolicyTypeIdent extends PfConceptKey {
- private static final long serialVersionUID = 1L;
- private static final Validated validator = new Validated();
+public class PolicyTypeIdent {
- public PolicyTypeIdent(String name, String version) {
- super(name, version);
- }
+ @NonNull
+ private String name;
- public PolicyTypeIdent(PolicyTypeIdent source) {
- super(source);
+ @NonNull
+ private String version;
+
+
+ public PolicyTypeIdent(@NonNull String name, @NonNull String version) {
+ this.name = name;
+ this.version = version;
}
- @Override
- public PfValidationResult validate(PfValidationResult result) {
- return super.validate(validator.validateNotNull(this, result));
+ public PolicyTypeIdent(PolicyTypeIdent source) {
+ this.name = source.name;
+ this.version = source.version;
}
}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java
index 4cd5570e2..da942468a 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java
@@ -22,11 +22,8 @@ package org.onap.policy.models.pdp.concepts;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.onap.policy.models.base.PfValidationResult;
/**
* Test the other constructors, as {@link TestModels} tests the other methods.
@@ -62,29 +59,4 @@ public class TestPolicyIdent extends IdentTestBase<PolicyIdent> {
orig = new PolicyIdent(NAME, VERSION);
assertEquals(orig.toString(), new PolicyIdent(orig).toString());
}
-
- @Test
- public void testValidate() throws Exception {
- assertTrue(makeIdent(NAME, VERSION).validate(new PfValidationResult()).isValid());
-
- // everything is null
- PfValidationResult result = makeIdent(null, null).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(2, result.getMessageList().size());
-
- // name is null
- result = makeIdent(null, VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // version is null
- result = makeIdent(NAME, null).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // version is invalid
- result = makeIdent(NAME, "!!!" + VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
- }
}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java
index 3428ac1be..6ae7ad32b 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.onap.policy.models.base.PfValidationResult;
/**
* Test the other constructors, as {@link TestModels} tests the other methods.
@@ -40,6 +39,22 @@ public class TestPolicyIdentOptVersion extends IdentTestBase<PolicyIdentOptVersi
}
@Test
+ public void testAllArgsConstructor_testIsNullVersion() {
+ assertThatThrownBy(() -> new PolicyIdentOptVersion(null, VERSION)).isInstanceOf(NullPointerException.class);
+
+ // with null version
+ PolicyIdentOptVersion orig = new PolicyIdentOptVersion(NAME, null);
+ assertEquals(NAME, orig.getName());
+ assertEquals(null, orig.getVersion());
+ assertTrue(orig.isNullVersion());
+
+ orig = new PolicyIdentOptVersion(NAME, VERSION);
+ assertEquals(NAME, orig.getName());
+ assertEquals(VERSION, orig.getVersion());
+ assertFalse(orig.isNullVersion());
+ }
+
+ @Test
public void testCopyConstructor() throws Exception {
assertThatThrownBy(() -> new PolicyIdentOptVersion(null)).isInstanceOf(NullPointerException.class);
@@ -52,36 +67,4 @@ public class TestPolicyIdentOptVersion extends IdentTestBase<PolicyIdentOptVersi
orig = makeIdent(NAME, VERSION);
assertEquals(orig.toString(), new PolicyIdentOptVersion(orig).toString());
}
-
- @Test
- public void testValidate() throws Exception {
- assertThatThrownBy(() -> makeIdent(NAME, VERSION).validate(null)).isInstanceOf(NullPointerException.class);
- assertTrue(makeIdent(NAME, VERSION).validate(new PfValidationResult()).isValid());
- assertTrue(makeIdent(NAME, null).validate(new PfValidationResult()).isValid());
-
- // everything is null
- PfValidationResult result = makeIdent(null, null).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // name is null
- result = makeIdent(null, VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // name is null, version is invalid
- result = makeIdent(null, "$$$" + VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(2, result.getMessageList().size());
-
- // name is invalid
- result = makeIdent("!!!invalid name$$$", VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // version is invalid
- result = makeIdent(NAME, "!!!" + VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
- }
}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java
index 5b7494ebf..9247544fd 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java
@@ -22,11 +22,8 @@ package org.onap.policy.models.pdp.concepts;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.onap.policy.models.base.PfValidationResult;
/**
* Test the other constructors, as {@link TestModels} tests the other methods.
@@ -63,29 +60,4 @@ public class TestPolicyTypeIdent extends IdentTestBase<PolicyTypeIdent> {
assertEquals(orig.toString(), new PolicyTypeIdent(orig).toString());
}
- @Test
- public void testValidate() throws Exception {
- assertTrue(makeIdent(NAME, VERSION).validate(new PfValidationResult()).isValid());
-
- // everything is null
- PfValidationResult result = makeIdent(null, null).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(2, result.getMessageList().size());
-
- // name is null
- result = makeIdent(null, VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // version is null
- result = makeIdent(NAME, null).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
-
- // version is invalid
- result = makeIdent(NAME, "!!!" + VERSION).validate(new PfValidationResult());
- assertFalse(result.isValid());
- assertEquals(1, result.getMessageList().size());
- }
-
}