From cee4b8ae2fc1729d3eec086e0d48e9914fa69006 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Fri, 11 Aug 2023 15:10:44 +0100 Subject: Upgrade Java 17 Issue-ID: POLICY-4673 Change-Id: Ib09bda7db30f53b01b2ea205ad04e5851217da78 Signed-off-by: FrancescoFioraEst --- .../models/acm/document/base/DocConceptKey.java | 2 ++ .../clamp/models/acm/document/base/DocUtil.java | 5 ++-- .../concepts/DocToscaCapabilityAssignment.java | 2 ++ .../document/concepts/DocToscaCapabilityType.java | 2 ++ .../acm/document/concepts/DocToscaConstraint.java | 2 ++ .../acm/document/concepts/DocToscaDataType.java | 2 ++ .../acm/document/concepts/DocToscaEntity.java | 2 ++ .../document/concepts/DocToscaNodeTemplate.java | 2 ++ .../acm/document/concepts/DocToscaNodeType.java | 2 ++ .../acm/document/concepts/DocToscaParameter.java | 2 ++ .../acm/document/concepts/DocToscaPolicy.java | 2 ++ .../acm/document/concepts/DocToscaPolicyType.java | 2 ++ .../acm/document/concepts/DocToscaProperty.java | 2 ++ .../concepts/DocToscaRelationshipType.java | 2 ++ .../acm/document/concepts/DocToscaRequirement.java | 2 ++ .../concepts/DocToscaSchemaDefinition.java | 2 ++ .../document/concepts/DocToscaServiceTemplate.java | 2 ++ .../concepts/DocToscaTopologyTemplate.java | 2 ++ .../concepts/DocToscaWithToscaProperties.java | 2 ++ .../DocToscaWithTypeAndStringProperties.java | 4 +++- .../concepts/JpaAutomationComposition.java | 24 +++++++++---------- .../JpaAutomationCompositionDefinition.java | 27 +++++++++++----------- .../concepts/JpaAutomationCompositionElement.java | 27 +++++++++++----------- .../persistence/concepts/JpaNodeTemplateState.java | 26 ++++++++++----------- .../acm/persistence/concepts/JpaParticipant.java | 22 +++++++++--------- .../JpaParticipantSupportedElementType.java | 12 +++++----- .../persistence/concepts/StringToMapConverter.java | 6 ++--- .../concepts/StringToServiceTemplateConverter.java | 6 ++--- .../persistence/provider/AcDefinitionProvider.java | 5 ++-- .../provider/AutomationCompositionProvider.java | 4 ++-- .../persistence/provider/ParticipantProvider.java | 2 +- .../acm/persistence/provider/ProviderUtils.java | 4 ++-- .../policy/clamp/models/acm/utils/AcmUtils.java | 9 ++++---- .../clamp/models/acm/utils/StateDefinition.java | 2 +- .../concepts/AutomationCompositionElementTest.java | 3 +-- .../acm/concepts/ParticipantInformationTest.java | 2 +- .../ParticipantsSupportedElementTypesTest.java | 2 +- .../JpaParticipantSupportedElementTypeTest.java | 2 +- .../provider/AcDefinitionProviderTest.java | 9 ++++---- .../clamp/models/acm/rest/RestUtilsTest.java | 2 +- 40 files changed, 136 insertions(+), 105 deletions(-) mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocConceptKey.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocUtil.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityAssignment.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithTypeAndStringProperties.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationComposition.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionDefinition.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipant.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementType.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToMapConverter.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToServiceTemplateConverter.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProvider.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ProviderUtils.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/utils/AcmUtils.java mode change 100644 => 100755 models/src/main/java/org/onap/policy/clamp/models/acm/utils/StateDefinition.java mode change 100644 => 100755 models/src/test/java/org/onap/policy/clamp/models/acm/rest/RestUtilsTest.java (limited to 'models/src') diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocConceptKey.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocConceptKey.java old mode 100644 new mode 100755 index 56413d888..eb6df02f9 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocConceptKey.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocConceptKey.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.base; +import java.io.Serial; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -34,6 +35,7 @@ import org.onap.policy.models.base.PfKeyImpl; @ToString public class DocConceptKey extends PfKeyImpl { + @Serial private static final long serialVersionUID = 1L; @Pattern(regexp = NAME_REGEXP) diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocUtil.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocUtil.java old mode 100644 new mode 100755 index 5c4817871..143ee233a --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocUtil.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/base/DocUtil.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.base; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -29,7 +30,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.function.Function; -import javax.ws.rs.core.Response; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.collections4.CollectionUtils; @@ -244,8 +244,7 @@ public final class DocUtil { } else { var list = name.split(":"); switch (list.length) { - case 0: - case 1: + case 0, 1: key.setName(name); key.setVersion(PfKey.NULL_KEY_VERSION); break; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityAssignment.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityAssignment.java old mode 100644 new mode 100755 index 9caefe238..572332eeb --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityAssignment.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaCapabilityAssignment.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -38,6 +39,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaCapabilityAssignme @ToString(callSuper = true) public class DocToscaCapabilityAssignment extends DocToscaWithTypeAndStringProperties { + @Serial private static final long serialVersionUID = 1L; private Map<@NotNull String, @NotNull Object> attributes; 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 38e790ed7..af6d942bc 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 @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -32,6 +33,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaCapabilityType; @NoArgsConstructor public class DocToscaCapabilityType extends DocToscaWithToscaProperties { + @Serial private static final long serialVersionUID = 1L; /** 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 f5b60a1c3..51eb554f5 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 @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint; @NoArgsConstructor public class DocToscaConstraint implements PfAuthorative, Serializable { + @Serial private static final long serialVersionUID = 1L; @SerializedName("valid_values") diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaDataType.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaDataType.java index 73ffe1758..e305f5dcf 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaDataType.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaDataType.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,6 +35,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaDataType; @NoArgsConstructor public class DocToscaDataType extends DocToscaWithToscaProperties { + @Serial private static final long serialVersionUID = 1L; private List<@NotNull @Valid DocToscaConstraint> constraints; 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 5d173aff4..c8484654b 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 @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; @@ -46,6 +47,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaEntityKey; public class DocToscaEntity extends Validated implements PfNameVersion, PfAuthorative, Serializable, Comparable> { + @Serial private static final long serialVersionUID = 1L; @NotNull diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeTemplate.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeTemplate.java index ce67d5167..4a3d92c33 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeTemplate.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeTemplate.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.List; import java.util.Map; import lombok.Data; @@ -37,6 +38,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; @ToString(callSuper = true) public class DocToscaNodeTemplate extends DocToscaWithTypeAndStringProperties { + @Serial private static final long serialVersionUID = 1L; private List> requirements; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeType.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeType.java index 0193a7bff..3d42582bd 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeType.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaNodeType.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.List; import java.util.Map; import lombok.Data; @@ -35,6 +36,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType; @NoArgsConstructor public class DocToscaNodeType extends DocToscaWithToscaProperties { + @Serial private static final long serialVersionUID = 1L; private List> requirements; 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 ab7894a1e..2904962fc 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 @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.io.Serializable; import lombok.Data; import lombok.NoArgsConstructor; @@ -34,6 +35,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaParameter; @NoArgsConstructor public class DocToscaParameter implements PfAuthorative, Serializable, Comparable { + @Serial private static final long serialVersionUID = 1L; @NotNull 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 7b2291bfd..888da9395 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 @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.LinkedHashMap; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,6 +36,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; @ToString(callSuper = true) public class DocToscaPolicy extends DocToscaWithTypeAndStringProperties { + @Serial private static final long serialVersionUID = 1L; // Tags for metadata diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicyType.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicyType.java index a57014425..b6a3b6dec 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicyType.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaPolicyType.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -30,6 +31,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType; @NoArgsConstructor public class DocToscaPolicyType extends DocToscaWithToscaProperties { + @Serial private static final long serialVersionUID = 1L; /** 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 cdd1ab947..b47ef56aa 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 @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.List; @@ -41,6 +42,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty; @NoArgsConstructor public class DocToscaProperty implements PfAuthorative, Serializable, Comparable { + @Serial private static final long serialVersionUID = 1L; @NotNull diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRelationshipType.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRelationshipType.java index 5a650f1df..3164a3013 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRelationshipType.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRelationshipType.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -30,6 +31,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaRelationshipType; @NoArgsConstructor public class DocToscaRelationshipType extends DocToscaWithToscaProperties { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRequirement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRequirement.java index a1e821d56..fd67fb68d 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRequirement.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaRequirement.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.ArrayList; import java.util.List; import lombok.Data; @@ -35,6 +36,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaRequirement; @ToString(callSuper = true) public class DocToscaRequirement extends DocToscaWithTypeAndStringProperties { + @Serial private static final long serialVersionUID = 1L; private String capability; 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 f13ad6c41..c1346a088 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 @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.io.Serializable; import java.util.List; import lombok.Data; @@ -37,6 +38,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaSchemaDefinition; public class DocToscaSchemaDefinition implements PfAuthorative, Serializable, Comparable { + @Serial private static final long serialVersionUID = 1L; private String name; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaServiceTemplate.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaServiceTemplate.java index 3c0de41d6..904cbfc4e 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaServiceTemplate.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaServiceTemplate.java @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.util.LinkedHashMap; import java.util.Map; import lombok.Data; @@ -38,6 +39,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; @EqualsAndHashCode(callSuper = true) public class DocToscaServiceTemplate extends DocToscaEntity { + @Serial private static final long serialVersionUID = 1L; public static final String DEFAULT_TOSCA_DEFINTIONS_VERISON = "tosca_simple_yaml_1_1_0"; 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 1e0a88594..83f5096e8 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 @@ -21,6 +21,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; @@ -41,6 +42,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; public class DocToscaTopologyTemplate extends Validated implements PfAuthorative, Serializable, Comparable { + @Serial private static final long serialVersionUID = 1L; private String description; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithToscaProperties.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithToscaProperties.java index 3b53e1bc8..9a6d60c1c 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithToscaProperties.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithToscaProperties.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.document.concepts; +import java.io.Serial; import java.util.Collection; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -45,6 +46,7 @@ import org.onap.policy.models.tosca.utils.ToscaUtils; @NoArgsConstructor public class DocToscaWithToscaProperties extends DocToscaEntity { + @Serial private static final long serialVersionUID = 1L; private Map<@NotNull @NotBlank String, @NotNull @Valid DocToscaProperty> properties; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithTypeAndStringProperties.java b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithTypeAndStringProperties.java old mode 100644 new mode 100755 index 025aafb07..55b7364c9 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithTypeAndStringProperties.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/document/concepts/DocToscaWithTypeAndStringProperties.java @@ -21,9 +21,10 @@ package org.onap.policy.clamp.models.acm.document.concepts; import com.google.gson.annotations.SerializedName; +import jakarta.ws.rs.core.Response; +import java.io.Serial; import java.util.LinkedHashMap; import java.util.Map; -import javax.ws.rs.core.Response; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -41,6 +42,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaWithTypeAndObjectP @ToString public class DocToscaWithTypeAndStringProperties extends DocToscaEntity { + @Serial private static final long serialVersionUID = 1L; private String type; 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 old mode 100644 new mode 100755 index 7f2a1e5ae..104792143 --- 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 @@ -20,22 +20,22 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; 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 old mode 100644 new mode 100755 index f82152ddc..641c9ad15 --- 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 @@ -20,22 +20,22 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -88,6 +88,7 @@ public class JpaAutomationCompositionDefinition extends Validated private Set elements = new HashSet<>(); @Lob + @Column(length = 100000) @Convert(converter = StringToServiceTemplateConverter.class) @NotNull @Valid 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 old mode 100644 new mode 100755 index 8c679146e..74426a747 --- 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 @@ -22,20 +22,19 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; import java.util.function.UnaryOperator; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -75,10 +74,8 @@ public class JpaAutomationCompositionElement extends Validated @VerifyKey @NotNull - @AttributeOverrides({ - @AttributeOverride(name = "name", column = @Column(name = "definition_name")), - @AttributeOverride(name = "version", column = @Column(name = "definition_version")) - }) + @AttributeOverride(name = "name", column = @Column(name = "definition_name")) + @AttributeOverride(name = "version", column = @Column(name = "definition_version")) private PfConceptKey definition; @Column @@ -112,12 +109,14 @@ public class JpaAutomationCompositionElement extends Validated @NotNull @Valid @Convert(converter = StringToMapConverter.class) + @Column(length = 100000) private Map properties; @Lob @NotNull @Valid @Convert(converter = StringToMapConverter.class) + @Column(length = 100000) private Map outProperties; /** 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 60d339cca..24f17dc0c 100755 --- 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 @@ -20,19 +20,18 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import java.util.Map; import java.util.UUID; import java.util.function.UnaryOperator; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; import org.onap.policy.clamp.models.acm.concepts.AcTypeState; @@ -66,10 +65,8 @@ public class JpaNodeTemplateState extends Validated implements PfAuthorative outProperties; /** 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 old mode 100644 new mode 100755 index 0674873a9..e5eade3d7 --- 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 @@ -20,22 +20,22 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; 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 old mode 100644 new mode 100755 index 906f66fa9..1eef949cc --- 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 @@ -20,13 +20,13 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToMapConverter.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToMapConverter.java old mode 100644 new mode 100755 index 1e06cb16d..e755c34de --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToMapConverter.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToMapConverter.java @@ -20,11 +20,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.ws.rs.core.Response; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToServiceTemplateConverter.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToServiceTemplateConverter.java old mode 100644 new mode 100755 index 79e69128b..01806f564 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToServiceTemplateConverter.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/StringToServiceTemplateConverter.java @@ -20,9 +20,9 @@ package org.onap.policy.clamp.models.acm.persistence.concepts; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.ws.rs.core.Response; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.ws.rs.core.Response; import org.onap.policy.clamp.models.acm.document.concepts.DocToscaServiceTemplate; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; 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 old mode 100644 new mode 100755 index dc4a6e302..588039b07 --- 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 @@ -20,12 +20,11 @@ package org.onap.policy.clamp.models.acm.persistence.provider; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.stream.Collectors; -import javax.ws.rs.core.Response; import lombok.RequiredArgsConstructor; import org.onap.policy.clamp.models.acm.concepts.AcTypeState; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionDefinition; @@ -181,6 +180,6 @@ public class AcDefinitionProvider { } return jpaList.stream().map(JpaAutomationCompositionDefinition::getServiceTemplate) - .map(DocToscaServiceTemplate::toAuthorative).collect(Collectors.toList()); + .map(DocToscaServiceTemplate::toAuthorative).toList(); } } 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 old mode 100644 new mode 100755 index 7b39360f0..6ff8d8432 --- 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 @@ -22,12 +22,12 @@ package org.onap.policy.clamp.models.acm.persistence.provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; import lombok.AllArgsConstructor; import lombok.NonNull; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java old mode 100644 new mode 100755 index 7e8b353ad..3b80aca77 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider; +import jakarta.ws.rs.core.Response.Status; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,7 +28,6 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.core.Response.Status; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement; 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 old mode 100644 new mode 100755 index 871aa8902..4d4b25b77 --- 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 @@ -20,11 +20,11 @@ package org.onap.policy.clamp.models.acm.persistence.provider; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.onap.policy.common.parameters.BeanValidationResult; @@ -95,6 +95,6 @@ public final class ProviderUtils { * @return the authorative list */ public static > List asEntityList(List jpaEntityList) { - return jpaEntityList.stream().map(J::toAuthorative).collect(Collectors.toList()); + return jpaEntityList.stream().map(J::toAuthorative).toList(); } } 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 old mode 100644 new mode 100755 index ae49ec69f..258c6dc93 --- 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 @@ -20,6 +20,7 @@ package org.onap.policy.clamp.models.acm.utils; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -30,7 +31,6 @@ import java.util.UUID; import java.util.function.Function; import java.util.function.UnaryOperator; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.collections4.CollectionUtils; @@ -170,7 +170,7 @@ public final class AcmUtils { return serviceTemplate.getToscaTopologyTemplate().getNodeTemplates().entrySet().stream().filter( nodeTemplateEntry -> checkIfNodeTemplateIsAutomationCompositionElement(nodeTemplateEntry.getValue(), serviceTemplate)) - .collect(Collectors.toList()); + .toList(); } /** @@ -277,7 +277,7 @@ public final class AcmUtils { .stream() .map(elementMap -> map.get(new ToscaConceptIdentifier(elementMap.get("name"), elementMap.get("version")))) - .collect(Collectors.toList()); + .toList(); // @formatter:on } @@ -343,8 +343,7 @@ public final class AcmUtils { public static DeployState deployCompleted(DeployState deployState) { DeployState result = null; switch (deployState) { - case UPDATING: - case DEPLOYING: + case UPDATING, DEPLOYING: result = DeployState.DEPLOYED; break; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/utils/StateDefinition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/utils/StateDefinition.java old mode 100644 new mode 100755 index 4593484b7..b7c6a31ac --- a/models/src/main/java/org/onap/policy/clamp/models/acm/utils/StateDefinition.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/utils/StateDefinition.java @@ -20,9 +20,9 @@ package org.onap.policy.clamp.models.acm.utils; +import jakarta.ws.rs.core.Response.Status; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; import lombok.NonNull; import org.onap.policy.models.base.PfModelRuntimeException; diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java index e044a2f22..f29858fbb 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java @@ -34,7 +34,6 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; class AutomationCompositionElementTest { @Test void testAutomationCompositionElement() { - assertNotNull(new AutomationCompositionElement()); var ace0 = new AutomationCompositionElement(); var ace1 = new AutomationCompositionElement(ace0); assertEquals(ace0, ace1); @@ -54,7 +53,7 @@ class AutomationCompositionElementTest { assertThat(ace0.toString()).contains("AutomationCompositionElement("); assertThat(ace0.hashCode()).isNotZero(); - assertEquals(ace0, ace0); + assertThat(ace0).isEqualTo(ace0); assertNotEquals(null, ace0); var ace1 = new AutomationCompositionElement(); diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantInformationTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantInformationTest.java index 4c01f659c..fd06b3941 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantInformationTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantInformationTest.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.UUID; import org.junit.jupiter.api.Test; -public class ParticipantInformationTest { +class ParticipantInformationTest { @Test void testCopyConstructor() { diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantsSupportedElementTypesTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantsSupportedElementTypesTest.java index 5a82466d6..827daf035 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantsSupportedElementTypesTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantsSupportedElementTypesTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.UUID; import org.junit.jupiter.api.Test; -public class ParticipantsSupportedElementTypesTest { +class ParticipantsSupportedElementTypesTest { private static final String ID = "a95757ba-b34a-4049-a2a8-46773abcbe5e"; diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementTypeTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementTypeTest.java index 2faf9e17a..8afb5aead 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementTypeTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantSupportedElementTypeTest.java @@ -32,7 +32,7 @@ import org.onap.policy.clamp.models.acm.concepts.ParticipantSupportedElementType /** * Test the {@link JpaParticipantSupportedElementType} class. */ -public class JpaParticipantSupportedElementTypeTest { +class JpaParticipantSupportedElementTypeTest { private static final String NULL_PARTICIPANT_ID_ERROR = "participantId is marked .*ull but is null"; private static final String NULL_ID_ERROR = "id is marked .*ull but is null"; diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProviderTest.java index b479f022f..f907892f9 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProviderTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcDefinitionProviderTest.java @@ -90,11 +90,12 @@ class AcDefinitionProviderTest { var result = acDefinitionProvider.createAutomationCompositionDefinition(inputServiceTemplate); assertThat(result.getServiceTemplate()).isEqualTo(docServiceTemplate.toAuthorative()); - assertThat(result.getServiceTemplate().getMetadata() != null); + assertThat(result.getServiceTemplate().getMetadata()).isNotNull(); } @Test void testCreateServiceTemplateWithMetadata() { + inputServiceTemplate.setMetadata(new HashMap<>()); var docServiceTemplate = new DocToscaServiceTemplate(inputServiceTemplate); var acmDefinition = getAcDefinition(docServiceTemplate); @@ -103,11 +104,10 @@ class AcDefinitionProviderTest { .thenReturn(new JpaAutomationCompositionDefinition(acmDefinition)); var acDefinitionProvider = new AcDefinitionProvider(acmDefinitionRepository); - inputServiceTemplate.setMetadata(new HashMap<>()); var result = acDefinitionProvider.createAutomationCompositionDefinition(inputServiceTemplate); assertThat(result.getServiceTemplate()).isEqualTo(docServiceTemplate.toAuthorative()); - assertThat(result.getServiceTemplate().getMetadata() != null); + assertThat(result.getServiceTemplate().getMetadata()).isNotNull(); } @Test @@ -234,8 +234,7 @@ class AcDefinitionProviderTest { result = acDefinitionProvider.getServiceTemplateList(null, null); - assertThat(result).hasSize(0); - assertThat(result.isEmpty()); + assertThat(result).isEmpty(); } private AutomationCompositionDefinition getAcDefinition(DocToscaServiceTemplate docServiceTemplate) { diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/rest/RestUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/rest/RestUtilsTest.java old mode 100644 new mode 100755 index a62f78ba2..e6135fe5b --- a/models/src/test/java/org/onap/policy/clamp/models/acm/rest/RestUtilsTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/rest/RestUtilsTest.java @@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.rest; import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.Test; import org.onap.policy.models.errors.concepts.ErrorResponse; import org.onap.policy.models.errors.concepts.ErrorResponseInfo; -- cgit 1.2.3-korg