update activemq-spring-stomp

Author: Maksim Kostromin

.travis.yml

@@ -44,12 +44,14 @@ script:
 
   # spring-jms-docker-activemq
   - cd $root/spring-jms-docker-activemq
-  - bash gradlew clean integrationTests
   - bash gradlew clean build
 
   # activemq-spring-stomp
   - cd $root/activemq-spring-stomp
-  - bash gradlew clean integrationTests build
+  - bash gradlew clean build
+  - bash gradlew dockerUp
+  - http :8080/api/messages
+  - bash gradlew dockerDown
 
 before_cache:
   - rm -rf $HOME/.gradle/caches/modules-2/modules-2.lock

activemq-spring-stomp/build.gradle

@@ -1,47 +1,24 @@
-plugins {
-  id "com.avast.gradle.docker-compose" version "0.3.21"
-}
-
-dockerCompose {
-  useComposeFiles = ["$projectDir/docker-compose.yml"]
-  captureContainersOutput = true
-  stopContainers = true
-  removeContainers = true
-  removeImages = "Local"
-  removeVolumes = true
-  projectName = "$rootProject.name"
-}
-
 ["clean", "assemble", "test", "build"].each { taskName ->
   tasks.create(taskName) { task ->
     gradle.includedBuilds.each { build ->
+      if (build.name == "docker") return
       dependsOn gradle.includedBuild(build.name).task(":$taskName")
     }
   }
 }
 
-["test", "build"].each {
-  def task = tasks.findByName it
-  task.shouldRunAfter clean, assemble, composeUp
-  task.dependsOn assemble, composeUp
-  task.finalizedBy composeDown
-}
-
-task integrationTests(dependsOn: "test")
-
-// bootRun -> run-$projectName
-gradle.includedBuilds.each { build ->
-  tasks.create("run-$build.name") { task ->
-    dependsOn assemble, composeUp, gradle.includedBuild(build.name).task(":bootRun")
-    shouldRunAfter clean, assemble, composeUp
-    finalizedBy composeDown
-  }
-}
-
 ["dockerUp", "dockerDown"].each { taskName ->
   gradle.includedBuilds.findAll({ it.name == "docker" }).each { build ->
     tasks.create(taskName) { task ->
       dependsOn gradle.includedBuild(build.name).task(":$taskName")
     }
   }
 }
+
+// bootRun -> run-$projectName
+gradle.includedBuilds.each { build ->
+  tasks.create("run-$build.name") { task ->
+    dependsOn assemble, gradle.includedBuild(build.name).task(":bootRun")
+    shouldRunAfter clean, assemble
+  }
+}

activemq-spring-stomp/docker/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 dockerCompose {
-  useComposeFiles = ["$projectDir/docker-compose.yml"]
+  useComposeFiles = ["$projectDir/src/docker-compose.yml"]
   captureContainersOutput = true
   stopContainers = true
   removeContainers = true

activemq-spring-stomp/docker/docker-compose.yml

@@ -0,0 +1,91 @@
+version: "2.1"
+
+services:
+
+  activemq:
+    image: webcenter/activemq:5.14.3
+    ports:
+      - "1883:1883"   # mqtt
+      - "5672:5672"   # amqp
+      - "8161:8161"   # ui
+      - "61613:61613" # stomp
+      - "61614:61614" # ws
+      - "61616:61616" # jms
+    networks: [backing-services]
+    volumes:
+      - "activemq-data:/opt/activemq/conf"
+      - "activemq-data:/data/activemq"
+      - "activemq-data:/var/log/activemq"
+    environment:
+      ACTIVEMQ_MIN_MEMORY: 512
+      ACTIVEMQ_MAX_MEMORY: 2048
+      ACTIVEMQ_ENABLED_SCHEDULER: "true"
+      ACTIVEMQ_REMOVE_DEFAULT_ACCOUNT: "true"
+      ACTIVEMQ_ADMIN_LOGIN: admin
+      ACTIVEMQ_ADMIN_PASSWORD: password
+
+  postgres:
+    depends_on: [activemq]
+    image: healthcheck/postgres:alpine
+    ports: ["5432:5432"]
+    networks: [backing-services]
+    volumes: ["postgres-data:/var/lib/postgresql/data"]
+    environment:
+      POSTGRES_DB: db
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+
+  messaging-backend:
+    build:
+      context: ../..
+      dockerfile: ./docker/src/messaging-backend/Dockerfile
+    depends_on:
+      postgres:
+        condition: service_healthy
+    environment:
+      MQ_HOST: activemq
+      DB_HOST: postgres
+    image: 127.0.0.1:5000/messaging-backend
+    ports: ["8080:8080"]
+    volumes: ["messaging-backend-data:/home/app"]
+    networks: [backing-services]
+
+  messaging-frontend-admin:
+    build:
+      context: ../..
+      dockerfile: ./docker/src/messaging-frontend-admin/Dockerfile
+    depends_on:
+      messaging-backend:
+        condition: service_healthy
+    environment:
+      MESSAGING_SERVICE_HOST: 127.0.0.1
+#      MESSAGING_SERVICE_HOST: messaging-backend
+    image: 127.0.0.1:5000/messaging-frontend-admin
+    ports: ["8002:8002"]
+    volumes: ["messaging-frontend-admin-data:/home/app"]
+    networks: [backing-services]
+
+#  messaging-frontend-client:
+#    build:
+#      context: ../..
+#      dockerfile: ./docker/src/messaging-frontend-client/Dockerfile
+#    depends_on:
+#      messaging-backend:
+#        condition: service_healthy
+#    environment:
+#      MESSAGING_SERVICE_HOST: 127.0.0.1
+#    image: 127.0.0.1:5000/messaging-frontend-client
+#    ports: ["8001:8001"]
+#    volumes: ["messaging-frontend-client-data:/home/app"]
+#    networks: [backing-services]
+
+volumes:
+  activemq-data: {}
+  postgres-data: {}
+  messaging-backend-data: {}
+  messaging-frontend-admin-data: {}
+  messaging-frontend-client-data: {}
+
+networks:
+  backing-services:
+    driver: bridge

activemq-spring-stomp/docker/src/docker-compose.yml

@@ -0,0 +1,11 @@
+FROM openjdk:8u131-jre-alpine
+MAINTAINER Maksim Kostromin <[email protected]>
+RUN apk --no-cache add busybox-suid bash curl \
+  && addgroup app-group \
+  && adduser -h /home/app -s /bin/bash -D -u 1025 app app-group
+USER app
+WORKDIR /home/app
+ENTRYPOINT ["java", "-jar", "./app.jar"]
+EXPOSE 8080
+HEALTHCHECK --interval=30s --timeout=30s --retries=10 CMD curl -f http://127.0.0.1:8080/health || exit 1
+COPY ./messaging-backend/build/libs/*.jar ./app.jar

activemq-spring-stomp/docker/src/messaging-backend/Dockerfile

@@ -0,0 +1,11 @@
+FROM openjdk:8u131-jre-alpine
+MAINTAINER Maksim Kostromin <[email protected]>
+RUN apk --no-cache add busybox-suid bash curl \
+  && addgroup app-group \
+  && adduser -h /home/app -s /bin/bash -D -u 1025 app app-group
+USER app
+WORKDIR /home/app
+ENTRYPOINT ["java", "-jar", "./app.jar"]
+EXPOSE 8002
+HEALTHCHECK --interval=30s --timeout=30s --retries=10 CMD curl -f http://127.0.0.1:8002/health || exit 1
+COPY ./messaging-frontend-admin/build/libs/*.jar ./app.jar

activemq-spring-stomp/docker/src/messaging-frontend-admin/Dockerfile

@@ -0,0 +1,11 @@
+FROM openjdk:8u131-jre-alpine
+MAINTAINER Maksim Kostromin <[email protected]>
+RUN apk --no-cache add busybox-suid bash curl \
+  && addgroup app-group \
+  && adduser -h /home/app -s /bin/bash -D -u 1025 app app-group
+USER app
+WORKDIR /home/app
+ENTRYPOINT ["java", "-jar", "./app.jar"]
+EXPOSE 8001
+HEALTHCHECK --interval=30s --timeout=30s --retries=10 CMD curl -f http://127.0.0.1:8001/health || exit 1
+COPY ./messaging-frontend-client/build/libs/*.jar ./app.jar

activemq-spring-stomp/docker/src/messaging-frontend-client/Dockerfile

@@ -14,6 +14,7 @@ plugins {
   id "cn.bestwu.propdeps-eclipse" version "0.0.10"
   id "com.github.ben-manes.versions" version "0.14.0"
   id "org.springframework.boot" version "1.5.7.RELEASE"
+  id "com.avast.gradle.docker-compose" version "0.3.21"
   id "com.ewerk.gradle.plugins.querydsl" version "1.0.8"
   id "io.spring.dependency-management" version "1.0.3.RELEASE"
 }
@@ -33,6 +34,7 @@ dependencies {
       "io.projectreactor:reactor-net"
 
   compile("org.springframework.boot:spring-boot-starter-mustache")
+  compile("org.springframework.boot:spring-boot-starter-actuator")
 
   compile("org.springframework.boot:spring-boot-starter-activemq")
 
@@ -79,3 +81,19 @@ sourceSets {
 clean {
   delete "$projectDir/out"
 }
+
+dockerCompose {
+  useComposeFiles = ["$projectDir/docker-compose.yml"]
+  captureContainersOutput = true
+  stopContainers = true
+  removeContainers = true
+  removeImages = "Local"
+  removeVolumes = true
+  projectName = "$rootProject.name"
+}
+
+[test, build, bootRun].each {
+  it.shouldRunAfter clean, assemble, composeUp
+  it.dependsOn assemble, composeUp
+  it.finalizedBy composeDown
+}

activemq-spring-stomp/messaging-backend/build.gradle

@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -37,11 +39,10 @@ public abstract class AbstractAuditEntity implements Serializable {
   @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS")
   @DateTimeFormat(iso = DATE_TIME)
   LocalDateTime modifiedDate;
-/*
+
   @CreatedBy
   String createdBy;
 
   @LastModifiedBy
   String lastModifiedBy;
-*/
 }

activemq-spring-stomp/docker-compose.yml renamed to activemq-spring-stomp/messaging-backend/docker-compose.yml

@@ -1,18 +1,22 @@
 package daggerok.web;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
+
+@RestController
 public class IndexPage {
 
   @GetMapping("/")
-  public String index() {
-    return "/index.html";
-  }
-
-  @GetMapping({ "", "/404" })
-  public String redirect() {
-    return "redirect:/";
+  public List<Map<String, String>> index() {
+    return asList(
+        Collections.singletonMap("GET", "/api/messages"),
+        Collections.singletonMap("POST", "/api/v1/messages")
+    );
   }
 }