fishey2 · fishey2 · Apr 15, 2020 · Apr 15, 2020 · Sep 20, 2020 · Sep 20, 2020
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ testIntegration: _setUpGradle _testComposeUp
 testFunctional: _setUpGradle _functionalComposeUp
 	make _waitForLocalService
 	echo "Running Functional tests"
-	./gradlew testFunctional
+	./gradlew testFunctional --stacktrace
 	make _functionalComposeDown
 
 analyseWithJacoco: _setUpGradle
@@ -56,4 +56,4 @@ analyseWithSonar: _gitFetchUnshallow _setUpGradle
 
 package: _setUpGradle
 	echo "Packaging service"
-	./gradlew bootJar
+	./gradlew clean bootJar
diff --git a/build.gradle b/build.gradle
@@ -21,8 +21,8 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-validation')
     implementation('org.projectlombok:lombok:1.18.12')
 
-    // For Message Queue
-    implementation('org.springframework.boot:spring-boot-starter-activemq')
+    // For Kafka
+    implementation('org.springframework.kafka:spring-kafka')
 
     // For Database
     implementation('org.springframework.boot:spring-boot-starter-data-jpa')
@@ -49,6 +49,7 @@ dependencies {
     testImplementation('io.rest-assured:rest-assured:4.2.0')
     testImplementation('io.rest-assured:json-path:4.2.0')
     testImplementation('io.rest-assured:xml-path:4.2.0')
+    testImplementation('org.awaitility:awaitility:3.1.6')
 
     // Annotations
     annotationProcessor('org.springframework.boot:spring-boot-configuration-processor')
@@ -75,7 +76,7 @@ tasks.withType(JavaCompile) {
 
 configurations.all {
     exclude group:'junit', module:'junit'
-    exclude group:'org.junit.vintage', module:'junit-vintage-engine'
+    exclude group: 'org.junit.vintage', module:'junit-vintage-engine'
     exclude group:'org.mockito', module:'mockito-all'
     exclude group:'org.slf4j', module:'slf4j-log4j12'
     exclude group:'org.springframework.boot', module:'spring-boot-starter-logging'

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -12,11 +12,27 @@ services:
       - 8081:8081
     depends_on:
       - database
-  activemq:
-    image: rmohr/activemq:5.15.9-alpine
+      - kafka
+    links:
+      - kafka
+      - database
+
+  kafka:
+    image: obsidiandynamics/kafka
+    restart: "no"
     ports:
-      - 61616:61616
-      - 8161:8161
+      - "2181:2181"
+      - "9092:9092"
+    environment:
+      KAFKA_LISTENERS: "INTERNAL://:29092,EXTERNAL://:9092"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL://kafka:29092,EXTERNAL://kafka:9092"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL"
+      KAFKA_ZOOKEEPER_SESSION_TIMEOUT: "6000"
+      KAFKA_RESTART_ATTEMPTS: "10"
+      KAFKA_RESTART_DELAY: "5"
+      ZOOKEEPER_AUTOPURGE_PURGE_INTERVAL: "0"
+
   database:
     image: postgres:12
     ports:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,10 +1,5 @@
 version: "3.7"
 services:
-  activemq:
-    image: rmohr/activemq:5.15.9-alpine
-    ports:
-      - 61616:61616
-      - 8161:8161
   database:
     image: postgres:12
     ports:
@@ -14,3 +9,29 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: java_component
 
+  kafka:
+    image: obsidiandynamics/kafka
+    restart: "no"
+    ports:
+      - "2181:2181"
+      - "9092:9092"
+    environment:
+      KAFKA_LISTENERS: "INTERNAL://:29092,EXTERNAL://:9092"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL://kafka:29092,EXTERNAL://localhost:9092"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL"
+      KAFKA_ZOOKEEPER_SESSION_TIMEOUT: "6000"
+      KAFKA_RESTART_ATTEMPTS: "10"
+      KAFKA_RESTART_DELAY: "5"
+      ZOOKEEPER_AUTOPURGE_PURGE_INTERVAL: "0"
+
+  kafdrop:
+    image: obsidiandynamics/kafdrop
+    restart: "no"
+    ports:
+      - "9000:9000"
+    environment:
+      KAFKA_BROKERCONNECT: "kafka:29092"
+      JVM_OPTS: "-Xms16M -Xmx48M -Xss180K -XX:-TieredCompilation -XX:+UseStringDeduplication -noverify"
+    depends_on:
+      - "kafka"
diff --git a/gradle/docker-compose.gradle b/gradle/docker-compose.gradle
diff --git a/scripts/wait-for-url.sh b/scripts/wait-for-url.sh
@@ -9,7 +9,7 @@ fi
 
 echo "Waiting for $1"
 
-MAX_ATTEMPTS=5
+MAX_ATTEMPTS=10
 CURRENT_ATTEMPT=0
 
 # Check if the provided URL can be reached

diff --git a/src/functional-test/java/com/roboautomator/component/health/HealthActuatorFuncTest.java b/src/functional-test/java/com/roboautomator/component/health/HealthActuatorFuncTest.java
@@ -53,17 +53,6 @@ void shouldReturnDiskSpaceStatusWhenRunning() {
             .body("components.diskSpace.details.threshold", any(Number.class));
     }
 
-    @Test
-    void shouldReturnJMSStatusWhenRunning() {
-        given()
-            .when()
-            .get(HEALTH_PROBE_ENDPOINT)
-            .then()
-            .statusCode(200)
-            .body("components.jms.status", equalTo("UP"))
-            .body("components.jms.details.provider", equalTo("ActiveMQ"));
-    }
-
     @Test
     void shouldReturnPingStatusWhenRunning() {
         given()

diff --git a/src/main/java/com/roboautomator/component/QueueConsumer.java b/src/main/java/com/roboautomator/component/QueueConsumer.java
diff --git a/src/main/java/com/roboautomator/component/QueueProducer.java b/src/main/java/com/roboautomator/component/QueueProducer.java
diff --git a/src/main/java/com/roboautomator/component/config/queue/ActiveMQConfig.java b/src/main/java/com/roboautomator/component/config/queue/ActiveMQConfig.java
diff --git a/src/main/java/com/roboautomator/component/config/queue/QueueConfig.java b/src/main/java/com/roboautomator/component/config/queue/QueueConfig.java
diff --git a/src/main/java/com/roboautomator/component/message/ActiveMQConsumer.java b/src/main/java/com/roboautomator/component/message/ActiveMQConsumer.java