From 0f1d8544e4311a47e30fd76822e7da60bd37885f Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Fri, 22 Nov 2024 09:55:53 +0100 Subject: [PATCH] Use 1.15.3-SNAPSHOT of aai-common - upgrade spring-boot (2.6.15 -> 2.7.18) - upgrade tinkerpop (3.7.1 -> 3.7.3) - upgrade janusgraph (1.0.0 -> 1.0.1) - remove eelf-core dependency - remove aai logging-service dependency Issue-ID: AAI-4068 Change-Id: I8c0f0b9dc429152fa07f758b6b7870525fb64114 Signed-off-by: Fiete Ostkamp --- README.md | 15 ++------------- aai-traversal/pom.xml | 8 ++------ .../onap/aai/config/PropertyPasswordConfiguration.java | 2 -- .../org/onap/aai/rest/search/GremlinServerSingleton.java | 6 +----- .../java/org/onap/aai/rest/search/LocalCQConfig.java | 2 -- .../org/onap/aai/rest/search/SchemaServiceCQConfig.java | 2 -- .../src/main/java/org/onap/aai/util/MakeNamedQuery.java | 2 -- aai-traversal/src/main/resources/application.properties | 1 + aai-traversal/src/main/resources/logback.xml | 7 ------- .../src/test/java/org/onap/aai/QueryParameterTest.java | 2 -- .../src/test/java/org/onap/aai/rest/RecentApiTest.java | 2 -- .../java/org/onap/aai/rest/SearchProviderRestTest.java | 2 -- .../onap/aai/rest/retired/RetiredConsumerSpringTest.java | 2 -- .../TopologyFromSubscriberNameAndServiceTypeTest.java | 1 - aai-traversal/src/test/resources/logback.xml | 16 ---------------- pom.xml | 8 ++++---- version.properties | 2 +- 17 files changed, 11 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index ea453eb9..e0f2f9aa 100644 --- a/README.md +++ b/README.md @@ -35,23 +35,13 @@ The MSO APIs are configured to accept requests having a **basic auth. header** s All API endpoints are exposed on port **8443**. -##### Example API endpoints in the first open source release +##### Example API endpoints in the first open source release http://aai.api.simpledemo.openecomp.org:8443/aai/v10/query The easy way to trigger these endpoints is to use a RESTful client or automation framework. HTTP GET/PUT/DELETE are supported for most resource endpoints. More information on the REST interface can be found in the AAI Service REST API specification. ## Configuring AAI -The Docker containers use a Chef based configuration file (JSON) in order to provision AAI basic configuration for the demo app use case set up. - -## Logging -EELF framework is used for **specific logs** (audit, metric and error logs). They are tracking inter component logs (request and response) and allow to follow a complete flow through the AAI subsystem - -EELF logs are located at the following location on the AAI Service container: - -- `/opt/app/aai-traversal/logs` (each module has its own folder) - -AJSC Jetty logs can be found under /opt/app/aai-traversal/logs/ajsc-jetty. -The REST interface logs can be found under /opt/app/aai-traversal/logs/rest. +The Docker containers use a Chef based configuration file (JSON) in order to provision AAI basic configuration for the demo app use case set up. ## Testing AAI Functionalities Any RESTful client such as SoapUI may be configured and setup to use for testing AAI requests. @@ -61,4 +51,3 @@ Integration tests are located in `it` directory, and disabled by default in the `true` As a naming convention, All integration test classes should end with `IT`, and will be executed by changing the `skipITs` value in pom file, or through the command line `-DskipITs=false` - diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 11d271d4..4c644e05 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.traversal traversal - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT org.onap.aai.traversal aai-traversal @@ -303,6 +303,7 @@ io.micrometer micrometer-jersey2 + 1.8.13 javax.ws.rs @@ -326,11 +327,6 @@ org.apache.commons commons-lang3 - - com.att.eelf - eelf-core - 2.0.0-oss - ch.qos.logback logback-core diff --git a/aai-traversal/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java b/aai-traversal/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java index 5d5a075a..34023e8a 100644 --- a/aai-traversal/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java +++ b/aai-traversal/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java @@ -19,8 +19,6 @@ */ package org.onap.aai.config; -import com.att.eelf.configuration.EELFManager; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/GremlinServerSingleton.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/GremlinServerSingleton.java index 8ddf8152..172b2e61 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/GremlinServerSingleton.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/GremlinServerSingleton.java @@ -19,8 +19,6 @@ */ package org.onap.aai.rest.search; -import com.att.eelf.configuration.EELFManager; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -44,8 +42,6 @@ import org.springframework.beans.factory.annotation.Value; public class GremlinServerSingleton { - private static Logger logger = LoggerFactory.getLogger(GremlinServerSingleton.class); - private boolean timerSet; private Timer timer; @@ -66,7 +62,7 @@ public class GremlinServerSingleton { /** * Gets the query using CustomQueryConfig - * + * * @param key * @return */ diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java index ad5eb4ec..a34506ed 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java @@ -19,8 +19,6 @@ */ package org.onap.aai.rest.search; -import com.att.eelf.configuration.EELFManager; - import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java index 49986deb..143d2a8b 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java @@ -19,8 +19,6 @@ */ package org.onap.aai.rest.search; -import com.att.eelf.configuration.EELFManager; - import java.util.HashMap; import java.util.Map; diff --git a/aai-traversal/src/main/java/org/onap/aai/util/MakeNamedQuery.java b/aai-traversal/src/main/java/org/onap/aai/util/MakeNamedQuery.java index 7bda3bb9..5a32003d 100644 --- a/aai-traversal/src/main/java/org/onap/aai/util/MakeNamedQuery.java +++ b/aai-traversal/src/main/java/org/onap/aai/util/MakeNamedQuery.java @@ -19,8 +19,6 @@ */ package org.onap.aai.util; -import com.att.eelf.configuration.EELFManager; - import java.io.File; import java.nio.charset.Charset; import java.util.*; diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties index d3baa15a..22c2ebef 100644 --- a/aai-traversal/src/main/resources/application.properties +++ b/aai-traversal/src/main/resources/application.properties @@ -148,3 +148,4 @@ aai.actuator.echo.enabled=false BOOTSTRAP_SERVERS=localhost:9092 JAAS_CONFIG="" aai.notifications.enabled=false +aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties diff --git a/aai-traversal/src/main/resources/logback.xml b/aai-traversal/src/main/resources/logback.xml index fee8005c..f881b669 100644 --- a/aai-traversal/src/main/resources/logback.xml +++ b/aai-traversal/src/main/resources/logback.xml @@ -33,13 +33,6 @@ - diff --git a/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java b/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java index 4e6ce813..8526ace8 100644 --- a/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java @@ -23,8 +23,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import com.att.eelf.configuration.EELFManager; - import java.util.*; import javax.ws.rs.core.Response; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/RecentApiTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/RecentApiTest.java index d9d18095..3c7c06f5 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/RecentApiTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/RecentApiTest.java @@ -21,8 +21,6 @@ package org.onap.aai.rest; import static org.junit.Assert.*; -import com.att.eelf.configuration.EELFManager; - import java.util.Collections; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java index c36ef6be..b9dc073e 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java @@ -24,8 +24,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.att.eelf.configuration.EELFManager; - import java.util.Collections; import org.junit.Test; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/retired/RetiredConsumerSpringTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/retired/RetiredConsumerSpringTest.java index bd62e719..51ff9364 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/retired/RetiredConsumerSpringTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/retired/RetiredConsumerSpringTest.java @@ -21,8 +21,6 @@ package org.onap.aai.rest.retired; import static org.junit.Assert.assertEquals; -import com.att.eelf.configuration.EELFManager; - import java.util.HashMap; import java.util.Map; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/TopologyFromSubscriberNameAndServiceTypeTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/TopologyFromSubscriberNameAndServiceTypeTest.java index 46f47dee..1b515b6b 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/TopologyFromSubscriberNameAndServiceTypeTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/TopologyFromSubscriberNameAndServiceTypeTest.java @@ -19,7 +19,6 @@ */ package org.onap.aai.rest.search; -import com.att.eelf.configuration.EELFManager; import com.google.common.base.CaseFormat; import java.util.Map; diff --git a/aai-traversal/src/test/resources/logback.xml b/aai-traversal/src/test/resources/logback.xml index ac8d4be4..d8b83dd1 100644 --- a/aai-traversal/src/test/resources/logback.xml +++ b/aai-traversal/src/test/resources/logback.xml @@ -31,13 +31,6 @@ - @@ -341,15 +334,6 @@ - - - - - - - - - diff --git a/pom.xml b/pom.xml index 4829b0fc..3c878ae4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,11 @@ org.onap.aai.aai-common aai-parent - 1.15.2 + 1.15.3-SNAPSHOT org.onap.aai.traversal traversal - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT aai-traversal pom @@ -42,7 +42,7 @@ Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> - 1.15.2 + 1.15.3-SNAPSHOT https://nexus.onap.org /content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version} /content/repositories/releases/ @@ -50,7 +50,7 @@ /content/repositories/staging/ ${project.version} - 1.12.5 + 1.12.6 diff --git a/version.properties b/version.properties index df314753..08fc17cd 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=15 -patch_version=2 +patch_version=3 base_version=${major_version}.${minor_version}.${patch_version} -- 2.16.6