Remove DMaaP references from GraphAdmin

- Replace DMaaP related configuration to Kafka
- Upgrade AAI-Common version to 1.13.6

Issue-ID: AAI-3821
Change-Id: Ifed2bbcc8bb052d3b42dc1978be31b372e64582c
Signed-off-by: Dasar <avinash.ganesh.dasar@accenture.com>

4 files changed, 42 insertions, 34 deletions

diff --git a/pom.xml b/pom.xml
index b1ab68a..15ad515 100755
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <docker.push.registry>localhost:5000</docker.push.registry>
         <aai.docker.version>1.0.0</aai.docker.version>
         <aai.schema.service.version>1.12.3</aai.schema.service.version>
-        <aai.common.version>1.13.5</aai.common.version>
+        <aai.common.version>1.13.6</aai.common.version>
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ee7a478..2ca5dd0 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -34,7 +34,15 @@ server.ssl.key-store-type=JKS
 
 # JMS bind address host port
 jms.bind.address=tcp://localhost:61450
-dmaap.ribbon.listOfServers=localhost:3904
+
+# dmaap is deprecated and now replaced with kafka
+spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
+spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
+spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512 
+spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.kafka.producer.properties.sasl.jaas.config = ${JAAS_CONFIG}
+spring.kafka.producer.retries=3
 
 # Schema related attributes for the oxm and edges
 # Any additional schema related attributes should start with prefix schema
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 26077b8..68cb299 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -246,14 +246,14 @@
 		<appender-ref ref="failover" />
 	</appender>
 
-	<appender name="dmaapAAIEventConsumer"
+	<appender name="kafkaAAIEventConsumer"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>WARN</level>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/error.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/error.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>${maxHistory}</maxHistory>
 			<totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -262,16 +262,16 @@
 			<pattern>${errorPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerInfo"
+	<appender name="kafkaAAIEventConsumerInfo"
                      class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
                 <level>INFO</level>
                 <onMatch>ACCEPT</onMatch>
                 <onMismatch>DENY</onMismatch>
         </filter>
-        <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
+        <File>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
+            <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log.%d{yyyy-MM-dd}
             </fileNamePattern>
 			<maxHistory>${maxHistory}</maxHistory>
 			<totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -280,16 +280,16 @@
             <pattern>${debugPattern}</pattern>
         </encoder>
     </appender>
-	<appender name="dmaapAAIEventConsumerDebug"
+	<appender name="kafkaAAIEventConsumerDebug"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>DEBUG</level>
 			<onMatch>ACCEPT</onMatch>
 			<onMismatch>DENY</onMismatch>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/debug.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>${maxHistory}</maxHistory>
 			<totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -298,16 +298,16 @@
 			<pattern>${debugPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerMetric"
+	<appender name="kafkaAAIEventConsumerMetric"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
 			<onMatch>ACCEPT</onMatch>
 			<onMismatch>DENY</onMismatch>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/metrics.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>${maxHistory}</maxHistory>
 			<totalSizeCap>${totalSizeCap}</totalSizeCap>
@@ -1146,10 +1146,10 @@
 		<appender-ref ref="STDOUT"/>
 	</logger>
 
-	<logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
-		<appender-ref ref="dmaapAAIEventConsumer" />
-		<appender-ref ref="dmaapAAIEventConsumerDebug" />
-		<appender-ref ref="dmaapAAIEventConsumerMetric" />
+	<logger name="org.onap.aai.kafka" level="DEBUG" additivity="false">
+		<appender-ref ref="kafkaAAIEventConsumer" />
+		<appender-ref ref="kafkaAAIEventConsumerDebug" />
+		<appender-ref ref="kafkaAAIEventConsumerMetric" />
 		<appender-ref ref="STDOUT"/>
 	</logger>
 
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index f634010..045bddd 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -184,62 +184,62 @@
 		<appender-ref ref="translog" />
 	</appender>
 
-	<appender name="dmaapAAIEventConsumer"
+	<appender name="kafkaAAIEventConsumer"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>WARN</level>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/error.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/error.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${errorPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerInfo"
+	<appender name="kafkaAAIEventConsumerInfo"
                      class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
                 <level>INFO</level>
                 <onMatch>ACCEPT</onMatch>
                 <onMismatch>DENY</onMismatch>
         </filter>
-        <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
+        <File>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
+            <fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/kafka-transaction.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
         <encoder>
             <pattern>${debugPattern}</pattern>
         </encoder>
     </appender>
-	<appender name="dmaapAAIEventConsumerDebug"
+	<appender name="kafkaAAIEventConsumerDebug"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>DEBUG</level>
 			<onMatch>ACCEPT</onMatch>
 			<onMismatch>DENY</onMismatch>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/debug.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${debugPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerMetric"
+	<appender name="kafkaAAIEventConsumerMetric"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
 			<onMatch>ACCEPT</onMatch>
 			<onMismatch>DENY</onMismatch>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/metrics.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder>
@@ -1038,10 +1038,10 @@
 		<appender-ref ref="asynctranslog" />
 	</logger>
 
-	<logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
-		<appender-ref ref="dmaapAAIEventConsumer" />
-		<appender-ref ref="dmaapAAIEventConsumerDebug" />
-		<appender-ref ref="dmaapAAIEventConsumerMetric" />
+	<logger name="org.onap.aai.kafka" level="DEBUG" additivity="false">
+		<appender-ref ref="kafkaAAIEventConsumer" />
+		<appender-ref ref="kafkaAAIEventConsumerDebug" />
+		<appender-ref ref="kafkaAAIEventConsumerMetric" />
 	</logger>
 
 	<logger name="org.onap.aai.datasnapshot" level="DEBUG" additivity="false">