diff options
Diffstat (limited to 'models-pdp/src/main')
3 files changed, 49 insertions, 52 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; } } |