From 175aa75c1a4b1f0cee27d534831ff9382c83047a Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 17 Jun 2021 16:05:25 -0400 Subject: Use lombok annotations for tosca, rest, sdnc Issue-ID: POLICY-3396 Change-Id: I3c9e5ee7ea6da2bab4fe37504d39f7ce63868887 Signed-off-by: Jim Hahn --- .../policy/models/tosca/utils/ToscaServiceTemplateUtils.java | 11 ++++------- .../java/org/onap/policy/models/tosca/utils/ToscaUtils.java | 10 +++------- 2 files changed, 7 insertions(+), 14 deletions(-) (limited to 'models-tosca/src/main/java') diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java index 362653650..7f6fbb2f3 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java @@ -23,6 +23,8 @@ package org.onap.policy.models.tosca.utils; import java.util.Map.Entry; import javax.ws.rs.core.Response; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import lombok.NonNull; import org.onap.policy.common.parameters.BeanValidationResult; import org.onap.policy.models.base.PfConceptContainer; @@ -37,13 +39,8 @@ import org.onap.policy.models.tosca.simple.concepts.JpaToscaTopologyTemplate; /** * This utility class provides methods to manage service templates. */ -public class ToscaServiceTemplateUtils { - /** - * Private constructor to prevent subclassing. - */ - private ToscaServiceTemplateUtils() { - // Private constructor to prevent subclassing - } +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class ToscaServiceTemplateUtils { /** * Add a service template fragment to a service template. All entities in the service template fragment must either diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaUtils.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaUtils.java index 450b589c5..5ec8247ac 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaUtils.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaUtils.java @@ -26,6 +26,8 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; import javax.ws.rs.core.Response; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import lombok.NonNull; import org.apache.commons.collections4.CollectionUtils; import org.onap.policy.common.parameters.BeanValidationResult; @@ -46,6 +48,7 @@ import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate; * * @author Liam Fallon (liam.fallon@est.tech) */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class ToscaUtils { private static final String ROOT_KEY_NAME_SUFFIX = ".Root"; @@ -67,13 +70,6 @@ public final class ToscaUtils { ); // @formatter:on - /** - * Private constructor to prevent subclassing. - */ - private ToscaUtils() { - // Private constructor to prevent subclassing - } - /** * Get the predefined policy types. * -- cgit 1.2.3-korg