X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plugins%2Fplugins-context%2Fplugins-context-schema%2Fplugins-context-schema-avro%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapex%2Fplugins%2Fcontext%2Fschema%2Favro%2FAvroSchemaKeyTranslationUtilities.java;h=9654572065918dbbd3cdf49dd14bce699f255735;hb=HEAD;hp=6229c066e8a2f80e11c8d2ab4e767cae1ca3eadd;hpb=84f7dcdcae44d4b46c09dd6f0b5fdaec749c55f8;p=policy%2Fapex-pdp.git

diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
index 6229c066e..babca5cb2 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
@@ -1,7 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ *  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.
@@ -26,12 +27,15 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.Map.Entry;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
 /**
  * This static final class contains utility methods for Avro schemas.
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class AvroSchemaKeyTranslationUtilities {
     // Constants for key replacements
     private static final String DOT_STRING = ".";
@@ -41,13 +45,6 @@ public final class AvroSchemaKeyTranslationUtilities {
     private static final String COLON_STRING = ":";
     private static final String COLON_STRING_REPLACEMENT = "_ColoN_";
 
-    /**
-     * Default constructor to avoid subclassing.
-     */
-    private AvroSchemaKeyTranslationUtilities() {
-        // Private constructor to prevent subclassing
-    }
-
     /**
      * Translate characters in JSON keys to values that are legal in Avro. Avro names must start with [A-Za-z_] and
      * subsequently contain only [A-Za-z0-9_]
@@ -62,10 +59,10 @@ public final class AvroSchemaKeyTranslationUtilities {
         }
 
         // Create a JSON element for the incoming JSON string
-        final JsonElement jsonElement = new GsonBuilder().serializeNulls().create().fromJson(jsonString,
+        final var jsonElement = new GsonBuilder().serializeNulls().create().fromJson(jsonString,
                 JsonElement.class);
 
-        final JsonElement translatedJsonElement = translateIllegalKeys(jsonElement, revert);
+        final var translatedJsonElement = translateIllegalKeys(jsonElement, revert);
 
         return new GsonBuilder().serializeNulls().create().toJson(translatedJsonElement);
     }
@@ -98,7 +95,7 @@ public final class AvroSchemaKeyTranslationUtilities {
      * @return the translated JSON element
      */
     public static JsonElement translateIllegalKeys(final JsonObject jsonObject, final boolean revert) {
-        final JsonObject newJsonObject = new JsonObject();
+        final var newJsonObject = new JsonObject();
 
         for (final Entry<String, JsonElement> jsonObjectEntry : jsonObject.entrySet()) {
             newJsonObject.add(translateIllegalKey(jsonObjectEntry.getKey(), revert),
@@ -117,9 +114,9 @@ public final class AvroSchemaKeyTranslationUtilities {
      * @return the translated JSON element
      */
     public static JsonElement translateIllegalKeys(final JsonArray jsonArray, final boolean revert) {
-        final JsonArray newJsonArray = new JsonArray();
+        final var newJsonArray = new JsonArray();
 
-        for (int i = 0; i < jsonArray.size(); i++) {
+        for (var i = 0; i < jsonArray.size(); i++) {
             newJsonArray.add(translateIllegalKeys(jsonArray.get(i), revert));
         }