From ccf10e681044664888d7e0e0b50623bdbe92de5a Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Mon, 11 Nov 2024 14:58:58 +0100
Subject: Update vulnerable dependencies in schema-service

- update freemarker (2.3.21 -> 2.3.33)
- update snakeyaml (1.29 -> 2.3)
- remove duplicate declarations of dependencies in pom
- remove aai-aaf-auth dependency

Issue-ID: AAI-4052
Change-Id: Ice8a520f024c024ae7118378176df6fe1242f1bb
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-queries/pom.xml                                |  6 ++++++
 .../onap/aai/queries/GremlinServerSingleton.java   | 22 ----------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

(limited to 'aai-queries')

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index 82381eb..32906e9 100644
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -104,6 +104,12 @@
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.onap.aai.aai-common</groupId>
+                    <artifactId>aai-aaf-auth</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
diff --git a/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java b/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java
index 2387f04..57cdf4d 100644
--- a/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java
+++ b/aai-queries/src/main/java/org/onap/aai/queries/GremlinServerSingleton.java
@@ -31,7 +31,6 @@ import java.util.TimerTask;
 
 import javax.annotation.PostConstruct;
 
-import org.onap.aai.aaf.auth.FileWatcher;
 import org.onap.aai.logging.LogFormatTools;
 import org.onap.aai.util.AAIConstants;
 import org.slf4j.Logger;
@@ -74,27 +73,6 @@ public class GremlinServerSingleton {
                 + LogFormatTools.getStackTop(e));
         }
 
-        TimerTask task = new FileWatcher(new File(storedQueriesLocation)) {
-            @Override
-            protected void onChange(File file) {
-                try {
-                    String filepath = storedQueriesLocation;
-                    Path path = Paths.get(filepath);
-                    String customQueryConfigJson = new String(Files.readAllBytes(path));
-                    queryConfig = new GetCustomQueryConfig(customQueryConfigJson);
-                } catch (IOException e) {
-                    logger.error("Error occurred during the processing of query json file: "
-                        + LogFormatTools.getStackTop(e));
-                }
-            }
-        };
-
-        if (!timerSet) {
-            timerSet = true;
-            timer = new Timer();
-            timer.schedule(task, new Date(), 10000);
-        }
-
     }
 
     /**
-- 
cgit