diff --git a/build.gradle b/build.gradle index b5d5d2b..da180dd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.6.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' +// id 'org.springframework.boot' version '2.6.6' +// id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } @@ -8,11 +8,11 @@ group = 'com.github.deogicorgi' version = '0.0.1-SNAPSHOT' sourceCompatibility = '11' -configurations { - compileOnly { - extendsFrom annotationProcessor - } -} +//configurations { +// compileOnly { +// extendsFrom annotationProcessor +// } +//} repositories { mavenCentral() @@ -23,8 +23,14 @@ subprojects { apply plugin: 'idea' dependencies { - implementation('org.slf4j:jcl-over-slf4j') - implementation('ch.qos.logback:logback-classic') + implementation 'org.springframework.boot:spring-boot-starter' + + implementation 'org.slf4j:jcl-over-slf4j' + implementation 'ch.qos.logback:logback-classic' + + // lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' } } diff --git a/common/build.gradle b/common/build.gradle index 80511c2..2a9339c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,17 +1,27 @@ plugins { id 'java' + id 'java-library' + id 'org.springframework.boot' version '2.6.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' } group 'com.github.deogicorgi.reactive' version '0.0.1-SNAPSHOT' +bootJar { + enabled = false +} + +jar { + enabled = true +} + repositories { mavenCentral() } dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' + implementation 'com.fasterxml.jackson.core:jackson-annotations' } test { diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/message/AbstractKafkaProduceMessage.java b/common/src/main/java/com/github/deogicorgi/reactive/common/message/AbstractKafkaProduceMessage.java similarity index 88% rename from producer/src/main/java/com/github/deogicorgi/reactive/producer/message/AbstractKafkaProduceMessage.java rename to common/src/main/java/com/github/deogicorgi/reactive/common/message/AbstractKafkaProduceMessage.java index 1e5e46d..0b44107 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/message/AbstractKafkaProduceMessage.java +++ b/common/src/main/java/com/github/deogicorgi/reactive/common/message/AbstractKafkaProduceMessage.java @@ -1,8 +1,8 @@ -package com.github.deogicorgi.reactive.producer.message; +package com.github.deogicorgi.reactive.common.message; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.github.deogicorgi.reactive.producer.value.ProduceMessageType; +import com.github.deogicorgi.reactive.common.value.ProduceMessageType; import lombok.Getter; import lombok.Setter; diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/message/KafkaBodyProduceMessage.java b/common/src/main/java/com/github/deogicorgi/reactive/common/message/KafkaBodyProduceMessage.java similarity index 76% rename from producer/src/main/java/com/github/deogicorgi/reactive/producer/message/KafkaBodyProduceMessage.java rename to common/src/main/java/com/github/deogicorgi/reactive/common/message/KafkaBodyProduceMessage.java index c4eff97..a91599c 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/message/KafkaBodyProduceMessage.java +++ b/common/src/main/java/com/github/deogicorgi/reactive/common/message/KafkaBodyProduceMessage.java @@ -1,6 +1,6 @@ -package com.github.deogicorgi.reactive.producer.message; +package com.github.deogicorgi.reactive.common.message; -import com.github.deogicorgi.reactive.producer.value.ProduceMessageType; +import com.github.deogicorgi.reactive.common.value.ProduceMessageType; import lombok.Getter; import lombok.Setter; diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/message/KafkaUriProduceMessage.java b/common/src/main/java/com/github/deogicorgi/reactive/common/message/KafkaUriProduceMessage.java similarity index 75% rename from producer/src/main/java/com/github/deogicorgi/reactive/producer/message/KafkaUriProduceMessage.java rename to common/src/main/java/com/github/deogicorgi/reactive/common/message/KafkaUriProduceMessage.java index db748a8..20040ae 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/message/KafkaUriProduceMessage.java +++ b/common/src/main/java/com/github/deogicorgi/reactive/common/message/KafkaUriProduceMessage.java @@ -1,6 +1,6 @@ -package com.github.deogicorgi.reactive.producer.message; +package com.github.deogicorgi.reactive.common.message; -import com.github.deogicorgi.reactive.producer.value.ProduceMessageType; +import com.github.deogicorgi.reactive.common.value.ProduceMessageType; import lombok.Getter; import lombok.Setter; diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/model/KafkaProduceResult.java b/common/src/main/java/com/github/deogicorgi/reactive/common/model/KafkaProduceResult.java similarity index 89% rename from producer/src/main/java/com/github/deogicorgi/reactive/producer/model/KafkaProduceResult.java rename to common/src/main/java/com/github/deogicorgi/reactive/common/model/KafkaProduceResult.java index 3cb9e3e..cbff84a 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/model/KafkaProduceResult.java +++ b/common/src/main/java/com/github/deogicorgi/reactive/common/model/KafkaProduceResult.java @@ -1,8 +1,8 @@ -package com.github.deogicorgi.reactive.producer.model; +package com.github.deogicorgi.reactive.common.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.github.deogicorgi.reactive.producer.message.AbstractKafkaProduceMessage; -import com.github.deogicorgi.reactive.producer.value.ProduceMessageType; +import com.github.deogicorgi.reactive.common.message.AbstractKafkaProduceMessage; +import com.github.deogicorgi.reactive.common.value.ProduceMessageType; import lombok.Getter; import java.time.LocalDateTime; diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/value/ProduceMessageType.java b/common/src/main/java/com/github/deogicorgi/reactive/common/value/ProduceMessageType.java similarity index 51% rename from producer/src/main/java/com/github/deogicorgi/reactive/producer/value/ProduceMessageType.java rename to common/src/main/java/com/github/deogicorgi/reactive/common/value/ProduceMessageType.java index 6fc69d5..37f3550 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/value/ProduceMessageType.java +++ b/common/src/main/java/com/github/deogicorgi/reactive/common/value/ProduceMessageType.java @@ -1,4 +1,4 @@ -package com.github.deogicorgi.reactive.producer.value; +package com.github.deogicorgi.reactive.common.value; public enum ProduceMessageType { URI, diff --git a/producer/build.gradle b/producer/build.gradle index 08d2ae0..bd2c049 100644 --- a/producer/build.gradle +++ b/producer/build.gradle @@ -28,13 +28,9 @@ dependencies { implementation 'io.springfox:springfox-boot-starter:3.0.0' implementation 'io.springfox:springfox-swagger-ui:3.0.0' - // logging - implementation('org.slf4j:jcl-over-slf4j') - implementation('ch.qos.logback:logback-classic') - - // lombok - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' +// // logging +// implementation('org.slf4j:jcl-over-slf4j') +// implementation('ch.qos.logback:logback-classic') // test testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/exception/ProducerServiceException.java b/producer/src/main/java/com/github/deogicorgi/reactive/producer/exception/ProducerServiceException.java deleted file mode 100644 index bae59a6..0000000 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/exception/ProducerServiceException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.deogicorgi.reactive.producer.exception; - -public class ProducerServiceException extends Exception { - public ProducerServiceException(Exception e) { - super(e); - } -} diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/KafkaService.java b/producer/src/main/java/com/github/deogicorgi/reactive/producer/service/KafkaService.java similarity index 83% rename from producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/KafkaService.java rename to producer/src/main/java/com/github/deogicorgi/reactive/producer/service/KafkaService.java index 2f6596f..0b509f9 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/KafkaService.java +++ b/producer/src/main/java/com/github/deogicorgi/reactive/producer/service/KafkaService.java @@ -1,7 +1,7 @@ -package com.github.deogicorgi.reactive.producer.web.service; +package com.github.deogicorgi.reactive.producer.service; -import com.github.deogicorgi.reactive.producer.message.AbstractKafkaProduceMessage; -import com.github.deogicorgi.reactive.producer.model.KafkaProduceResult; +import com.github.deogicorgi.reactive.common.message.AbstractKafkaProduceMessage; +import com.github.deogicorgi.reactive.common.model.KafkaProduceResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.ProducerRecord; diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/controller/ProducerController.java b/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/controller/ProducerController.java index e978d33..f2eae68 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/controller/ProducerController.java +++ b/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/controller/ProducerController.java @@ -1,7 +1,7 @@ package com.github.deogicorgi.reactive.producer.web.controller; -import com.github.deogicorgi.reactive.producer.message.AbstractKafkaProduceMessage; -import com.github.deogicorgi.reactive.producer.model.KafkaProduceResult; +import com.github.deogicorgi.reactive.common.message.AbstractKafkaProduceMessage; +import com.github.deogicorgi.reactive.common.model.KafkaProduceResult; import com.github.deogicorgi.reactive.producer.web.service.ProduceService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; diff --git a/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/ProduceService.java b/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/ProduceService.java index e3e8019..b67772a 100644 --- a/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/ProduceService.java +++ b/producer/src/main/java/com/github/deogicorgi/reactive/producer/web/service/ProduceService.java @@ -1,7 +1,8 @@ package com.github.deogicorgi.reactive.producer.web.service; -import com.github.deogicorgi.reactive.producer.message.AbstractKafkaProduceMessage; -import com.github.deogicorgi.reactive.producer.model.KafkaProduceResult; +import com.github.deogicorgi.reactive.common.message.AbstractKafkaProduceMessage; +import com.github.deogicorgi.reactive.common.model.KafkaProduceResult; +import com.github.deogicorgi.reactive.producer.service.KafkaService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;