diff --git a/modules/api/src/main/java/com/whoz_in/api/command/member/presentation/AuthController.java b/modules/api/src/main/java/com/whoz_in/api/command/member/presentation/AuthController.java deleted file mode 100644 index dfd1e7a3..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/command/member/presentation/AuthController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.whoz_in.api.command.member.presentation; - -import com.whoz_in.api.shared.presentation.CommandQueryController; -import com.whoz_in.api.shared.application.command.CommandBus; -import com.whoz_in.api.shared.application.query.QueryBus; - -public class AuthController extends CommandQueryController { - public AuthController(CommandBus commandBus, QueryBus queryBus) { - super(commandBus, queryBus); - } - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfo.java b/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfo.java deleted file mode 100644 index d75a8c25..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.whoz_in.api.query.device_info.application; - -import com.whoz_in.api.shared.application.query.Response; -import com.whoz_in.api.shared.application.query.View; - -public final class DeviceInfo implements Response, View { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfo.java b/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfo.java deleted file mode 100644 index 432e7560..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.whoz_in.api.query.device_info.application; - -import com.whoz_in.api.shared.application.query.Response; -import com.whoz_in.api.shared.application.query.View; - -public final class DevicesInfo implements Response, View { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfoGet.java b/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfoGet.java deleted file mode 100644 index 9fb5481f..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfoGet.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.whoz_in.api.query.device_info.application; - -import com.whoz_in.api.shared.application.query.Query; - -public final class DevicesInfoGet implements Query { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberGet.java b/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberGet.java deleted file mode 100644 index a72113ca..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberGet.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.whoz_in.api.query.member.application; - - -import com.whoz_in.api.shared.application.query.Query; - -public class MemberGet implements Query { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberResponse.java b/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberResponse.java deleted file mode 100644 index 545eaf77..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.whoz_in.api.query.member.application; - -import com.whoz_in.api.shared.application.query.Response; -import lombok.Getter; - -@Getter -public final class MemberResponse implements Response { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Query.java b/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Query.java deleted file mode 100644 index 5f157130..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Query.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.whoz_in.api.shared.application.query; - -public interface Query { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Response.java b/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Response.java deleted file mode 100644 index 9c0016d1..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Response.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.whoz_in.api.shared.application.query; - -public interface Response { - -} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ApiResponseBody.java b/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ApiResponseBody.java deleted file mode 100644 index 0f159d4c..00000000 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ApiResponseBody.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.whoz_in.api.shared.presentation.response; - -public abstract class ApiResponseBody { - -} diff --git a/modules/infrastructure/api-query-jpa/build.gradle b/modules/infrastructure/api-query-jpa/build.gradle index 7262eb4a..5f70a596 100644 --- a/modules/infrastructure/api-query-jpa/build.gradle +++ b/modules/infrastructure/api-query-jpa/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - compileOnly project(":modules:api") + compileOnly project(":modules:main-api") compileOnly 'org.springframework.boot:spring-boot-starter-data-jpa:3.3.5' diff --git a/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_domain_jpa/Device.java b/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_jpa/Device.java similarity index 90% rename from modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_domain_jpa/Device.java rename to modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_jpa/Device.java index 381a7ca6..18048d2e 100644 --- a/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_domain_jpa/Device.java +++ b/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_jpa/Device.java @@ -1,4 +1,4 @@ -package com.whoz_in.api_query_domain_jpa; +package com.whoz_in.api_query_jpa; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_domain_jpa/device_info/DeviceInfoJpaViewer.java b/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_jpa/device_info/DeviceInfoJpaViewer.java similarity index 58% rename from modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_domain_jpa/device_info/DeviceInfoJpaViewer.java rename to modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_jpa/device_info/DeviceInfoJpaViewer.java index f5890d2b..393e2944 100644 --- a/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_domain_jpa/device_info/DeviceInfoJpaViewer.java +++ b/modules/infrastructure/api-query-jpa/src/main/java/com/whoz_in/api_query_jpa/device_info/DeviceInfoJpaViewer.java @@ -1,9 +1,8 @@ -package com.whoz_in.api_query_domain_jpa.device_info; +package com.whoz_in.api_query_jpa.device_info; -import com.whoz_in.api.query.device_info.application.DeviceInfo; -import com.whoz_in.api.query.device_info.application.DeviceInfoViewer; -import com.whoz_in.api.query.device_info.application.DevicesInfo; -import java.util.List; +import com.whoz_in.main_api.query.device_info.application.DeviceInfo; +import com.whoz_in.main_api.query.device_info.application.DeviceInfoViewer; +import com.whoz_in.main_api.query.device_info.application.DevicesInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/modules/infrastructure/spring/build.gradle b/modules/infrastructure/spring/build.gradle index 571b3c9a..ef66c2d9 100644 --- a/modules/infrastructure/spring/build.gradle +++ b/modules/infrastructure/spring/build.gradle @@ -11,7 +11,7 @@ repositories { dependencies { compileOnly project(':modules:domain') - compileOnly project(':modules:api') + compileOnly project(':modules:main-api') testImplementation platform('org.junit:junit-bom:5.9.1') testImplementation 'org.junit.jupiter:junit-jupiter' diff --git a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/CommandHandlers.java b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/CommandHandlers.java index 62881bd8..85e54f60 100644 --- a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/CommandHandlers.java +++ b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/CommandHandlers.java @@ -1,7 +1,7 @@ package com.whoz_in.spring.application.command; -import com.whoz_in.api.shared.application.command.Command; -import com.whoz_in.api.shared.application.command.CommandHandler; +import com.whoz_in.main_api.shared.application.command.Command; +import com.whoz_in.main_api.shared.application.command.CommandHandler; import java.lang.reflect.ParameterizedType; import java.util.Map; import java.util.stream.Collectors; diff --git a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/SpringCommandBus.java b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/SpringCommandBus.java index f48a831c..46bc2aad 100644 --- a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/SpringCommandBus.java +++ b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/command/SpringCommandBus.java @@ -1,8 +1,8 @@ package com.whoz_in.spring.application.command; -import com.whoz_in.api.shared.application.command.Command; -import com.whoz_in.api.shared.application.command.CommandBus; -import com.whoz_in.api.shared.application.command.CommandHandler; +import com.whoz_in.main_api.shared.application.command.Command; +import com.whoz_in.main_api.shared.application.command.CommandBus; +import com.whoz_in.main_api.shared.application.command.CommandHandler; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/QueryHandlers.java b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/QueryHandlers.java index ea25b001..84523a1c 100644 --- a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/QueryHandlers.java +++ b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/QueryHandlers.java @@ -1,7 +1,7 @@ package com.whoz_in.spring.application.query; -import com.whoz_in.api.shared.application.query.Query; -import com.whoz_in.api.shared.application.query.QueryHandler; +import com.whoz_in.main_api.shared.application.query.Query; +import com.whoz_in.main_api.shared.application.query.QueryHandler; import java.lang.reflect.ParameterizedType; import java.util.Map; import java.util.stream.Collectors; diff --git a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/SpringQueryBus.java b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/SpringQueryBus.java index 9f1bb77b..5c3a7620 100644 --- a/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/SpringQueryBus.java +++ b/modules/infrastructure/spring/src/main/java/com/whoz_in/spring/application/query/SpringQueryBus.java @@ -1,9 +1,9 @@ package com.whoz_in.spring.application.query; -import com.whoz_in.api.shared.application.query.Query; -import com.whoz_in.api.shared.application.query.QueryBus; -import com.whoz_in.api.shared.application.query.QueryHandler; -import com.whoz_in.api.shared.application.query.Response; +import com.whoz_in.main_api.shared.application.query.Query; +import com.whoz_in.main_api.shared.application.query.QueryBus; +import com.whoz_in.main_api.shared.application.query.QueryHandler; +import com.whoz_in.main_api.shared.application.query.Response; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/modules/api/build.gradle b/modules/main-api/build.gradle similarity index 100% rename from modules/api/build.gradle rename to modules/main-api/build.gradle diff --git a/modules/api/src/main/java/com/whoz_in/api/WhozInApiApplication.java b/modules/main-api/src/main/java/com/whoz_in/main_api/MainApiApplication.java similarity index 64% rename from modules/api/src/main/java/com/whoz_in/api/WhozInApiApplication.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/MainApiApplication.java index 07f4ab4c..94f9edca 100644 --- a/modules/api/src/main/java/com/whoz_in/api/WhozInApiApplication.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/MainApiApplication.java @@ -1,13 +1,13 @@ -package com.whoz_in.api; +package com.whoz_in.main_api; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication(scanBasePackages = {"com.whoz_in"}) -public class WhozInApiApplication { +public class MainApiApplication { public static void main(String[] args) { - SpringApplication.run(WhozInApiApplication.class, args); + SpringApplication.run(MainApiApplication.class, args); } } \ No newline at end of file diff --git a/modules/api/src/main/java/com/whoz_in/api/command/device/application/DeviceAdd.java b/modules/main-api/src/main/java/com/whoz_in/main_api/command/device/application/DeviceAdd.java similarity index 78% rename from modules/api/src/main/java/com/whoz_in/api/command/device/application/DeviceAdd.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/command/device/application/DeviceAdd.java index 4e1e5bc3..286610d8 100644 --- a/modules/api/src/main/java/com/whoz_in/api/command/device/application/DeviceAdd.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/command/device/application/DeviceAdd.java @@ -1,6 +1,6 @@ -package com.whoz_in.api.command.device.application; +package com.whoz_in.main_api.command.device.application; -import com.whoz_in.api.shared.application.command.Command; +import com.whoz_in.main_api.shared.application.command.Command; import com.whoz_in.domain.device.model.IpAddress; import com.whoz_in.domain.device.model.MacAddress; import lombok.Getter; diff --git a/modules/api/src/main/java/com/whoz_in/api/command/device/application/DeviceAddHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/command/device/application/DeviceAddHandler.java similarity index 74% rename from modules/api/src/main/java/com/whoz_in/api/command/device/application/DeviceAddHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/command/device/application/DeviceAddHandler.java index 9c482fce..5e99c154 100644 --- a/modules/api/src/main/java/com/whoz_in/api/command/device/application/DeviceAddHandler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/command/device/application/DeviceAddHandler.java @@ -1,8 +1,8 @@ -package com.whoz_in.api.command.device.application; +package com.whoz_in.main_api.command.device.application; -import com.whoz_in.api.shared.application.Handler; -import com.whoz_in.api.shared.application.command.CommandHandler; -import com.whoz_in.api.shared.utils.RequesterInfo; +import com.whoz_in.main_api.shared.application.Handler; +import com.whoz_in.main_api.shared.application.command.CommandHandler; +import com.whoz_in.main_api.shared.utils.RequesterInfo; import com.whoz_in.domain.device.DeviceRepository; import com.whoz_in.domain.device.model.Device; import com.whoz_in.domain.shared.event.EventBus; diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/command/member/presentation/AuthController.java b/modules/main-api/src/main/java/com/whoz_in/main_api/command/member/presentation/AuthController.java new file mode 100644 index 00000000..a2e03702 --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/command/member/presentation/AuthController.java @@ -0,0 +1,12 @@ +package com.whoz_in.main_api.command.member.presentation; + +import com.whoz_in.main_api.shared.presentation.CommandQueryController; +import com.whoz_in.main_api.shared.application.command.CommandBus; +import com.whoz_in.main_api.shared.application.query.QueryBus; + +public class AuthController extends CommandQueryController { + public AuthController(CommandBus commandBus, QueryBus queryBus) { + super(commandBus, queryBus); + } + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/command/member/presentation/MemberController.java b/modules/main-api/src/main/java/com/whoz_in/main_api/command/member/presentation/MemberController.java similarity index 82% rename from modules/api/src/main/java/com/whoz_in/api/command/member/presentation/MemberController.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/command/member/presentation/MemberController.java index 990eb47c..3993c508 100644 --- a/modules/api/src/main/java/com/whoz_in/api/command/member/presentation/MemberController.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/command/member/presentation/MemberController.java @@ -1,8 +1,8 @@ -package com.whoz_in.api.command.member.presentation; +package com.whoz_in.main_api.command.member.presentation; -import com.whoz_in.api.shared.presentation.CommandQueryController; -import com.whoz_in.api.shared.application.command.CommandBus; -import com.whoz_in.api.shared.application.query.QueryBus; +import com.whoz_in.main_api.shared.presentation.CommandQueryController; +import com.whoz_in.main_api.shared.application.command.CommandBus; +import com.whoz_in.main_api.shared.application.query.QueryBus; import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/modules/api/src/main/java/com/whoz_in/api/config/JacksonConfig.java b/modules/main-api/src/main/java/com/whoz_in/main_api/config/JacksonConfig.java similarity index 94% rename from modules/api/src/main/java/com/whoz_in/api/config/JacksonConfig.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/config/JacksonConfig.java index ccb8bfb6..b157ae3d 100644 --- a/modules/api/src/main/java/com/whoz_in/api/config/JacksonConfig.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.config; +package com.whoz_in.main_api.config; import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy; import org.springframework.context.annotation.Bean; diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfo.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfo.java new file mode 100644 index 00000000..406b5feb --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfo.java @@ -0,0 +1,8 @@ +package com.whoz_in.main_api.query.device_info.application; + +import com.whoz_in.main_api.shared.application.query.Response; +import com.whoz_in.main_api.shared.application.query.View; + +public final class DeviceInfo implements Response, View { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoGet.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoGet.java similarity index 60% rename from modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoGet.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoGet.java index e7953149..40e17c70 100644 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoGet.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoGet.java @@ -1,6 +1,6 @@ -package com.whoz_in.api.query.device_info.application; +package com.whoz_in.main_api.query.device_info.application; -import com.whoz_in.api.shared.application.query.Query; +import com.whoz_in.main_api.shared.application.query.Query; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoGetHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoGetHandler.java similarity index 65% rename from modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoGetHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoGetHandler.java index 5d3c27bb..4894818b 100644 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoGetHandler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoGetHandler.java @@ -1,7 +1,7 @@ -package com.whoz_in.api.query.device_info.application; +package com.whoz_in.main_api.query.device_info.application; -import com.whoz_in.api.shared.application.Handler; -import com.whoz_in.api.shared.application.query.QueryHandler; +import com.whoz_in.main_api.shared.application.Handler; +import com.whoz_in.main_api.shared.application.query.QueryHandler; import lombok.RequiredArgsConstructor; @Handler diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoViewer.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoViewer.java similarity index 51% rename from modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoViewer.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoViewer.java index f27e7a57..9c961c5c 100644 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DeviceInfoViewer.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DeviceInfoViewer.java @@ -1,7 +1,7 @@ -package com.whoz_in.api.query.device_info.application; +package com.whoz_in.main_api.query.device_info.application; -import com.whoz_in.api.shared.application.query.Viewer; +import com.whoz_in.main_api.shared.application.query.Viewer; public interface DeviceInfoViewer extends Viewer { DeviceInfo findByDeviceId(Long deviceId); diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfo.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfo.java new file mode 100644 index 00000000..d6217087 --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfo.java @@ -0,0 +1,8 @@ +package com.whoz_in.main_api.query.device_info.application; + +import com.whoz_in.main_api.shared.application.query.Response; +import com.whoz_in.main_api.shared.application.query.View; + +public final class DevicesInfo implements Response, View { + +} diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfoGet.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfoGet.java new file mode 100644 index 00000000..5c71f468 --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfoGet.java @@ -0,0 +1,7 @@ +package com.whoz_in.main_api.query.device_info.application; + +import com.whoz_in.main_api.shared.application.query.Query; + +public final class DevicesInfoGet implements Query { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfoGetHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfoGetHandler.java similarity index 63% rename from modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfoGetHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfoGetHandler.java index db41d7bd..8988d365 100644 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/application/DevicesInfoGetHandler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/application/DevicesInfoGetHandler.java @@ -1,7 +1,7 @@ -package com.whoz_in.api.query.device_info.application; +package com.whoz_in.main_api.query.device_info.application; -import com.whoz_in.api.shared.application.Handler; -import com.whoz_in.api.shared.application.query.QueryHandler; +import com.whoz_in.main_api.shared.application.Handler; +import com.whoz_in.main_api.shared.application.query.QueryHandler; import lombok.RequiredArgsConstructor; @Handler diff --git a/modules/api/src/main/java/com/whoz_in/api/query/device_info/presentation/DeviceQueryController.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/presentation/DeviceQueryController.java similarity index 53% rename from modules/api/src/main/java/com/whoz_in/api/query/device_info/presentation/DeviceQueryController.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/presentation/DeviceQueryController.java index 19be50fe..b08e41f7 100644 --- a/modules/api/src/main/java/com/whoz_in/api/query/device_info/presentation/DeviceQueryController.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/device_info/presentation/DeviceQueryController.java @@ -1,11 +1,11 @@ -package com.whoz_in.api.query.device_info.presentation; +package com.whoz_in.main_api.query.device_info.presentation; -import com.whoz_in.api.query.device_info.application.DeviceInfoGet; -import com.whoz_in.api.shared.application.command.CommandBus; -import com.whoz_in.api.shared.application.query.QueryBus; -import com.whoz_in.api.shared.presentation.CommandQueryController; -import com.whoz_in.api.shared.presentation.response.CrudResponseCode; -import com.whoz_in.api.shared.presentation.response.ResponseEntityGenerator; +import com.whoz_in.main_api.query.device_info.application.DeviceInfoGet; +import com.whoz_in.main_api.shared.application.command.CommandBus; +import com.whoz_in.main_api.shared.application.query.QueryBus; +import com.whoz_in.main_api.shared.presentation.CommandQueryController; +import com.whoz_in.main_api.shared.presentation.response.CrudResponseCode; +import com.whoz_in.main_api.shared.presentation.response.ResponseEntityGenerator; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberGet.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberGet.java new file mode 100644 index 00000000..599cd2cd --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberGet.java @@ -0,0 +1,8 @@ +package com.whoz_in.main_api.query.member.application; + + +import com.whoz_in.main_api.shared.application.query.Query; + +public class MemberGet implements Query { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberGetHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberGetHandler.java similarity index 51% rename from modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberGetHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberGetHandler.java index 2351cb34..48987a14 100644 --- a/modules/api/src/main/java/com/whoz_in/api/query/member/application/MemberGetHandler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberGetHandler.java @@ -1,8 +1,8 @@ -package com.whoz_in.api.query.member.application; +package com.whoz_in.main_api.query.member.application; -import com.whoz_in.api.shared.application.Handler; -import com.whoz_in.api.shared.application.query.QueryHandler; +import com.whoz_in.main_api.shared.application.Handler; +import com.whoz_in.main_api.shared.application.query.QueryHandler; @Handler public class MemberGetHandler extends QueryHandler { diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberResponse.java b/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberResponse.java new file mode 100644 index 00000000..7eb52364 --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/query/member/application/MemberResponse.java @@ -0,0 +1,9 @@ +package com.whoz_in.main_api.query.member.application; + +import com.whoz_in.main_api.shared.application.query.Response; +import lombok.Getter; + +@Getter +public final class MemberResponse implements Response { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/Handler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/Handler.java similarity index 91% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/Handler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/Handler.java index 88f0e768..563656e7 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/Handler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/Handler.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application; +package com.whoz_in.main_api.shared.application; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/command/Command.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/Command.java similarity index 85% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/command/Command.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/Command.java index c8bc5b80..c1fc8b7b 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/command/Command.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/Command.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application.command; +package com.whoz_in.main_api.shared.application.command; /* userService.login(String userId) diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/command/CommandBus.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/CommandBus.java similarity index 81% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/command/CommandBus.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/CommandBus.java index 28adb141..962f5176 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/command/CommandBus.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/CommandBus.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application.command; +package com.whoz_in.main_api.shared.application.command; /* 받은 Command에 따라 적절한 CommandHandler에게 명령을 전달하는 인터페이스. diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/command/CommandHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/CommandHandler.java similarity index 81% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/command/CommandHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/CommandHandler.java index ba58b4dd..21992f10 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/command/CommandHandler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/command/CommandHandler.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application.command; +package com.whoz_in.main_api.shared.application.command; /* 우리의 새로운 서비스의 기능을 추가하고 싶을 때마다 이 핸들러와 적절한 Command를 구현하면 된다. diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Query.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Query.java new file mode 100644 index 00000000..4ed02458 --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Query.java @@ -0,0 +1,5 @@ +package com.whoz_in.main_api.shared.application.query; + +public interface Query { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/QueryBus.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/QueryBus.java similarity index 58% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/query/QueryBus.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/QueryBus.java index e943d51d..f7a3cc5f 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/QueryBus.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/QueryBus.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application.query; +package com.whoz_in.main_api.shared.application.query; public interface QueryBus { R ask(Query query); diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/QueryHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/QueryHandler.java similarity index 80% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/query/QueryHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/QueryHandler.java index a2ec6328..3b2e729f 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/QueryHandler.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/QueryHandler.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application.query; +package com.whoz_in.main_api.shared.application.query; /* 형변환 없이 구현체마다 다른 Response를 제공하기 위해 제네릭을 사용했습니다. diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Response.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Response.java new file mode 100644 index 00000000..fa7e629a --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Response.java @@ -0,0 +1,5 @@ +package com.whoz_in.main_api.shared.application.query; + +public interface Response { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/View.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/View.java similarity index 68% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/query/View.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/View.java index 32b9bc8b..270f6c6a 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/View.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/View.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.application.query; +package com.whoz_in.main_api.shared.application.query; /* View는 쿼리용 데이터베이스로부터 가져올 값을 정의하는 VO다. diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Viewer.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Viewer.java similarity index 77% rename from modules/api/src/main/java/com/whoz_in/api/shared/application/query/Viewer.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Viewer.java index 8a4a70cf..ddfe07f6 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/application/query/Viewer.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/application/query/Viewer.java @@ -1,10 +1,10 @@ -package com.whoz_in.api.shared.application.query; +package com.whoz_in.main_api.shared.application.query; /** * 이 인터페이스를 상속한 인터페이스는 쿼리용 데이터베이스로부터 View를 가져오는 메서드를 정의한다. *

정의하는 메서드들은 무조건 View의 구현체를 반환해야 한다. *

쿼리용 데이터베이스에 접근하는 모듈은 Viewer를 상속한 인터페이스를 구현하면 된다. - * @see com.whoz_in.api.shared.application.query.View + * @see com.whoz_in.main_api.shared.application.query.View */ public interface Viewer { diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/CommandQueryController.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/CommandQueryController.java similarity index 68% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/CommandQueryController.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/CommandQueryController.java index db3b01b1..286febc1 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/CommandQueryController.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/CommandQueryController.java @@ -1,10 +1,10 @@ -package com.whoz_in.api.shared.presentation; +package com.whoz_in.main_api.shared.presentation; -import com.whoz_in.api.shared.application.command.Command; -import com.whoz_in.api.shared.application.command.CommandBus; -import com.whoz_in.api.shared.application.query.Query; -import com.whoz_in.api.shared.application.query.QueryBus; -import com.whoz_in.api.shared.application.query.Response; +import com.whoz_in.main_api.shared.application.command.Command; +import com.whoz_in.main_api.shared.application.command.CommandBus; +import com.whoz_in.main_api.shared.application.query.Query; +import com.whoz_in.main_api.shared.application.query.QueryBus; +import com.whoz_in.main_api.shared.application.query.Response; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/GlobalExceptionHandler.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/GlobalExceptionHandler.java similarity index 100% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/GlobalExceptionHandler.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/GlobalExceptionHandler.java diff --git a/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ApiResponseBody.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ApiResponseBody.java new file mode 100644 index 00000000..b557f809 --- /dev/null +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ApiResponseBody.java @@ -0,0 +1,5 @@ +package com.whoz_in.main_api.shared.presentation.response; + +public abstract class ApiResponseBody { + +} diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ApiResponseCode.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ApiResponseCode.java similarity index 70% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ApiResponseCode.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ApiResponseCode.java index 5def4f3d..b6597a19 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ApiResponseCode.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ApiResponseCode.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.presentation.response; +package com.whoz_in.main_api.shared.presentation.response; import org.springframework.http.HttpStatus; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/CrudResponseCode.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/CrudResponseCode.java similarity index 91% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/CrudResponseCode.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/CrudResponseCode.java index f09337d0..20edd98d 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/CrudResponseCode.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/CrudResponseCode.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.presentation.response; +package com.whoz_in.main_api.shared.presentation.response; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/FailureBody.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/FailureBody.java similarity index 79% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/FailureBody.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/FailureBody.java index d0623733..880766c3 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/FailureBody.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/FailureBody.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.presentation.response; +package com.whoz_in.main_api.shared.presentation.response; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ResponseEntityGenerator.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ResponseEntityGenerator.java similarity index 95% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ResponseEntityGenerator.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ResponseEntityGenerator.java index 45c82921..938b16a8 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/ResponseEntityGenerator.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/ResponseEntityGenerator.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.presentation.response; +package com.whoz_in.main_api.shared.presentation.response; //import com.whoz_in.domain.shared.BusinessException; import lombok.experimental.UtilityClass; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/SuccessBody.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/SuccessBody.java similarity index 78% rename from modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/SuccessBody.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/SuccessBody.java index e144d29a..bf8a38e3 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/presentation/response/SuccessBody.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/presentation/response/SuccessBody.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.presentation.response; +package com.whoz_in.main_api.shared.presentation.response; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/utils/RequesterInfo.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/RequesterInfo.java similarity index 89% rename from modules/api/src/main/java/com/whoz_in/api/shared/utils/RequesterInfo.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/RequesterInfo.java index 044cfd38..f036c504 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/utils/RequesterInfo.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/RequesterInfo.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.utils; +package com.whoz_in.main_api.shared.utils; import java.util.Optional; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/utils/StubRequesterInfo.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/StubRequesterInfo.java similarity index 89% rename from modules/api/src/main/java/com/whoz_in/api/shared/utils/StubRequesterInfo.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/StubRequesterInfo.java index 332c02e0..a7e12237 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/utils/StubRequesterInfo.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/StubRequesterInfo.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.utils; +package com.whoz_in.main_api.shared.utils; import java.util.Optional; import org.springframework.stereotype.Component; diff --git a/modules/api/src/main/java/com/whoz_in/api/shared/utils/UserNotAuthenticationException.java b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/UserNotAuthenticationException.java similarity index 88% rename from modules/api/src/main/java/com/whoz_in/api/shared/utils/UserNotAuthenticationException.java rename to modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/UserNotAuthenticationException.java index 7693d7f4..0ae065eb 100644 --- a/modules/api/src/main/java/com/whoz_in/api/shared/utils/UserNotAuthenticationException.java +++ b/modules/main-api/src/main/java/com/whoz_in/main_api/shared/utils/UserNotAuthenticationException.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.shared.utils; +package com.whoz_in.main_api.shared.utils; import com.whoz_in.domain.shared.BusinessException; diff --git a/modules/api/src/main/resources/application.yml b/modules/main-api/src/main/resources/application.yml similarity index 100% rename from modules/api/src/main/resources/application.yml rename to modules/main-api/src/main/resources/application.yml diff --git a/modules/api/src/test/java/com/whoz_in/api/architecture/ApplicationTest.java b/modules/main-api/src/test/java/com/whoz_in/main_api/architecture/ApplicationTest.java similarity index 90% rename from modules/api/src/test/java/com/whoz_in/api/architecture/ApplicationTest.java rename to modules/main-api/src/test/java/com/whoz_in/main_api/architecture/ApplicationTest.java index 2f69dfb4..49b17b0d 100644 --- a/modules/api/src/test/java/com/whoz_in/api/architecture/ApplicationTest.java +++ b/modules/main-api/src/test/java/com/whoz_in/main_api/architecture/ApplicationTest.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.architecture; +package com.whoz_in.main_api.architecture; import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.core.importer.ClassFileImporter; @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; class ApplicationTest { - private final JavaClasses importedClasses = new ClassFileImporter().importPackages("com.whoz_in.api"); + private final JavaClasses importedClasses = new ClassFileImporter().importPackages("com.whoz_in.main_api"); @Test void Application은_Presentation을_의존하지않아야합니다() { diff --git a/modules/api/src/test/java/com/whoz_in/api/architecture/ViewerTest.java b/modules/main-api/src/test/java/com/whoz_in/main_api/architecture/ViewerTest.java similarity index 90% rename from modules/api/src/test/java/com/whoz_in/api/architecture/ViewerTest.java rename to modules/main-api/src/test/java/com/whoz_in/main_api/architecture/ViewerTest.java index 37a0c32b..27dc48fa 100644 --- a/modules/api/src/test/java/com/whoz_in/api/architecture/ViewerTest.java +++ b/modules/main-api/src/test/java/com/whoz_in/main_api/architecture/ViewerTest.java @@ -1,4 +1,4 @@ -package com.whoz_in.api.architecture; +package com.whoz_in.main_api.architecture; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.domain.JavaClasses; @@ -10,10 +10,10 @@ import com.tngtech.archunit.lang.ConditionEvents; import com.tngtech.archunit.lang.SimpleConditionEvent; import com.tngtech.archunit.lang.syntax.ArchRuleDefinition; -import com.whoz_in.api.shared.application.query.View; -import com.whoz_in.api.shared.application.query.Viewer; +import com.whoz_in.main_api.shared.application.query.View; +import com.whoz_in.main_api.shared.application.query.Viewer; -@AnalyzeClasses(packages = "com.whoz_in.api", importOptions = ImportOption.DoNotIncludeTests.class) +@AnalyzeClasses(packages = "com.whoz_in.main_api", importOptions = ImportOption.DoNotIncludeTests.class) class ViewerTest { @ArchTest diff --git a/modules/network-api/src/main/java/com/whoz_in/network_log/WhozInNetworkLogApplication.java b/modules/network-api/src/main/java/com/whoz_in/network_log/NetworkLogApplication.java similarity index 70% rename from modules/network-api/src/main/java/com/whoz_in/network_log/WhozInNetworkLogApplication.java rename to modules/network-api/src/main/java/com/whoz_in/network_log/NetworkLogApplication.java index 78b9e42c..145b6f17 100644 --- a/modules/network-api/src/main/java/com/whoz_in/network_log/WhozInNetworkLogApplication.java +++ b/modules/network-api/src/main/java/com/whoz_in/network_log/NetworkLogApplication.java @@ -4,10 +4,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication(scanBasePackages = {"com.whoz_in"}) -public class WhozInNetworkLogApplication { +public class NetworkLogApplication { public static void main(String[] args) { - SpringApplication.run(WhozInNetworkLogApplication.class, args); + SpringApplication.run(NetworkLogApplication.class, args); } } diff --git a/settings.gradle b/settings.gradle index 6235b489..47d732a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ rootProject.name = 'whoz_in' -include 'modules:api' -findProject(':modules:api')?.name = 'api' +include 'modules:main-api' +findProject(':modules:main-api')?.name = 'main-api' include 'modules:network-api' findProject(':modules:network-api')?.name = 'network-api' include 'modules:domain'