Merge pull request #1 from mrFlick72/spring-cloud-netflix

Spring cloud netflix

docker/docker-compose.yml

@@ -0,0 +1,20 @@
+version: "3.0"
+
+services:
+  eureka-server:
+    container_name: eureka
+    image: springcloud/eureka
+    ports:
+      - "8761:8761"
+  redis:
+    container_name: redis
+    image: redis
+    ports:
+      - "6379:6379"
+  mongo:
+    container_name: mongo
+    image: mongo
+    ports:
+      - "27017:27017"
+    volumes:
+      - "${MONGO_VOLUME}:/var/lib/mongodb"

docker/kubernetes/ui-interface.yml

@@ -4,6 +4,13 @@ metadata:
   name: ui-interface
 data:
   application.yaml: |-
+    ribbon:
+      eureka:
+        enabled: false
+      client:
+        enabled: true
+      ServerListRefreshInterval: 50
+
     spring:
       cloud:
         gateway:

docker/starter.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+docker-compose up 2>docker.log &
+
+cd ..
+
+PROJECT_HOME=`pwd`
+
+HELLO_SERVICE_JAR_DIR=$PROJECT_HOME/hello-service/build/libs
+MESSAGE_SERVICE_JAR_DIR=$PROJECT_HOME/message-service/build/libs
+UI_JAR_DIR=$PROJECT_HOME/ui/target
+
+echo "The content of PROJECT_HOME is: $PROJECT_HOME"
+echo "The content of HELLO_SERVICE_JAR_DIR is: $HELLO_SERVICE_JAR_DIR"
+echo "The content of MESSAGE_SERVICE_JAR_DIR is: $MESSAGE_SERVICE_JAR_DIR"
+echo "The content of UI_JAR_DIR is: $UI_JAR_DIR"
+
+
+echo "start of hello-service"
+cd $HELLO_SERVICE_JAR_DIR
+java -jar -Dspring.profiles.active=netflix hello-service.jar >$PROJECT_HOME/hello-service.log &
+
+
+echo "start of message-service"
+cd $MESSAGE_SERVICE_JAR_DIR
+java -jar -Dspring.profiles.active=netflix message-service.jar >$PROJECT_HOME/message-service.log &
+
+
+#echo "start of ui"
+#cd $UI_JAR_DIR
+#java -jar -Dspring.profiles.active=netflix ui-interface.jar >$PROJECT_HOME/ui-interface.log &

hello-service/build.gradle

@@ -27,11 +27,7 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
-
-    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes'
-    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config'
-    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-ribbon'
-
+
     compile 'org.projectlombok:lombok:1.18.6'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
@@ -52,3 +48,5 @@ docker {
     pull true
     noCache true
 }
+
+apply from: rootProject.file('profile.gradle');

hello-service/profile.gradle

@@ -0,0 +1,12 @@
+if (project.hasProperty('kubernetes')) {
+    println("kubernetes")
+    dependencies {
+        implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes'
+        implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config'
+    }
+} else if (project.hasProperty('netflix')) {
+    println("netflix")
+    dependencies {
+        implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+    }
+}

hello-service/profiles/kubernetes_build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes'
+    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config'
+}

hello-service/profiles/netflix_build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+}

hello-service/src/main/resources/application-netflix.yml

@@ -0,0 +1,9 @@
+server:
+  use-forward-headers: true
+  port: 7070
+
+hello-service-uri: http://message-service/message/random
+
+management:
+  server:
+    port: 7071

message-service/build.gradle

@@ -25,9 +25,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
-    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes'
-    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config'
-
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
@@ -36,6 +33,7 @@ dependencies {
     testImplementation 'io.projectreactor:reactor-test'
 }
 
+
 dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
@@ -64,3 +62,5 @@ docker {
     pull true
     noCache true
 }
+
+apply from: rootProject.file('profile.gradle');

message-service/profile.gradle

@@ -0,0 +1,12 @@
+if (project.hasProperty('kubernetes')) {
+    println("kubernetes")
+    dependencies {
+        implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes'
+        implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config'
+    }
+} else if (project.hasProperty('netflix')) {
+    println("netflix")
+    dependencies {
+        implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+    }
+}

message-service/profiles/kubernetes_build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes'
+    implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config'
+}

message-service/profiles/netflix_build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+}

message-service/src/main/kotlin/it/valeriovaudi/messageservice/MessageServiceApplication.kt

@@ -68,5 +68,11 @@ class MessageRoute(private val messageRepository: MessageRepository) {
                     }
                     .flatMap { noContent().build() }
         }
+
+        DELETE("/message/{messageId}") {
+            val messageId = it.pathVariable("messageId")
+            messageRepository.deleteById(messageId)
+                    .flatMap { noContent().build() }
+        }
     }
 }