Updating aai-common version to 1.17.0-SNAPSHOT

- To update aai-resources with new snapshot version(1.17.0-SNAPSHOT) of aai-common
Issue-ID: AAI-4211
Change-Id: Ia0c4cf60935c7202fcfb7a2f4130796a7c98fd64
Signed-off-by: mithun.menon@t-systems.com <mithun.menon@t-systems.com>

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 2956fb9..d6228af 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>

-        <version>1.16.1-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>

     </parent>
     <properties>
         <java.version>17</java.version>
     </parent>
     <properties>
         <java.version>17</java.version>

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index f6822c1..194ba59 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -110,8 +110,6 @@ scrape.uri.metrics=false
 # Location of the cadi properties file should be specified here
 aaf.cadi.file=${server.local.startpath}/cadi.properties
 
 # Location of the cadi properties file should be specified here
 aaf.cadi.file=${server.local.startpath}/cadi.properties
 

-delta.events.enabled=false
-

 # Specifies what type of request should it be: one-way-ssl, two-way-ssl, no-auth
 validation.service.client=one-way-ssl
 # Base url for the validation service
 # Specifies what type of request should it be: one-way-ssl, two-way-ssl, no-auth
 validation.service.client=one-way-ssl
 # Base url for the validation service


@@ -141,3 +139,19 @@ aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-real
 aai.basic-auth.enabled=true
 aai.basic-auth.users[0].username=AAI
 aai.basic-auth.users[0].password=AAI
 aai.basic-auth.enabled=true
 aai.basic-auth.users[0].username=AAI
 aai.basic-auth.users[0].password=AAI

+
+# Delta Events Filters
+# These are used to make decisions :-
+# - if delta events should be sent 
+# - what delta events should be sent
+
+#delta events enabling flag
+delta.events.enabled=false
+#Node types to be present in the delta events
+delta.events.node-types=
+#Delta event configurable topic name
+delta.events.topic.name=DELTA
+#Relationship delta inclusion flag
+delta.events.relationship-enabled=true
+#Actions for which events should be sent
+delta.events.actions=CREATE,UPDATE,DELETE
\ No newline at end of file

diff --git a/aai-resources/src/test/java/org/onap/aai/AAISetup.java b/aai-resources/src/test/java/org/onap/aai/AAISetup.java
index 2575480..05aee17 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-resources/src/test/java/org/onap/aai/AAISetup.java
@@ -41,12 +41,15 @@ import org.onap.aai.introspection.LoaderFactory;
 import org.onap.aai.introspection.MoxyLoader;
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.rest.db.HttpEntry;
 import org.onap.aai.introspection.MoxyLoader;
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.rest.db.HttpEntry;

+import org.onap.aai.rest.notification.DeltaEventsService;
+import org.onap.aai.util.delta.DeltaEventsConfig;

 import org.onap.aai.rest.notification.NotificationService;
 import org.onap.aai.serialization.db.EdgeSerializer;
 import org.onap.aai.setup.AAIConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.onap.aai.rest.notification.NotificationService;
 import org.onap.aai.serialization.db.EdgeSerializer;
 import org.onap.aai.setup.AAIConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.boot.context.properties.EnableConfigurationProperties;

 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;


@@ -55,10 +58,11 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 @SpringJUnitConfig(
         classes = {ConfigConfiguration.class, AAIConfigTranslator.class, NodeIngestor.class, EdgeIngestor.class,
                 EdgeSerializer.class, SpringContextAware.class, IntrospectionConfig.class,
 @SpringJUnitConfig(
         classes = {ConfigConfiguration.class, AAIConfigTranslator.class, NodeIngestor.class, EdgeIngestor.class,
                 EdgeSerializer.class, SpringContextAware.class, IntrospectionConfig.class,

-                XmlFormatTransformerConfiguration.class, RestBeanConfig.class, LoaderFactory.class, NotificationService.class, KafkaConfig.class})
+                XmlFormatTransformerConfiguration.class, RestBeanConfig.class, LoaderFactory.class, NotificationService.class, KafkaConfig.class, DeltaEventsService.class})

 @TestPropertySource(
         properties = {"schema.uri.base.path = /aai",
                 "schema.ingest.file = src/test/resources/application-test.properties"})
 @TestPropertySource(
         properties = {"schema.uri.base.path = /aai",
                 "schema.ingest.file = src/test/resources/application-test.properties"})

+@EnableConfigurationProperties(DeltaEventsConfig.class)

 public abstract class AAISetup {
 
     @Autowired
 public abstract class AAISetup {
 
     @Autowired

diff --git a/pom.xml b/pom.xml
index 1cd3859..3d0ed5b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.1</version>
+        <version>1.17.0-SNAPSHOT</version>

     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>

-    <version>1.16.1-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>

     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>


@@ -49,8 +49,8 @@
         <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>
         <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.common.version>1.16.1</aai.common.version>
-        <aai.schema.service.version>1.13.1-SNAPSHOT</aai.schema.service.version>
+        <aai.common.version>1.17.0-SNAPSHOT</aai.common.version>
+        <aai.schema.service.version>1.13.1</aai.schema.service.version>

         <sonar.scanner.version>3.11.0.3922</sonar.scanner.version>
     </properties>
     <build>
         <sonar.scanner.version>3.11.0.3922</sonar.scanner.version>
     </properties>
     <build>