From d6869f819143c0960f46ac38e197064ba93ec67b Mon Sep 17 00:00:00 2001 From: jade Date: Tue, 21 Jul 2026 09:02:48 +0900 Subject: [PATCH] refactor: Merge dap-common into dap-tool-core --- dap-common/build.gradle | 35 ------------------- dap-gateway/build.gradle | 2 +- dap-tool-core/build.gradle | 25 ++++++++++++- .../dap/common/adapter/dto/ErrorDetail.java | 0 .../common/adapter/dto/JsonRpcRequest.java | 0 .../common/adapter/dto/JsonRpcResponse.java | 0 .../dap/common/adapter/dto/Params.java | 0 .../dap/common/config/CorsConfig.java | 0 .../dap/common/config/MybatisConfig.java | 0 .../dap/common/config/P6SpySqlFormatter.java | 0 .../integration/GlowIntegrationCall.java | 0 .../integration/dto/SampleGlowMessage.java | 0 .../config/ShinhanIntegrationProperties.java | 0 .../mci/dto/MciRequestWrapper.java | 0 .../mci/dto/MciResponseWrapper.java | 0 .../mci/dto/ShinhanCommonHeaderDto.java | 0 .../dap/common/mcp/config/CacheConfig.java | 0 .../dap/common/mcp/config/JacksonConfig.java | 0 .../common/mcp/config/KafkaLocalConfig.java | 0 .../dap/common/mcp/config/SwaggerConfig.java | 0 .../dap/common/mcp/config/WebConfig.java | 0 .../mcp/exception/GlobalExceptionHandler.java | 0 .../common/mcp/filter/MdcLoggingFilter.java | 0 .../mcp/security/ApiKeyInterceptor.java | 0 .../mcp/security/SecurityProperties.java | 0 .../session/converter/ZtUsacConverter.java | 0 .../session/domain/model/ZtUsacModel.java | 0 .../domain/repository/ZtUsacRepository.java | 0 .../session/domain/service/ZtUsacService.java | 0 .../service/impl/ZtUsacServiceImpl.java | 0 .../dap/common/session/dto/SessionDto.java | 0 .../dap/common/session/dto/ZtUsacInDto.java | 0 .../dap/common/session/dto/ZtUsacOutDto.java | 0 .../presentation/SsoRestController.java | 0 .../session/presentation/io/SsoResponse.java | 0 .../dap/common/util/PodScaffolder.java | 0 .../dap/common/util/SessionUtil.java | 0 .../dap/common/util/ToolScaffolder.java | 0 .../dap/common/util/ToolSourceUpdater.java | 0 .../shinhanlife/dap/mcg/dto/ToolMetadata.java | 0 .../io/shinhanlife/glow/BaseException.java | 0 .../io/shinhanlife/glow/BaseResponse.java | 0 .../io/shinhanlife/glow/BizException.java | 0 .../io/shinhanlife/glow/GlowAppServiceId.java | 0 .../io/shinhanlife/glow/GlowControllerId.java | 0 .../io/shinhanlife/glow/GlowIndexPaging.java | 0 .../io/shinhanlife/glow/GlowLogTarget.java | 0 .../java/io/shinhanlife/glow/GlowLogger.java | 0 .../io/shinhanlife/glow/GlowMciFieldInfo.java | 0 .../shinhanlife/glow/GlowMybatisMapper.java | 0 .../shinhanlife/glow/GlowServiceGroupId.java | 0 .../io/shinhanlife/glow/GlowTrgmField.java | 0 .../java/io/shinhanlife/glow/PageInfo.java | 0 .../io/shinhanlife/glow/ResponseCode.java | 0 .../io/shinhanlife/glow/ResponseUtil.java | 0 .../io/shinhanlife/glow/db/dto/AuditInfo.java | 0 .../shinhanlife/glow/util/GlowMciParser.java | 0 .../shinhanlife/glow/util/GlowTrgmParser.java | 0 .../glow/util/GlowMciParserTest.java | 0 settings.gradle | 1 - 60 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 dap-common/build.gradle rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/adapter/dto/ErrorDetail.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcRequest.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcResponse.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/adapter/dto/Params.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/config/CorsConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/config/MybatisConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/config/P6SpySqlFormatter.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/integration/GlowIntegrationCall.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/integration/dto/SampleGlowMessage.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/integration/mci/config/ShinhanIntegrationProperties.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciRequestWrapper.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciResponseWrapper.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/ShinhanCommonHeaderDto.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/config/CacheConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/config/JacksonConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/config/KafkaLocalConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/config/SwaggerConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/config/WebConfig.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/exception/GlobalExceptionHandler.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/filter/MdcLoggingFilter.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/security/ApiKeyInterceptor.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/mcp/security/SecurityProperties.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/converter/ZtUsacConverter.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/domain/model/ZtUsacModel.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/domain/repository/ZtUsacRepository.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/domain/service/ZtUsacService.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/domain/service/impl/ZtUsacServiceImpl.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/dto/SessionDto.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacInDto.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacOutDto.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/presentation/SsoRestController.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/session/presentation/io/SsoResponse.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/util/PodScaffolder.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/util/SessionUtil.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/util/ToolScaffolder.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/common/util/ToolSourceUpdater.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/dap/mcg/dto/ToolMetadata.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/BaseException.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/BaseResponse.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/BizException.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowAppServiceId.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowControllerId.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowIndexPaging.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowLogTarget.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowLogger.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowMciFieldInfo.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowMybatisMapper.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowServiceGroupId.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/GlowTrgmField.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/PageInfo.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/ResponseCode.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/ResponseUtil.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/db/dto/AuditInfo.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/util/GlowMciParser.java (100%) rename {dap-common => dap-tool-core}/src/main/java/io/shinhanlife/glow/util/GlowTrgmParser.java (100%) rename {dap-common => dap-tool-core}/src/test/java/io/shinhanlife/glow/util/GlowMciParserTest.java (100%) diff --git a/dap-common/build.gradle b/dap-common/build.gradle deleted file mode 100644 index 7b15e28..0000000 --- a/dap-common/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'java-library' -} - -dependencies { - api 'org.springframework.boot:spring-boot-starter-web' - api 'org.springframework.boot:spring-boot-starter-validation' - api 'org.springframework.boot:spring-boot-starter-data-redis' - - api 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0' - api 'io.github.resilience4j:resilience4j-core:2.2.0' - api 'io.github.resilience4j:resilience4j-circuitbreaker:2.2.0' - api 'io.github.resilience4j:resilience4j-ratelimiter' - api 'io.github.resilience4j:resilience4j-retry:2.2.0' - api 'org.springframework.boot:spring-boot-starter-aop:3.3.0' - - api 'org.springframework.boot:spring-boot-starter-jdbc' - api 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3' - api 'com.h2database:h2' - api 'p6spy:p6spy:3.9.1' - api 'io.lettuce:lettuce-core:6.6.0.RELEASE' - - api "org.mapstruct:mapstruct:1.5.5.Final" - - api 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1' - api 'com.fasterxml.jackson.core:jackson-databind:2.17.1' - api 'com.networknt:json-schema-validator:1.4.0' - api 'org.springframework.kafka:spring-kafka:3.2.0' - api 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0' -} - -dependencies { - compileOnly 'org.projectlombok:lombok:1.18.32' - annotationProcessor 'org.projectlombok:lombok:1.18.32' -} diff --git a/dap-gateway/build.gradle b/dap-gateway/build.gradle index 109a20f..2980a8c 100644 --- a/dap-gateway/build.gradle +++ b/dap-gateway/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation project(':dap-common') + implementation project(':dap-tool-core') implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-data-redis' diff --git a/dap-tool-core/build.gradle b/dap-tool-core/build.gradle index 1be1360..66471ab 100644 --- a/dap-tool-core/build.gradle +++ b/dap-tool-core/build.gradle @@ -3,7 +3,30 @@ plugins { } dependencies { - api project(':dap-common') + api 'org.springframework.boot:spring-boot-starter-web' + api 'org.springframework.boot:spring-boot-starter-validation' + api 'org.springframework.boot:spring-boot-starter-data-redis' + + api 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0' + api 'io.github.resilience4j:resilience4j-core:2.2.0' + api 'io.github.resilience4j:resilience4j-circuitbreaker:2.2.0' + api 'io.github.resilience4j:resilience4j-ratelimiter' + api 'io.github.resilience4j:resilience4j-retry:2.2.0' + api 'org.springframework.boot:spring-boot-starter-aop:3.3.0' + + api 'org.springframework.boot:spring-boot-starter-jdbc' + api 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3' + api 'com.h2database:h2' + api 'p6spy:p6spy:3.9.1' + api 'io.lettuce:lettuce-core:6.6.0.RELEASE' + + api "org.mapstruct:mapstruct:1.5.5.Final" + + api 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1' + api 'com.fasterxml.jackson.core:jackson-databind:2.17.1' + api 'com.networknt:json-schema-validator:1.4.0' + api 'org.springframework.kafka:spring-kafka:3.2.0' + api 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0' } dependencies { diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/ErrorDetail.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/ErrorDetail.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/ErrorDetail.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/ErrorDetail.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcRequest.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcRequest.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcRequest.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcRequest.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcResponse.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcResponse.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcResponse.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/JsonRpcResponse.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/Params.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/Params.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/adapter/dto/Params.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/adapter/dto/Params.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/config/CorsConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/config/CorsConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/config/CorsConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/config/CorsConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/config/MybatisConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/config/MybatisConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/config/MybatisConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/config/MybatisConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/config/P6SpySqlFormatter.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/config/P6SpySqlFormatter.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/config/P6SpySqlFormatter.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/config/P6SpySqlFormatter.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/integration/GlowIntegrationCall.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/GlowIntegrationCall.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/integration/GlowIntegrationCall.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/GlowIntegrationCall.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/integration/dto/SampleGlowMessage.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/dto/SampleGlowMessage.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/integration/dto/SampleGlowMessage.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/dto/SampleGlowMessage.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/config/ShinhanIntegrationProperties.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/config/ShinhanIntegrationProperties.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/config/ShinhanIntegrationProperties.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/config/ShinhanIntegrationProperties.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciRequestWrapper.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciRequestWrapper.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciRequestWrapper.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciRequestWrapper.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciResponseWrapper.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciResponseWrapper.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciResponseWrapper.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/MciResponseWrapper.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/ShinhanCommonHeaderDto.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/ShinhanCommonHeaderDto.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/ShinhanCommonHeaderDto.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/integration/mci/dto/ShinhanCommonHeaderDto.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/CacheConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/CacheConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/CacheConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/CacheConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/JacksonConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/JacksonConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/JacksonConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/JacksonConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/KafkaLocalConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/KafkaLocalConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/KafkaLocalConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/KafkaLocalConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/SwaggerConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/SwaggerConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/SwaggerConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/SwaggerConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/WebConfig.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/WebConfig.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/WebConfig.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/config/WebConfig.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/exception/GlobalExceptionHandler.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/exception/GlobalExceptionHandler.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/exception/GlobalExceptionHandler.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/exception/GlobalExceptionHandler.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/filter/MdcLoggingFilter.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/filter/MdcLoggingFilter.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/filter/MdcLoggingFilter.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/filter/MdcLoggingFilter.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/security/ApiKeyInterceptor.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/security/ApiKeyInterceptor.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/security/ApiKeyInterceptor.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/security/ApiKeyInterceptor.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/mcp/security/SecurityProperties.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/security/SecurityProperties.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/mcp/security/SecurityProperties.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/mcp/security/SecurityProperties.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/converter/ZtUsacConverter.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/converter/ZtUsacConverter.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/converter/ZtUsacConverter.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/converter/ZtUsacConverter.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/model/ZtUsacModel.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/model/ZtUsacModel.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/model/ZtUsacModel.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/model/ZtUsacModel.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/repository/ZtUsacRepository.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/repository/ZtUsacRepository.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/repository/ZtUsacRepository.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/repository/ZtUsacRepository.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/service/ZtUsacService.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/service/ZtUsacService.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/service/ZtUsacService.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/service/ZtUsacService.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/service/impl/ZtUsacServiceImpl.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/service/impl/ZtUsacServiceImpl.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/domain/service/impl/ZtUsacServiceImpl.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/domain/service/impl/ZtUsacServiceImpl.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/dto/SessionDto.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/dto/SessionDto.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/dto/SessionDto.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/dto/SessionDto.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacInDto.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacInDto.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacInDto.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacInDto.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacOutDto.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacOutDto.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacOutDto.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/dto/ZtUsacOutDto.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/presentation/SsoRestController.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/presentation/SsoRestController.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/presentation/SsoRestController.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/presentation/SsoRestController.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/session/presentation/io/SsoResponse.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/presentation/io/SsoResponse.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/session/presentation/io/SsoResponse.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/session/presentation/io/SsoResponse.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/util/PodScaffolder.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/PodScaffolder.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/util/PodScaffolder.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/PodScaffolder.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/util/SessionUtil.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/SessionUtil.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/util/SessionUtil.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/SessionUtil.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/util/ToolScaffolder.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/ToolScaffolder.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/util/ToolScaffolder.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/ToolScaffolder.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/common/util/ToolSourceUpdater.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/ToolSourceUpdater.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/common/util/ToolSourceUpdater.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/common/util/ToolSourceUpdater.java diff --git a/dap-common/src/main/java/io/shinhanlife/dap/mcg/dto/ToolMetadata.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/mcg/dto/ToolMetadata.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/dap/mcg/dto/ToolMetadata.java rename to dap-tool-core/src/main/java/io/shinhanlife/dap/mcg/dto/ToolMetadata.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/BaseException.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/BaseException.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/BaseException.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/BaseException.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/BaseResponse.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/BaseResponse.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/BaseResponse.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/BaseResponse.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/BizException.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/BizException.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/BizException.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/BizException.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowAppServiceId.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowAppServiceId.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowAppServiceId.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowAppServiceId.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowControllerId.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowControllerId.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowControllerId.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowControllerId.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowIndexPaging.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowIndexPaging.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowIndexPaging.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowIndexPaging.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowLogTarget.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowLogTarget.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowLogTarget.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowLogTarget.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowLogger.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowLogger.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowLogger.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowLogger.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowMciFieldInfo.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowMciFieldInfo.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowMciFieldInfo.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowMciFieldInfo.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowMybatisMapper.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowMybatisMapper.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowMybatisMapper.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowMybatisMapper.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowServiceGroupId.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowServiceGroupId.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowServiceGroupId.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowServiceGroupId.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/GlowTrgmField.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/GlowTrgmField.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/GlowTrgmField.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/GlowTrgmField.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/PageInfo.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/PageInfo.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/PageInfo.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/PageInfo.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/ResponseCode.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/ResponseCode.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/ResponseCode.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/ResponseCode.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/ResponseUtil.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/ResponseUtil.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/ResponseUtil.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/ResponseUtil.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/db/dto/AuditInfo.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/db/dto/AuditInfo.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/db/dto/AuditInfo.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/db/dto/AuditInfo.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/util/GlowMciParser.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/util/GlowMciParser.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/util/GlowMciParser.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/util/GlowMciParser.java diff --git a/dap-common/src/main/java/io/shinhanlife/glow/util/GlowTrgmParser.java b/dap-tool-core/src/main/java/io/shinhanlife/glow/util/GlowTrgmParser.java similarity index 100% rename from dap-common/src/main/java/io/shinhanlife/glow/util/GlowTrgmParser.java rename to dap-tool-core/src/main/java/io/shinhanlife/glow/util/GlowTrgmParser.java diff --git a/dap-common/src/test/java/io/shinhanlife/glow/util/GlowMciParserTest.java b/dap-tool-core/src/test/java/io/shinhanlife/glow/util/GlowMciParserTest.java similarity index 100% rename from dap-common/src/test/java/io/shinhanlife/glow/util/GlowMciParserTest.java rename to dap-tool-core/src/test/java/io/shinhanlife/glow/util/GlowMciParserTest.java diff --git a/settings.gradle b/settings.gradle index 3fbc6b6..b4d9ba3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ rootProject.name = 'dap-admin' -include 'dap-common' include 'dap-gateway' include 'dap-tool-core' include 'dap-tool-sms'