diff --git a/build.gradle b/build.gradle index c2d0e863d..a7904a1d4 100644 --- a/build.gradle +++ b/build.gradle @@ -11,43 +11,26 @@ dependencyManagement { } } -allprojects { - group = "${projectGroup}" - version = "${applicationVersion}" - sourceCompatibility = project.javaVersion +group = "${projectGroup}" +version = "${applicationVersion}" - repositories { - mavenCentral() - maven { url 'https://jitpack.io' } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(project.javaVersion) } } +repositories { + mavenCentral() + maven { url 'https://jitpack.io' } +} + configurations { compileOnly { extendsFrom annotationProcessor } } -subprojects { - apply plugin: 'java-library' - apply plugin: 'org.springframework.boot' - apply plugin: 'io.spring.dependency-management' - - bootJar.enabled = false - jar.enabled = true - - dependencies { - // ============== Utils & Libraries ============== - // Lombok - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - } - - tasks.named('test') { - useJUnitPlatform() - } -} - dependencies { // ============== Spring Boot Starters ============== implementation 'org.springframework.boot:spring-boot-starter-web' @@ -55,6 +38,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-data-redis' + implementation 'org.springframework.boot:spring-boot-starter-actuator' // ============== Database & Persistence ============== // MySQL @@ -66,8 +50,9 @@ dependencies { annotationProcessor 'jakarta.annotation:jakarta.annotation-api' annotationProcessor 'jakarta.persistence:jakarta.persistence-api' - // QueryDSL BaseEntity - annotationProcessor project(':wss-common') + // SQL Logging (P6Spy) + implementation "p6spy:p6spy:${p6spyVersion}" + implementation "com.github.gavlyukovskiy:datasource-decorator-spring-boot-autoconfigure:${datasourceDecoratorVersion}" // ============== Security & JWT ============== // JWT @@ -86,6 +71,9 @@ dependencies { // JSON implementation "com.googlecode.json-simple:json-simple:${jsonSimpleVersion}" + // 구조화 로깅 + runtimeOnly "net.logstash.logback:logstash-logback-encoder:${logstashLogbackEncoderVersion}" + // ============== External Services ============== // FCM (Firebase Cloud Messaging) implementation "com.google.firebase:firebase-admin:${firebaseAdminVersion}" @@ -97,10 +85,6 @@ dependencies { implementation "org.webjars:swagger-ui:${swaggerUiVersion}" implementation 'org.webjars:webjars-locator-core' - // ============== Project Modules ============== - implementation project(':wss-service-support') - implementation project(':wss-common') - // ============== Test ============== testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' diff --git a/gradle.properties b/gradle.properties index 1879df57b..92e68aee7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,3 +18,6 @@ jsonSimpleVersion=1.1.1 firebaseAdminVersion=9.4.3 restdocsApiSpecVersion=0.19.4 swaggerUiVersion=5.13.0 +p6spyVersion=3.9.1 +datasourceDecoratorVersion=1.9.2 +logstashLogbackEncoderVersion=7.4 diff --git a/settings.gradle b/settings.gradle index 4a07f6e3e..9c9067517 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,6 +7,3 @@ pluginManagement { } rootProject.name = 'WSS-Server' - -include 'wss-service-support' -include 'wss-common' \ No newline at end of file diff --git a/wss-common/src/main/java/org/websoso/common/entity/BaseEntity.java b/src/main/java/org/websoso/common/entity/BaseEntity.java similarity index 100% rename from wss-common/src/main/java/org/websoso/common/entity/BaseEntity.java rename to src/main/java/org/websoso/common/entity/BaseEntity.java diff --git a/wss-common/src/main/java/org/websoso/common/exception/AbstractCustomException.java b/src/main/java/org/websoso/common/exception/AbstractCustomException.java similarity index 100% rename from wss-common/src/main/java/org/websoso/common/exception/AbstractCustomException.java rename to src/main/java/org/websoso/common/exception/AbstractCustomException.java diff --git a/wss-common/src/main/java/org/websoso/common/exception/ErrorResult.java b/src/main/java/org/websoso/common/exception/ErrorResult.java similarity index 100% rename from wss-common/src/main/java/org/websoso/common/exception/ErrorResult.java rename to src/main/java/org/websoso/common/exception/ErrorResult.java diff --git a/wss-common/src/main/java/org/websoso/common/exception/ICustomError.java b/src/main/java/org/websoso/common/exception/ICustomError.java similarity index 100% rename from wss-common/src/main/java/org/websoso/common/exception/ICustomError.java rename to src/main/java/org/websoso/common/exception/ICustomError.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskedBody.java b/src/main/java/org/websoso/support/logging/masking/MaskedBody.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskedBody.java rename to src/main/java/org/websoso/support/logging/masking/MaskedBody.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskingPolicy.java b/src/main/java/org/websoso/support/logging/masking/MaskingPolicy.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskingPolicy.java rename to src/main/java/org/websoso/support/logging/masking/MaskingPolicy.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskingSerializer.java b/src/main/java/org/websoso/support/logging/masking/MaskingSerializer.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskingSerializer.java rename to src/main/java/org/websoso/support/logging/masking/MaskingSerializer.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskingSerializerModifier.java b/src/main/java/org/websoso/support/logging/masking/MaskingSerializerModifier.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/MaskingSerializerModifier.java rename to src/main/java/org/websoso/support/logging/masking/MaskingSerializerModifier.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/SensitiveData.java b/src/main/java/org/websoso/support/logging/masking/SensitiveData.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/SensitiveData.java rename to src/main/java/org/websoso/support/logging/masking/SensitiveData.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/SensitiveDataMasker.java b/src/main/java/org/websoso/support/logging/masking/SensitiveDataMasker.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/SensitiveDataMasker.java rename to src/main/java/org/websoso/support/logging/masking/SensitiveDataMasker.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/masking/SensitiveFieldNames.java b/src/main/java/org/websoso/support/logging/masking/SensitiveFieldNames.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/masking/SensitiveFieldNames.java rename to src/main/java/org/websoso/support/logging/masking/SensitiveFieldNames.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/request/RequestBodyLoggingAdvice.java b/src/main/java/org/websoso/support/logging/request/RequestBodyLoggingAdvice.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/request/RequestBodyLoggingAdvice.java rename to src/main/java/org/websoso/support/logging/request/RequestBodyLoggingAdvice.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/request/RequestLoggingFilter.java b/src/main/java/org/websoso/support/logging/request/RequestLoggingFilter.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/request/RequestLoggingFilter.java rename to src/main/java/org/websoso/support/logging/request/RequestLoggingFilter.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/response/ResponseBodyLoggingAdvice.java b/src/main/java/org/websoso/support/logging/response/ResponseBodyLoggingAdvice.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/response/ResponseBodyLoggingAdvice.java rename to src/main/java/org/websoso/support/logging/response/ResponseBodyLoggingAdvice.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/response/ResponseBodySummarizer.java b/src/main/java/org/websoso/support/logging/response/ResponseBodySummarizer.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/response/ResponseBodySummarizer.java rename to src/main/java/org/websoso/support/logging/response/ResponseBodySummarizer.java diff --git a/wss-service-support/src/main/java/org/websoso/support/logging/sql/P6SpySqlFormatter.java b/src/main/java/org/websoso/support/logging/sql/P6SpySqlFormatter.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/logging/sql/P6SpySqlFormatter.java rename to src/main/java/org/websoso/support/logging/sql/P6SpySqlFormatter.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/domain/MinimumVersion.java b/src/main/java/org/websoso/support/version/domain/MinimumVersion.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/domain/MinimumVersion.java rename to src/main/java/org/websoso/support/version/domain/MinimumVersion.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/domain/OS.java b/src/main/java/org/websoso/support/version/domain/OS.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/domain/OS.java rename to src/main/java/org/websoso/support/version/domain/OS.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/domain/Version.java b/src/main/java/org/websoso/support/version/domain/Version.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/domain/Version.java rename to src/main/java/org/websoso/support/version/domain/Version.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/dto/GetMinimumVersionResult.java b/src/main/java/org/websoso/support/version/dto/GetMinimumVersionResult.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/dto/GetMinimumVersionResult.java rename to src/main/java/org/websoso/support/version/dto/GetMinimumVersionResult.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/dto/UpdateMinimumVersionCommand.java b/src/main/java/org/websoso/support/version/dto/UpdateMinimumVersionCommand.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/dto/UpdateMinimumVersionCommand.java rename to src/main/java/org/websoso/support/version/dto/UpdateMinimumVersionCommand.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/exception/CustomMinimumVersionError.java b/src/main/java/org/websoso/support/version/exception/CustomMinimumVersionError.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/exception/CustomMinimumVersionError.java rename to src/main/java/org/websoso/support/version/exception/CustomMinimumVersionError.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/exception/CustomMinimumVersionException.java b/src/main/java/org/websoso/support/version/exception/CustomMinimumVersionException.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/exception/CustomMinimumVersionException.java rename to src/main/java/org/websoso/support/version/exception/CustomMinimumVersionException.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/repository/MinimumVersionRepository.java b/src/main/java/org/websoso/support/version/repository/MinimumVersionRepository.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/repository/MinimumVersionRepository.java rename to src/main/java/org/websoso/support/version/repository/MinimumVersionRepository.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/service/GetAppVersionService.java b/src/main/java/org/websoso/support/version/service/GetAppVersionService.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/service/GetAppVersionService.java rename to src/main/java/org/websoso/support/version/service/GetAppVersionService.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/service/UpdateAppVersionService.java b/src/main/java/org/websoso/support/version/service/UpdateAppVersionService.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/service/UpdateAppVersionService.java rename to src/main/java/org/websoso/support/version/service/UpdateAppVersionService.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/usecase/GetAppVersionQuery.java b/src/main/java/org/websoso/support/version/usecase/GetAppVersionQuery.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/usecase/GetAppVersionQuery.java rename to src/main/java/org/websoso/support/version/usecase/GetAppVersionQuery.java diff --git a/wss-service-support/src/main/java/org/websoso/support/version/usecase/UpdateAppVersionUseCase.java b/src/main/java/org/websoso/support/version/usecase/UpdateAppVersionUseCase.java similarity index 100% rename from wss-service-support/src/main/java/org/websoso/support/version/usecase/UpdateAppVersionUseCase.java rename to src/main/java/org/websoso/support/version/usecase/UpdateAppVersionUseCase.java diff --git a/wss-service-support/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from wss-service-support/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/wss-service-support/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml similarity index 100% rename from wss-service-support/src/main/resources/logback-spring.xml rename to src/main/resources/logback-spring.xml diff --git a/wss-service-support/src/test/java/org/websoso/support/logging/LogbackConfigurationTest.java b/src/test/java/org/websoso/support/logging/LogbackConfigurationTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/logging/LogbackConfigurationTest.java rename to src/test/java/org/websoso/support/logging/LogbackConfigurationTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/logging/masking/SensitiveDataMaskerTest.java b/src/test/java/org/websoso/support/logging/masking/SensitiveDataMaskerTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/logging/masking/SensitiveDataMaskerTest.java rename to src/test/java/org/websoso/support/logging/masking/SensitiveDataMaskerTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/logging/request/RequestBodyLoggingAdviceTest.java b/src/test/java/org/websoso/support/logging/request/RequestBodyLoggingAdviceTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/logging/request/RequestBodyLoggingAdviceTest.java rename to src/test/java/org/websoso/support/logging/request/RequestBodyLoggingAdviceTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/logging/request/RequestLoggingFilterTest.java b/src/test/java/org/websoso/support/logging/request/RequestLoggingFilterTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/logging/request/RequestLoggingFilterTest.java rename to src/test/java/org/websoso/support/logging/request/RequestLoggingFilterTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/logging/response/ResponseBodyLoggingAdviceTest.java b/src/test/java/org/websoso/support/logging/response/ResponseBodyLoggingAdviceTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/logging/response/ResponseBodyLoggingAdviceTest.java rename to src/test/java/org/websoso/support/logging/response/ResponseBodyLoggingAdviceTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/version/domain/OSTest.java b/src/test/java/org/websoso/support/version/domain/OSTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/version/domain/OSTest.java rename to src/test/java/org/websoso/support/version/domain/OSTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/version/domain/VersionTest.java b/src/test/java/org/websoso/support/version/domain/VersionTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/version/domain/VersionTest.java rename to src/test/java/org/websoso/support/version/domain/VersionTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/version/service/GetAppVersionServiceTest.java b/src/test/java/org/websoso/support/version/service/GetAppVersionServiceTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/version/service/GetAppVersionServiceTest.java rename to src/test/java/org/websoso/support/version/service/GetAppVersionServiceTest.java diff --git a/wss-service-support/src/test/java/org/websoso/support/version/service/UpdateAppVersionServiceTest.java b/src/test/java/org/websoso/support/version/service/UpdateAppVersionServiceTest.java similarity index 100% rename from wss-service-support/src/test/java/org/websoso/support/version/service/UpdateAppVersionServiceTest.java rename to src/test/java/org/websoso/support/version/service/UpdateAppVersionServiceTest.java diff --git a/wss-common/build.gradle b/wss-common/build.gradle deleted file mode 100644 index b8ae101b4..000000000 --- a/wss-common/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - // ============== Spring Boot Starters ============== - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - - // ============== Database & Persistence ============== - // QueryDSL - implementation 'com.querydsl:querydsl-jpa::jakarta' - annotationProcessor 'com.querydsl:querydsl-apt::jakarta' - annotationProcessor 'jakarta.annotation:jakarta.annotation-api' - annotationProcessor 'jakarta.persistence:jakarta.persistence-api' -} \ No newline at end of file diff --git a/wss-service-support/build.gradle b/wss-service-support/build.gradle deleted file mode 100644 index 1c39dd2a2..000000000 --- a/wss-service-support/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -dependencies { - // ============== Spring Boot Starters ============== - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - // ============== Database & Persistence ============== - // MySQL Driver - runtimeOnly 'com.mysql:mysql-connector-j' - - // SQL Logging (P6Spy) - implementation 'p6spy:p6spy:3.9.1' - implementation 'com.github.gavlyukovskiy:datasource-decorator-spring-boot-autoconfigure:1.9.2' - - // 구조화 로깅 - runtimeOnly 'net.logstash.logback:logstash-logback-encoder:7.4' - - // ============== Project Modules ============== - implementation project(':wss-common') - - // ============== Test ============== - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/wss-service-support/gradle/wrapper/gradle-wrapper.jar b/wss-service-support/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 1b33c55ba..000000000 Binary files a/wss-service-support/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/wss-service-support/gradle/wrapper/gradle-wrapper.properties b/wss-service-support/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index d4081da47..000000000 --- a/wss-service-support/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists