Use lombok in policy-common utils

Issue-ID: POLICY-3394
Change-Id: I42a18c115c3ca7110f37fc0ae8aeea3f2bbffb37
Signed-off-by: Jim Hahn <jrh3@att.com>

3 files changed, 14 insertions, 18 deletions

diff --git a/utils/src/main/java/org/onap/policy/common/utils/resources/MessageConstants.java b/utils/src/main/java/org/onap/policy/common/utils/resources/MessageConstants.java
index 8ec0c018..ef46fdf5 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/resources/MessageConstants.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/resources/MessageConstants.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +21,14 @@
 
 package org.onap.policy.common.utils.resources;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
 /**
  * Common messages to be used by all components.
  */
-public class MessageConstants {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class MessageConstants {
 
     public static final String POLICY_API = "policy-api";
     public static final String POLICY_PAP = "policy-pap";
@@ -35,8 +40,4 @@ public class MessageConstants {
 
     public static final String START_SUCCESS_MSG = "Started %s service successfully.";
     public static final String START_FAILURE_MSG = "Start of %s service failed.";
-
-    private MessageConstants() {
-        super();
-    }
 }
diff --git a/utils/src/main/java/org/onap/policy/common/utils/resources/ResourceUtils.java b/utils/src/main/java/org/onap/policy/common/utils/resources/ResourceUtils.java
index 589c3098..83d41fb3 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/resources/ResourceUtils.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/resources/ResourceUtils.java
@@ -34,6 +34,8 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +43,8 @@ import org.slf4j.LoggerFactory;
  * This is common utility class with static methods for handling Java resources on the class path. It is an abstract
  * class to prevent any direct instantiation and private constructor to prevent extending this class.
  */
-public abstract class ResourceUtils {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ResourceUtils {
     // Get a reference to the logger
     private static final Logger LOGGER = LoggerFactory.getLogger(ResourceUtils.class);
 
@@ -55,13 +58,6 @@ public abstract class ResourceUtils {
     private static final String JAR_PROTOCOL = "jar";
 
     /**
-     * Private constructor used to prevent sub class instantiation.
-     */
-    private ResourceUtils() {
-        // Prevent construction of this class
-    }
-
-    /**
      * Method to resolve a resource; the local file system is checked first and then the class path is checked.
      *
      * @param resourceName The resource name
diff --git a/utils/src/main/java/org/onap/policy/common/utils/resources/TextFileUtils.java b/utils/src/main/java/org/onap/policy/common/utils/resources/TextFileUtils.java
index 5288beff..9df98801 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/resources/TextFileUtils.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/resources/TextFileUtils.java
@@ -28,6 +28,8 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -36,11 +38,8 @@ import org.apache.commons.io.IOUtils;
  *
  * @author Liam Fallon (liam.fallon@est.tech)
  */
-public class TextFileUtils {
-
-    private TextFileUtils() {
-        // This class cannot be initialized
-    }
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class TextFileUtils {
 
     /**
      * Method to return the contents of a text file as a string.