From: danielhanrahan Date: Thu, 19 Feb 2026 17:30:45 +0000 (+0000) Subject: Move validation classes to clamp models package X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=HEAD;p=policy%2Fclamp.git Move validation classes to clamp models package This commit moves classes such as PfAuthorative from policy-models into models module, closer to where there are used. This will allow easier refactoring in future. Issue-ID: POLICY-5509 Change-Id: I8f0b00ea907855d9683f9ac0bbb7a1b2a98d0c3b Signed-off-by: danielhanrahan --- diff --git a/policy-models/src/main/java/org/onap/policy/models/base/PfAuthorative.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/PfAuthorative.java similarity index 97% rename from policy-models/src/main/java/org/onap/policy/models/base/PfAuthorative.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/PfAuthorative.java index b0610e4ea..585f6c773 100644 --- a/policy-models/src/main/java/org/onap/policy/models/base/PfAuthorative.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/PfAuthorative.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.models.base; +package org.onap.policy.clamp.models.acm.base; /** * Interface that provides conversion to and from authorative concepts for other concepts. diff --git a/policy-common/src/main/java/org/onap/policy/common/parameters/BeanValidationResult.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/BeanValidationResult.java similarity index 98% rename from policy-common/src/main/java/org/onap/policy/common/parameters/BeanValidationResult.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/BeanValidationResult.java index cc27fd14e..b9ec12c3c 100644 --- a/policy-common/src/main/java/org/onap/policy/common/parameters/BeanValidationResult.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/BeanValidationResult.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; import java.util.ArrayList; import java.util.List; diff --git a/policy-common/src/main/java/org/onap/policy/common/parameters/BeanValidator.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/BeanValidator.java similarity index 97% rename from policy-common/src/main/java/org/onap/policy/common/parameters/BeanValidator.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/BeanValidator.java index 95acfd295..7e0603442 100644 --- a/policy-common/src/main/java/org/onap/policy/common/parameters/BeanValidator.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/BeanValidator.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/policy-common/src/main/java/org/onap/policy/common/parameters/ObjectValidationResult.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ObjectValidationResult.java similarity index 97% rename from policy-common/src/main/java/org/onap/policy/common/parameters/ObjectValidationResult.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ObjectValidationResult.java index 50a42b9c4..a3993dcf2 100644 --- a/policy-common/src/main/java/org/onap/policy/common/parameters/ObjectValidationResult.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ObjectValidationResult.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; /** * This class holds the result of the validation of an object within a bean. diff --git a/policy-common/src/main/java/org/onap/policy/common/parameters/ValidationResult.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationResult.java similarity index 97% rename from policy-common/src/main/java/org/onap/policy/common/parameters/ValidationResult.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationResult.java index d0bb6924c..f603f78bf 100644 --- a/policy-common/src/main/java/org/onap/policy/common/parameters/ValidationResult.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationResult.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; /** * This interface defines the result of a parameter validation. diff --git a/policy-common/src/main/java/org/onap/policy/common/parameters/ValidationResultImpl.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationResultImpl.java similarity index 98% rename from policy-common/src/main/java/org/onap/policy/common/parameters/ValidationResultImpl.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationResultImpl.java index b223dfccb..42be64509 100644 --- a/policy-common/src/main/java/org/onap/policy/common/parameters/ValidationResultImpl.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationResultImpl.java @@ -20,7 +20,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/policy-common/src/main/java/org/onap/policy/common/parameters/ValidationStatus.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationStatus.java similarity index 96% rename from policy-common/src/main/java/org/onap/policy/common/parameters/ValidationStatus.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationStatus.java index a34de41d2..fc949ebfc 100644 --- a/policy-common/src/main/java/org/onap/policy/common/parameters/ValidationStatus.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/ValidationStatus.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; public enum ValidationStatus { CLEAN, diff --git a/policy-models/src/main/java/org/onap/policy/models/base/validation/annotations/VerifyKey.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/annotations/VerifyKey.java similarity index 97% rename from policy-models/src/main/java/org/onap/policy/models/base/validation/annotations/VerifyKey.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/annotations/VerifyKey.java index b7e4b416c..c5e294bab 100644 --- a/policy-models/src/main/java/org/onap/policy/models/base/validation/annotations/VerifyKey.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/annotations/VerifyKey.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.models.base.validation.annotations; +package org.onap.policy.clamp.models.acm.base.validation.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/policy-models/src/main/java/org/onap/policy/models/base/validation/annotations/VerifyKeyValidator.java b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/annotations/VerifyKeyValidator.java similarity index 97% rename from policy-models/src/main/java/org/onap/policy/models/base/validation/annotations/VerifyKeyValidator.java rename to models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/annotations/VerifyKeyValidator.java index 508ef5d3c..3b8ea94cf 100644 --- a/policy-models/src/main/java/org/onap/policy/models/base/validation/annotations/VerifyKeyValidator.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/base/validation/annotations/VerifyKeyValidator.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.models.base.validation.annotations; +package org.onap.policy.clamp.models.acm.base.validation.annotations; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidation.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidation.java index d6208553d..31bf830c7 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidation.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidation.java @@ -27,11 +27,11 @@ import java.util.Set; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.NonNull; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; +import org.onap.policy.clamp.models.acm.base.validation.ValidationStatus; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaEntity; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaServiceTemplate; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaTopologyTemplate; -import org.onap.policy.common.parameters.BeanValidationResult; -import org.onap.policy.common.parameters.ValidationStatus; import org.onap.policy.models.base.PfUtils; @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityType.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityType.java index 87f573591..d88e9b7fb 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityType.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityType.java @@ -24,8 +24,8 @@ import java.io.Serial; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.onap.policy.clamp.models.acm.base.validation.annotations.VerifyKey; import org.onap.policy.models.base.PfConceptKey; -import org.onap.policy.models.base.validation.annotations.VerifyKey; import org.onap.policy.models.tosca.authorative.concepts.ToscaCapabilityType; @Data diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaConstraint.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaConstraint.java index 662b4c5fa..e09f6cad9 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaConstraint.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaConstraint.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; -import org.onap.policy.models.base.PfAuthorative; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint; @Data diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaEntity.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaEntity.java index e38f01155..9efa16e09 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaEntity.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaEntity.java @@ -32,8 +32,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.document.base.DocConceptKey; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfKey; import org.onap.policy.models.base.PfNameVersion; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaParameter.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaParameter.java index ae5037f73..650e18b6f 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaParameter.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaParameter.java @@ -26,7 +26,7 @@ import java.io.Serial; import java.io.Serializable; import lombok.Data; import lombok.NoArgsConstructor; -import org.onap.policy.models.base.PfAuthorative; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.models.base.PfKey; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaParameter; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicy.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicy.java index c85db2f99..1d00c9a2d 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicy.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicy.java @@ -27,8 +27,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.NonNull; import lombok.ToString; +import org.onap.policy.clamp.models.acm.base.validation.annotations.VerifyKey; import org.onap.policy.models.base.PfConceptKey; -import org.onap.policy.models.base.validation.annotations.VerifyKey; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; @Data diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaProperty.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaProperty.java index 5a408bae4..8cd63e298 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaProperty.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaProperty.java @@ -32,9 +32,9 @@ import java.util.Map; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.document.base.DocConceptKey; import org.onap.policy.clamp.models.acm.document.base.DocUtil; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaSchemaDefinition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaSchemaDefinition.java index 1caf27220..793811907 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaSchemaDefinition.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaSchemaDefinition.java @@ -29,9 +29,9 @@ import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.document.base.DocConceptKey; import org.onap.policy.clamp.models.acm.document.base.DocUtil; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaSchemaDefinition; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaTopologyTemplate.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaTopologyTemplate.java index bed773d02..822157e26 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaTopologyTemplate.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaTopologyTemplate.java @@ -30,8 +30,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.document.base.DocUtil; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/messages/kafka/participant/PropertiesUpdate.java b/models/src/main/java/org/onap/policy/clamp/models/acm/messages/kafka/participant/PropertiesUpdate.java index e76f4aa44..5251ce179 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/messages/kafka/participant/PropertiesUpdate.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/messages/kafka/participant/PropertiesUpdate.java @@ -28,7 +28,6 @@ import lombok.ToString; import org.onap.policy.clamp.models.acm.concepts.ParticipantDeploy; import org.onap.policy.models.base.PfUtils; - /** * Class to represent the PROPERTIES_UPDATE message that the ACM runtime sends to a participant. * The ACM Runtime sends updated automation composition element property values to Participants. diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java index fa6be7e30..7a71b9eda 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java @@ -44,13 +44,13 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.NonNull; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; import org.onap.policy.clamp.models.acm.concepts.DeployState; import org.onap.policy.clamp.models.acm.concepts.LockState; import org.onap.policy.clamp.models.acm.concepts.StateChangeResult; import org.onap.policy.clamp.models.acm.concepts.SubState; import org.onap.policy.clamp.models.acm.utils.TimestampHelper; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfUtils; /** diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java index c21c498db..e53bb529b 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java @@ -41,12 +41,12 @@ import java.util.Set; import java.util.UUID; import lombok.Data; import lombok.EqualsAndHashCode; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.concepts.AcTypeState; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionDefinition; import org.onap.policy.clamp.models.acm.concepts.StateChangeResult; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaServiceTemplate; import org.onap.policy.clamp.models.acm.utils.TimestampHelper; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfKey; /** diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java index 58668b0e0..17848650a 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java @@ -39,15 +39,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; +import org.onap.policy.clamp.models.acm.base.validation.annotations.VerifyKey; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement; import org.onap.policy.clamp.models.acm.concepts.DeployState; import org.onap.policy.clamp.models.acm.concepts.LockState; import org.onap.policy.clamp.models.acm.concepts.MigrationState; import org.onap.policy.clamp.models.acm.concepts.SubState; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfUtils; -import org.onap.policy.models.base.validation.annotations.VerifyKey; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; /** diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionRollback.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionRollback.java index 229501c9f..d811a3fd9 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionRollback.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionRollback.java @@ -38,9 +38,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionRollback; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfUtils; @Entity diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessage.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessage.java index 2eed79f5a..b7e944fe7 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessage.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessage.java @@ -33,9 +33,9 @@ import java.sql.Timestamp; import java.util.UUID; import lombok.Data; import lombok.NonNull; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.document.concepts.DocMessage; import org.onap.policy.clamp.models.acm.utils.TimestampHelper; -import org.onap.policy.models.base.PfAuthorative; @Entity @Table(name = "Message", indexes = {@Index(name = "m_identificationId", columnList = "identificationId")}) diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java index 01b7876a3..9a5c3e1d0 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaNodeTemplateState.java @@ -35,12 +35,12 @@ import java.util.UUID; import java.util.function.UnaryOperator; import lombok.Data; import lombok.EqualsAndHashCode; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; +import org.onap.policy.clamp.models.acm.base.validation.annotations.VerifyKey; import org.onap.policy.clamp.models.acm.concepts.AcTypeState; import org.onap.policy.clamp.models.acm.concepts.NodeTemplateState; -import org.onap.policy.models.base.PfAuthorative; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfUtils; -import org.onap.policy.models.base.validation.annotations.VerifyKey; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; @Entity diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java index 87afa179a..07ba4de1f 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java @@ -41,8 +41,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.concepts.Participant; -import org.onap.policy.models.base.PfAuthorative; /** * Class to represent a participant in the database. diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantReplica.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantReplica.java index e20379937..e31c01110 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantReplica.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantReplica.java @@ -32,10 +32,10 @@ import java.util.UUID; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.concepts.ParticipantReplica; import org.onap.policy.clamp.models.acm.concepts.ParticipantState; import org.onap.policy.clamp.models.acm.utils.TimestampHelper; -import org.onap.policy.models.base.PfAuthorative; @Entity @Table(name = "ParticipantReplica") diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementType.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementType.java index 75dc9bc4a..05886890c 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementType.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementType.java @@ -32,8 +32,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; import org.apache.commons.lang3.ObjectUtils; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; import org.onap.policy.clamp.models.acm.concepts.ParticipantSupportedElementType; -import org.onap.policy.models.base.PfAuthorative; @Entity @Table(name = "ParticipantSupportedAcElements") diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProvider.java index accae2e2e..be2ac57e7 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProvider.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProvider.java @@ -29,6 +29,7 @@ import java.util.UUID; import java.util.stream.Collectors; import lombok.NonNull; import lombok.RequiredArgsConstructor; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; import org.onap.policy.clamp.models.acm.concepts.AcTypeState; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionDefinition; import org.onap.policy.clamp.models.acm.document.base.ToscaServiceTemplateValidation; @@ -37,7 +38,6 @@ import org.onap.policy.clamp.models.acm.persistence.concepts.JpaAutomationCompos import org.onap.policy.clamp.models.acm.persistence.repository.AutomationCompositionDefinitionRepository; import org.onap.policy.clamp.models.acm.utils.AcmUtils; import org.onap.policy.clamp.models.acm.utils.TimestampHelper; -import org.onap.policy.common.parameters.BeanValidationResult; import org.onap.policy.models.base.PfModelRuntimeException; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.springframework.data.domain.Example; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java index b238c5e50..a38545fcd 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java @@ -31,6 +31,8 @@ import java.util.UUID; import java.util.stream.Collectors; import lombok.AllArgsConstructor; import lombok.NonNull; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; +import org.onap.policy.clamp.models.acm.base.validation.ValidationStatus; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionRollback; @@ -44,8 +46,6 @@ import org.onap.policy.clamp.models.acm.persistence.repository.AutomationComposi import org.onap.policy.clamp.models.acm.persistence.repository.AutomationCompositionRepository; import org.onap.policy.clamp.models.acm.persistence.repository.AutomationCompositionRollbackRepository; import org.onap.policy.clamp.models.acm.utils.AcmStateUtils; -import org.onap.policy.common.parameters.BeanValidationResult; -import org.onap.policy.common.parameters.ValidationStatus; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfKey; import org.onap.policy.models.base.PfModelRuntimeException; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ProviderUtils.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ProviderUtils.java index d7c60616f..c6a28e56a 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ProviderUtils.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ProviderUtils.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.function.Supplier; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.onap.policy.common.parameters.BeanValidationResult; -import org.onap.policy.common.parameters.BeanValidator; -import org.onap.policy.models.base.PfAuthorative; +import org.onap.policy.clamp.models.acm.base.PfAuthorative; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; import org.onap.policy.models.base.PfModelRuntimeException; @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java b/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java index 8e370ab36..208e925df 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java @@ -38,6 +38,10 @@ import lombok.NoArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.tuple.Pair; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; +import org.onap.policy.clamp.models.acm.base.validation.ObjectValidationResult; +import org.onap.policy.clamp.models.acm.base.validation.ValidationResult; +import org.onap.policy.clamp.models.acm.base.validation.ValidationStatus; import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy; import org.onap.policy.clamp.models.acm.concepts.AcElementRestart; import org.onap.policy.clamp.models.acm.concepts.AcTypeState; @@ -52,10 +56,6 @@ import org.onap.policy.clamp.models.acm.concepts.ParticipantDeploy; import org.onap.policy.clamp.models.acm.concepts.ParticipantRestartAc; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; import org.onap.policy.clamp.models.acm.persistence.concepts.StringToMapConverter; -import org.onap.policy.common.parameters.BeanValidationResult; -import org.onap.policy.common.parameters.ObjectValidationResult; -import org.onap.policy.common.parameters.ValidationResult; -import org.onap.policy.common.parameters.ValidationStatus; import org.onap.policy.models.base.PfModelRuntimeException; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; diff --git a/policy-models/src/test/java/org/onap/policy/models/base/validation/annotations/VerifyKeyValidatorTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/base/annotations/VerifyKeyValidatorTest.java similarity index 96% rename from policy-models/src/test/java/org/onap/policy/models/base/validation/annotations/VerifyKeyValidatorTest.java rename to models/src/test/java/org/onap/policy/clamp/models/acm/base/annotations/VerifyKeyValidatorTest.java index 2db9b58d2..0f4a877cc 100644 --- a/policy-models/src/test/java/org/onap/policy/models/base/validation/annotations/VerifyKeyValidatorTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/base/annotations/VerifyKeyValidatorTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.models.base.validation.annotations; +package org.onap.policy.clamp.models.acm.base.annotations; import static org.assertj.core.api.Assertions.assertThat; @@ -26,7 +26,8 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Getter; import org.junit.jupiter.api.Test; -import org.onap.policy.common.parameters.BeanValidator; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; +import org.onap.policy.clamp.models.acm.base.validation.annotations.VerifyKey; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfKey; diff --git a/policy-common/src/test/java/org/onap/policy/common/parameters/TestBeanValidationResult.java b/models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestBeanValidationResult.java similarity index 98% rename from policy-common/src/test/java/org/onap/policy/common/parameters/TestBeanValidationResult.java rename to models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestBeanValidationResult.java index 19b3c1a94..c6249d373 100644 --- a/policy-common/src/test/java/org/onap/policy/common/parameters/TestBeanValidationResult.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestBeanValidationResult.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/policy-common/src/test/java/org/onap/policy/common/parameters/TestObjectValidationResult.java b/models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestObjectValidationResult.java similarity index 97% rename from policy-common/src/test/java/org/onap/policy/common/parameters/TestObjectValidationResult.java rename to models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestObjectValidationResult.java index fee1b737f..a42a061bd 100644 --- a/policy-common/src/test/java/org/onap/policy/common/parameters/TestObjectValidationResult.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestObjectValidationResult.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/policy-common/src/test/java/org/onap/policy/common/parameters/TestValidationResultImpl.java b/models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestValidationResultImpl.java similarity index 98% rename from policy-common/src/test/java/org/onap/policy/common/parameters/TestValidationResultImpl.java rename to models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestValidationResultImpl.java index 1b8f4f04b..7bfa24098 100644 --- a/policy-common/src/test/java/org/onap/policy/common/parameters/TestValidationResultImpl.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/base/validation/TestValidationResultImpl.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.common.parameters; +package org.onap.policy.clamp.models.acm.base.validation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidationTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidationTest.java index 1568af18b..9a6e5f15c 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidationTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/document/base/ToscaServiceTemplateValidationTest.java @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaDataType; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaNodeTemplate; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaPolicy; @@ -33,7 +34,6 @@ import org.onap.policy.clamp.models.acm.document.concepts.DocToscaProperty; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaRequirement; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaServiceTemplate; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaTopologyTemplate; -import org.onap.policy.common.parameters.BeanValidationResult; class ToscaServiceTemplateValidationTest { diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java index a9b69f8a8..30810705c 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java @@ -30,13 +30,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement; import org.onap.policy.clamp.models.acm.concepts.DeployState; import org.onap.policy.clamp.models.acm.concepts.LockState; import org.onap.policy.clamp.models.acm.concepts.MigrationState; import org.onap.policy.clamp.models.acm.concepts.SubState; import org.onap.policy.clamp.models.acm.utils.CommonTestData; -import org.onap.policy.common.parameters.BeanValidator; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java index 8a386c85d..9f322174c 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java @@ -32,13 +32,13 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; import org.onap.policy.clamp.models.acm.concepts.DeployState; import org.onap.policy.clamp.models.acm.concepts.LockState; import org.onap.policy.clamp.models.acm.concepts.StateChangeResult; import org.onap.policy.clamp.models.acm.concepts.SubState; import org.onap.policy.clamp.models.acm.utils.TimestampHelper; -import org.onap.policy.common.parameters.BeanValidator; /** * Test the{@link JpaAutomationCompositionTest} class. diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageJobTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageJobTest.java index e17407549..1e8106f83 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageJobTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageJobTest.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.onap.policy.common.parameters.BeanValidator; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; class JpaMessageJobTest { diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageTest.java index dfc76bccd..34c66f20d 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaMessageTest.java @@ -27,10 +27,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; import org.onap.policy.clamp.models.acm.concepts.DeployState; import org.onap.policy.clamp.models.acm.document.concepts.DocMessage; import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantMessageType; -import org.onap.policy.common.parameters.BeanValidator; class JpaMessageTest { diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java index 7ef721e90..d49018cc0 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; import org.onap.policy.clamp.models.acm.concepts.Participant; -import org.onap.policy.common.parameters.BeanValidator; /** * Test the {@link JpaParticipant} class. diff --git a/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java b/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java index e7bacb0d3..676f3fff7 100644 --- a/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java +++ b/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java @@ -30,7 +30,7 @@ import org.onap.policy.clamp.acm.element.handler.MessageHandler; import org.onap.policy.clamp.acm.element.main.concepts.ElementConfig; import org.onap.policy.clamp.acm.element.main.parameters.ElementTopicParameters; import org.onap.policy.clamp.common.acm.exception.AutomationCompositionRuntimeException; -import org.onap.policy.common.parameters.BeanValidator; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidator; import org.onap.policy.common.parameters.topic.TopicParameterGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/policy-common/src/test/java/org/onap/policy/common/message/bus/event/TopicParameterGroupTest.java b/policy-common/src/test/java/org/onap/policy/common/message/bus/event/TopicParameterGroupTest.java index e50d78f41..863b41349 100644 --- a/policy-common/src/test/java/org/onap/policy/common/message/bus/event/TopicParameterGroupTest.java +++ b/policy-common/src/test/java/org/onap/policy/common/message/bus/event/TopicParameterGroupTest.java @@ -21,18 +21,20 @@ package org.onap.policy.common.message.bus.event; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; -import org.onap.policy.common.parameters.BeanValidator; -import org.onap.policy.common.parameters.ValidationResult; import org.onap.policy.common.parameters.topic.BusTopicParams; import org.onap.policy.common.parameters.topic.TopicParameterGroup; import org.onap.policy.common.parameters.topic.TopicParameters; @@ -48,13 +50,15 @@ import org.onap.policy.common.utils.coder.StandardCoder; class TopicParameterGroupTest { private static final CommonTestData testData = new CommonTestData(); private static final Coder coder = new StandardCoder(); + private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); + private static final Validator validator = factory.getValidator(); private final String packageDir = "src/test/resources/org/onap/policy/common/message/bus/parameters/"; @Test void test() throws CoderException { final TopicParameterGroup topicParameterGroup = testData.toObject(testData.getTopicParameterGroupMap(false)); - assertTrue(BeanValidator.isValid(topicParameterGroup)); + assertTrue(isValid(topicParameterGroup)); assertEquals(CommonTestData.TOPIC_PARAMS, topicParameterGroup.getTopicSinks()); assertEquals(CommonTestData.TOPIC_PARAMS, topicParameterGroup.getTopicSources()); @@ -70,7 +74,7 @@ class TopicParameterGroupTest { void testValidate() { final TopicParameterGroup topicParameterGroup = testData.toObject(testData.getTopicParameterGroupMap(false)); - assertTrue(BeanValidator.isValid(topicParameterGroup)); + assertTrue(isValid(topicParameterGroup)); } @Test @@ -78,7 +82,7 @@ class TopicParameterGroupTest { String json = testData.getParameterGroupAsString( packageDir + "TopicParameters_valid.json"); TopicParameterGroup topicParameterGroup = coder.decode(json, TopicParameterGroup.class); - assertTrue(BeanValidator.isValid(topicParameterGroup)); + assertTrue(isValid(topicParameterGroup)); } @Test @@ -86,7 +90,7 @@ class TopicParameterGroupTest { String json = testData.getParameterGroupAsString( packageDir + "TopicParameters_invalid.json"); TopicParameterGroup topicParameterGroup = coder.decode(json, TopicParameterGroup.class); - assertFalse(BeanValidator.isValid(topicParameterGroup)); + assertFalse(isValid(topicParameterGroup)); } @Test @@ -94,9 +98,9 @@ class TopicParameterGroupTest { String json = testData.getParameterGroupAsString( packageDir + "TopicParameters_missing_mandatory.json"); TopicParameterGroup topicParameterGroup = coder.decode(json, TopicParameterGroup.class); - final ValidationResult result = BeanValidator.validate("", topicParameterGroup); - assertTrue(result.getResult().contains("\"topicSources[0].servers\" value \"[]\" INVALID, must not be empty")); - assertFalse(result.isValid()); + final var violations = validator.validate(topicParameterGroup); + assertFalse(violations.isEmpty()); + assertThat(violations.toString()).contains("topicSources[0].servers").contains("must not be empty"); } @Test @@ -104,7 +108,7 @@ class TopicParameterGroupTest { String json = testData.getParameterGroupAsString( packageDir + "TopicParameters_all_params.json"); TopicParameterGroup topicParameterGroup = coder.decode(json, TopicParameterGroup.class); - assertTrue(BeanValidator.isValid(topicParameterGroup)); + assertTrue(isValid(topicParameterGroup)); assertTrue(checkIfAllParamsNotEmpty(topicParameterGroup.getTopicSinks())); assertTrue(checkIfAllParamsNotEmpty(topicParameterGroup.getTopicSources())); } @@ -135,4 +139,9 @@ class TopicParameterGroupTest { } return true; } + + private boolean isValid(TopicParameterGroup group) { + var violations = validator.validate(group); + return violations.isEmpty(); + } } diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java index 60fa172f6..e98943e47 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java @@ -33,6 +33,7 @@ import lombok.RequiredArgsConstructor; import org.onap.policy.clamp.acm.runtime.main.parameters.AcRuntimeParameterGroup; import org.onap.policy.clamp.acm.runtime.main.utils.EncryptionUtils; import org.onap.policy.clamp.acm.runtime.supervision.SupervisionAcHandler; +import org.onap.policy.clamp.models.acm.base.validation.BeanValidationResult; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionDefinition; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement; @@ -54,7 +55,6 @@ import org.onap.policy.clamp.models.acm.persistence.provider.ParticipantProvider import org.onap.policy.clamp.models.acm.utils.AcmStageUtils; import org.onap.policy.clamp.models.acm.utils.AcmStateUtils; import org.onap.policy.clamp.models.acm.utils.AcmUtils; -import org.onap.policy.common.parameters.BeanValidationResult; import org.onap.policy.models.base.PfModelRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory;