[FIX] #26 SpringBootDocker

Author: heowc

SpringBootDocker/build.gradle

@@ -1,34 +1,41 @@
-buildscript {
-	ext {
-		springBootVersion = '2.1.3.RELEASE'
-	}
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-	}
-}
-
 plugins {
-	id 'com.google.cloud.tools.jib' version '0.9.11'
+	id 'org.springframework.boot' version '2.1.3.RELEASE'
+	id 'org.jetbrains.kotlin.jvm' version '1.2.71'
+	id 'org.jetbrains.kotlin.plugin.spring' version '1.2.71'
+	id 'com.google.cloud.tools.jib' version '1.0.2'
 }
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+group = 'com.example'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '1.8'
 
 repositories {
 	mavenCentral()
 }
 
 dependencies {
-	compile('org.springframework.boot:spring-boot-starter-web')
-	testCompile('org.springframework.boot:spring-boot-starter-test')
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
+	implementation 'org.jetbrains.kotlin:kotlin-reflect'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+compileKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}
+
+compileTestKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
 }
 
 jib {
@@ -38,14 +45,14 @@ jib {
 	to {
 		image = 'registry.hub.docker.com/heowc1992/my-app'
 		auth {
-		    username = dockerUsername
-		    password = dockerPassword
+			username = dockerUsername
+			password = dockerPassword
 		}
 	}
 	container {
 		jvmFlags = ['-Djava.security.egd=file:/dev/./urandom', '-Duser.timezone=GMT+09']
-		mainClass = 'com.heowc.Application'
-//		args = ['some args']
+		mainClass = 'com.example.java.SpringBootDockerApplication'
+//		mainClass = 'com.example.kotlin.SpringBootDockerApplicationKt'
 		ports = ['8080']
 	}
-}
+}

SpringBootDocker/src/main/java/com/heowc/SimpleController.java renamed to SpringBootDocker/src/main/java/com/example/java/SimpleController.java

@@ -1,4 +1,4 @@
-package com.heowc;
+package com.example.java;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,6 +10,6 @@ public class SimpleController {
 
     @GetMapping
     public String message() {
-        return "Hello Jib!!";
+        return "Hello Jib With Java!!";
     }
 }

SpringBootDocker/src/main/java/com/heowc/Application.java renamed to SpringBootDocker/src/main/java/com/example/java/SpringBootDockerApplication.java

@@ -1,12 +1,12 @@
-package com.heowc;
+package com.example.java;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class Application {
+public class SpringBootDockerApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
+		SpringApplication.run(SpringBootDockerApplication.class, args);
 	}
 }

SpringBootDocker/src/main/kotlin/com/example/kotlin/SimpleController.kt

@@ -0,0 +1,15 @@
+package com.example.kotlin
+
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/")
+class SimpleController {
+
+    @GetMapping
+    fun message(): String {
+        return "Hello Jib With Kotlin!!"
+    }
+}

SpringBootDocker/src/main/kotlin/com/example/kotlin/SpringBootDockerApplication.kt

@@ -0,0 +1,11 @@
+package com.example.kotlin
+
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.runApplication
+
+@SpringBootApplication
+class SpringBootDockerApplication
+
+fun main(args: Array<String>) {
+    runApplication<SpringBootDockerApplication>(*args)
+}

SpringBootDocker/src/test/java/com/heowc/ApplicationTests.java renamed to SpringBootDocker/src/test/java/com/heowc/SpringBootDockerApplicationTests.java

@@ -7,7 +7,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class ApplicationTests {
+public class SpringBootDockerApplicationTests {
 
 	@Test
 	public void contextLoad() {