Fix spring project

viartemev · Mar 5, 2019 · d3cf7d4 · d3cf7d4
1 parent 08e8cfe
commit d3cf7d4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,6 +24,7 @@ buildscript {
         classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.7"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:2.2.0.BUILD-SNAPSHOT"
         classpath "org.jetbrains.kotlin:kotlin-allopen:1.3.21"
+        classpath "com.github.jengelman.gradle.plugins:shadow:4.0.2"
     }
 }
 
@@ -109,6 +110,7 @@ configure(rootProject) {
 
 project('the-white-rabbit-ktor-example') {
     apply plugin: 'application'
+    mainClassName = "io.ktor.server.netty.EngineMain"
 
     repositories {
         mavenLocal()
@@ -167,6 +169,19 @@ project('the-white-rabbit-spring-boot-example') {
 }
 
 project('the-white-rabbit-vertx-example') {
+    apply plugin: "com.github.johnrengelman.shadow"
+    apply plugin: "application"
+
+    mainClassName = 'io.vertx.core.Launcher'
+    def mainVerticleName = 'com.viartemev.the_white_rabbit_vertx_example.App'
+
+    shadowJar {
+        classifier = 'fat'
+        mergeServiceFiles {
+            include 'META-INF/services/io.vertx.core.spi.VerticleFactory'
+        }
+    }
+
     dependencies {
         compile rootProject
         compile "io.vertx:vertx-lang-kotlin:$vertx_version"

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
-kotlin.code.style=official
+kotlin.code.style=official
+spring-framework.version = 5.2.0.BUILD-SNAPSHOT
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,18 @@
+pluginManagement {
+    repositories {
+        maven { url 'https://repo.spring.io/snapshot' }
+        maven { url 'https://repo.spring.io/milestone' }
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if(requested.id.id == 'org.springframework.boot') {
+                useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
+
 rootProject.name = 'the-white-rabbit'
 
 include('benchmarks')

diff --git a/the-white-rabbit-ktor-example/src/Application.kt b/the-white-rabbit-ktor-example/src/Application.kt
@@ -37,7 +37,7 @@ fun Application.module(testing: Boolean = false) {
         get("/pull") {
             connection.channel {
                 consume("test_queue") {
-                    consumeWithConfirm({ call.respond(String(it.body)) })
+                    consumeMessageWithConfirm({ call.respond(String(it.body)) })
                 }
             }
         }

diff --git a/the-white-rabbit-spring-boot-example/src/main/kotlin/com/example/CoroutinesApplication.kt b/the-white-rabbit-spring-boot-example/src/main/kotlin/com/example/CoroutinesApplication.kt
@@ -44,7 +44,7 @@ class Handlers(private val connection: Connection) {
         var message = "default_value"
         connection.channel {
             consume("test_queue", 1) {
-                consumeWithConfirm({
+                consumeMessageWithConfirm({
                     println("Got a message!")
                     message = String(it.body)
                 })

diff --git a/...-rabbit-vertx-example/src/main/kotlin/com/viartemev/the_white_rabbit_vertx_example/App.kt b/...-rabbit-vertx-example/src/main/kotlin/com/viartemev/the_white_rabbit_vertx_example/App.kt
@@ -41,7 +41,7 @@ class App : CoroutineVerticle() {
     suspend fun pull(ctx: RoutingContext) {
         connection.channel {
             consume("test_queue", 1) {
-                consumeWithConfirm({ ctx.response().setStatusCode(200).end(json { obj("message" to String(it.body)).encode() }) })
+                consumeMessageWithConfirm({ ctx.response().setStatusCode(200).end(json { obj("message" to String(it.body)).encode() }) })
             }
         }
     }