[FIX] heowc#26 SpringBootAop

- fix gradle
- fix package

Author: heowc

SpringBootAOP/build.gradle

@@ -1,30 +1,39 @@
-buildscript {
-	ext {
-		springBootVersion = '2.1.3.RELEASE'
-	}
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-	}
+plugins {
+	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'
 }
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = '1.8'
 
 repositories {
 	mavenCentral()
 }
 
 dependencies {
-	compile('org.springframework.boot:spring-boot-starter-web')
-	compile('org.springframework.boot:spring-boot-starter-aop')
-	testCompile('org.springframework.boot:spring-boot-starter-test')
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-aop'
+	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'
+	}
 }

SpringBootAOP/src/main/java/com/example/SpringBootAopApplication.java renamed to SpringBootAOP/src/main/java/com/example/java/SpringBootAopApplication.java

@@ -1,4 +1,4 @@
-package com.example;
+package com.example.java;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

SpringBootAOP/src/main/java/com/example/component/TestAspect.java renamed to SpringBootAOP/src/main/java/com/example/java/component/TestAspect.java

@@ -1,4 +1,4 @@
-package com.example.component;
+package com.example.java.component;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
@@ -16,23 +16,23 @@ public class TestAspect {
 
 	private static final Logger logger = LoggerFactory.getLogger(TestAspect.class);
 
-	@Before("execution(* com.example.service.*.*Aop(..))")
+	@Before("execution(* com.example.java.service.*.*Aop(..))")
 	public void onBeforeHandler(JoinPoint joinPoint) {
 		logger.info("=============== onBeforeThing");
 	}
 
-	@After("execution(* com.example.service.*.*Aop(..))")
+	@After("execution(* com.example.java.service.*.*Aop(..))")
 	public void onAfterHandler(JoinPoint joinPoint) {
 		logger.info("=============== onAfterHandler");
 	}
 
-	@AfterReturning(pointcut = "execution(* com.example.service.*.*Aop(..))", returning = "str")
+	@AfterReturning(pointcut = "execution(* com.example.java.service.*.*Aop(..))", returning = "str")
 	public void onAfterReturningHandler(JoinPoint joinPoint, Object str) {
 		logger.info("@AfterReturning : " + str);
 		logger.info("=============== onAfterReturningHandler");
 	}
 
-	@Pointcut("execution(* com.example.service.*.*Aop(..))")
+	@Pointcut("execution(* com.example.java.service.*.*Aop(..))")
 	public void onPointcut(JoinPoint joinPoint) {
 		logger.info("=============== onPointcut");
 	}

SpringBootAOP/src/main/java/com/example/config/AspectJConfig.java renamed to SpringBootAOP/src/main/java/com/example/java/config/AspectJConfig.java

@@ -1,4 +1,4 @@
-package com.example.config;
+package com.example.java.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;

SpringBootAOP/src/main/java/com/example/service/TestService.java renamed to SpringBootAOP/src/main/java/com/example/java/service/TestService.java

@@ -1,4 +1,4 @@
-package com.example.service;
+package com.example.java.service;
 
 public interface TestService {
 

SpringBootAOP/src/main/java/com/example/service/TestServiceImpl.java renamed to SpringBootAOP/src/main/java/com/example/java/service/TestServiceImpl.java

@@ -1,4 +1,4 @@
-package com.example.service;
+package com.example.java.service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

SpringBootAOP/src/main/java/com/example/web/TestController.java renamed to SpringBootAOP/src/main/java/com/example/java/web/TestController.java

@@ -1,10 +1,10 @@
-package com.example.web;
+package com.example.java.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.example.service.TestService;
+import com.example.java.service.TestService;
 
 @RestController
 public class TestController {

SpringBootAOP/src/main/kotlin/com/example/kotlin/SpringBootAopApplication.kt

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

SpringBootAOP/src/test/java/com/example/SpringBootAopApplicationTests.java renamed to SpringBootAOP/src/test/java/com/example/java/SpringBootAopApplicationTests.java

@@ -1,6 +1,6 @@
-package com.example;
+package com.example.java;
 
-import com.example.service.TestService;
+import com.example.java.service.TestService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;