From a559cb58bcf4a55ce58b9fc3b3480db371827edd Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Thu, 14 Nov 2024 14:15:35 +0100
Subject: Remove eelf-core from aai-common

- the dependency is not maintained anymore

Issue-ID: AAI-4059
Change-Id: I5f089236e680630bb14bcfd9b29f3b1cd4545574
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-core/pom.xml                                            |  7 +------
 .../org/onap/aai/serialization/queryformats/TreeFormat.java | 13 +++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'aai-core')

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 41772b96..45f4fe75 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-parent</artifactId>
-		<version>1.15.2-SNAPSHOT</version>
+		<version>1.15.3-SNAPSHOT</version>
 		<relativePath>../aai-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>aai-core</artifactId>
@@ -141,11 +141,6 @@ limitations under the License.
 			</exclusion>
 		</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>com.att.eelf</groupId>
-			<artifactId>eelf-core</artifactId>
-			<version>2.0.0-oss</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java
index 0da0ec55..0cebca70 100644
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java
@@ -20,13 +20,13 @@
 
 package org.onap.aai.serialization.queryformats;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
@@ -50,8 +50,9 @@ import org.onap.aai.serialization.queryformats.params.Depth;
 import org.onap.aai.serialization.queryformats.params.NodesOnly;
 import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
 
+@Slf4j
 public class TreeFormat extends MultiFormatMapper {
-    private static final EELFLogger TREE_FORMAT_LOGGER = EELFManager.getInstance().getLogger(TreeFormat.class);
+
     protected final DBSerializer serializer;
     protected final Loader loader;
     protected final UrlBuilder urlBuilder;
@@ -145,14 +146,14 @@ public class TreeFormat extends MultiFormatMapper {
         for (Object o : queryResults) {
             try {
                 return this.formatObjectToJsonArray(o, properties).orElseGet(() -> {
-                    TREE_FORMAT_LOGGER.warn("Empty Optional returned by 'formatObjectToJsonArray'");
+                    log.warn("Empty Optional returned by 'formatObjectToJsonArray'");
                     return body;
                 });
             } catch (AAIFormatVertexException e) {
-                TREE_FORMAT_LOGGER
+                log
                         .warn("Failed to format vertex, returning a partial list " + LogFormatTools.getStackTop(e));
             } catch (AAIFormatQueryResultFormatNotSupported e) {
-                TREE_FORMAT_LOGGER.warn("Failed to format result type of the query " + LogFormatTools.getStackTop(e));
+                log.warn("Failed to format result type of the query " + LogFormatTools.getStackTop(e));
             }
         }
         return body;
-- 
cgit 1.2.3-korg