Use 1.15.3-SNAPSHOT of aai-common 29/139529/1
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Fri, 22 Nov 2024 08:55:53 +0000 (09:55 +0100)
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Fri, 22 Nov 2024 08:55:53 +0000 (09:55 +0100)
- 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 <Fiete.Ostkamp@telekom.de>
17 files changed:
README.md
aai-traversal/pom.xml
aai-traversal/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java
aai-traversal/src/main/java/org/onap/aai/rest/search/GremlinServerSingleton.java
aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java
aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java
aai-traversal/src/main/java/org/onap/aai/util/MakeNamedQuery.java
aai-traversal/src/main/resources/application.properties
aai-traversal/src/main/resources/logback.xml
aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java
aai-traversal/src/test/java/org/onap/aai/rest/RecentApiTest.java
aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java
aai-traversal/src/test/java/org/onap/aai/rest/retired/RetiredConsumerSpringTest.java
aai-traversal/src/test/java/org/onap/aai/rest/search/TopologyFromSubscriberNameAndServiceTypeTest.java
aai-traversal/src/test/resources/logback.xml
pom.xml
version.properties

index ea453eb..e0f2f9a 100644 (file)
--- 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
 `<skipITs>true</skipITs>`
 
 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`
-
index 11d271d..4c644e0 100644 (file)
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.aai.traversal</groupId>
                <artifactId>traversal</artifactId>
-               <version>1.15.2-SNAPSHOT</version>
+               <version>1.15.3-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.aai.traversal</groupId>
        <artifactId>aai-traversal</artifactId>
                <dependency>
                        <groupId>io.micrometer</groupId>
                        <artifactId>micrometer-jersey2</artifactId>
+                       <version>1.8.13</version>
                </dependency>
                <dependency>
                        <groupId>javax.ws.rs</groupId>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>com.att.eelf</groupId>
-                       <artifactId>eelf-core</artifactId>
-                       <version>2.0.0-oss</version>
-               </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
index 5d5a075..34023e8 100644 (file)
@@ -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;
index 8ddf815..172b2e6 100644 (file)
@@ -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
      */
index ad5eb4e..a34506e 100644 (file)
@@ -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;
index 7bda3bb..5a32003 100644 (file)
@@ -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.*;
index d3baa15..22c2ebe 100644 (file)
@@ -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
index fee8005..f881b66 100644 (file)
        <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
        <jmxConfigurator />
        <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       <!-- Old patterns
-       <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-       <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-       <property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-       <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-    <property name="eelfTransLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{partnerName}:%m%n"/>
-    -->
        <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
        <property name="p_lvl" value="%level"/>
        <property name="p_log" value="%logger"/>
index 4e6ce81..8526ace 100644 (file)
@@ -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;
index d9d1809..3c7c06f 100644 (file)
@@ -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;
index c36ef6b..b9dc073 100644 (file)
@@ -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;
index bd62e71..51ff936 100644 (file)
@@ -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;
 
index ac8d4be..d8b83dd 100644 (file)
        <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
        <jmxConfigurator />
        <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       <!-- Old patterns
-       <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-       <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-       <property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-       <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-    <property name="eelfTransLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{partnerName}:%m%n"/>
-    -->
        <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
        <property name="p_lvl" value="%level"/>
        <property name="p_log" value="%logger"/>
        <logger name="org.onap.aai.dbgen" level="WARN"/>
        <logger name="org.onap.aai.aailog" level="WARN"/>
 
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-
        <root level="INFO">
                <appender-ref ref="external" />
                <appender-ref ref="STDOUT" />
diff --git a/pom.xml b/pom.xml
index 4829b0f..3c878ae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
-    <version>1.15.2-SNAPSHOT</version>
+    <version>1.15.3-SNAPSHOT</version>
     <name>aai-traversal</name>
     <packaging>pom</packaging>
     <modules>
@@ -42,7 +42,7 @@
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
         -->
-        <aai.common.version>1.15.2</aai.common.version>
+        <aai.common.version>1.15.3-SNAPSHOT</aai.common.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path>
         <release.path>/content/repositories/releases/</release.path>
@@ -50,7 +50,7 @@
         <staging.path>/content/repositories/staging/</staging.path>
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
-        <aai.schema.service.version>1.12.5</aai.schema.service.version>
+        <aai.schema.service.version>1.12.6</aai.schema.service.version>
     </properties>
     <build>
         <pluginManagement>
index df31475..08fc17c 100644 (file)
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=15
-patch_version=2
+patch_version=3
 
 base_version=${major_version}.${minor_version}.${patch_version}