Release policy/apex-pdp: 3.1.3

[policy/apex-pdp.git] / plugins / plugins-context / plugins-context-schema / plugins-context-schema-avro / src / main / java / org / onap / policy / apex / plugins / context / schema / avro / AvroSchemaKeyTranslationUtilities.java

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 60b394c..babca5c 100644 (file)
--- 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,6 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  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.
@@ -24,27 +26,24 @@ import com.google.gson.GsonBuilder;
 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 = "\\.";
+    private static final String DOT_STRING = ".";
     private static final String DOT_STRING_REPLACEMENT = "_DoT_";
     private static final String DASH_STRING = "-";
     private static final String DASH_STRING_REPLACEMENT = "_DasH_";
-
-    /**
-     * Default constructor to avoid subclassing.
-     */
-    private AvroSchemaKeyTranslationUtilities() {
-        // Private constructor to prevent subclassing
-    }
+    private static final String COLON_STRING = ":";
+    private static final String COLON_STRING_REPLACEMENT = "_ColoN_";
 
     /**
      * Translate characters in JSON keys to values that are legal in Avro. Avro names must start with [A-Za-z_] and
@@ -60,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);
     }
@@ -96,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),
@@ -115,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));
         }
 
@@ -134,9 +133,13 @@ public final class AvroSchemaKeyTranslationUtilities {
      */
     private static String translateIllegalKey(final String key, final boolean revert) {
         if (revert) {
-            return key.replaceAll(DOT_STRING_REPLACEMENT, DOT_STRING).replaceAll(DASH_STRING_REPLACEMENT, DASH_STRING);
+            return key.replace(DOT_STRING_REPLACEMENT, DOT_STRING)
+                    .replace(DASH_STRING_REPLACEMENT, DASH_STRING)
+                    .replace(COLON_STRING_REPLACEMENT, COLON_STRING);
         } else {
-            return key.replaceAll(DOT_STRING, DOT_STRING_REPLACEMENT).replaceAll(DASH_STRING, DASH_STRING_REPLACEMENT);
+            return key.replace(DOT_STRING, DOT_STRING_REPLACEMENT)
+                    .replace(DASH_STRING, DASH_STRING_REPLACEMENT)
+                    .replace(COLON_STRING, COLON_STRING_REPLACEMENT);
         }
     }
 }