From 8115f03c089123d996e485b30c7cd895b23764bb Mon Sep 17 00:00:00 2001 From: Pieter Van Eeckhout Date: Wed, 13 Mar 2024 23:15:13 +0100 Subject: [PATCH] Streamline hexagone structure (#150) * Remove DTO and Mapper interfaces Redundant interfaces related to DTOs, Entity and Mappers from the trading module have been deleted. This clean-up action was undertaken to simplify the codebase and remove excessive constraining of adapters, thereby improving project maintainability. * Refactor class names for clarity Classes in the backend trade adapter module have been renamed to improve clarity and maintain convention. These changes include the addition of prefixes like Mybatis and Rest to indicate the context of the class. * Refactor test and service codes in trade-module Adjusted how message objects are created and used in multiple test and service files. Removed unnecessary assertion lines and streamlined code for cleaner, simplified logic for request port service tests. Updated how JsonNode objects are used in inter-module communication service. * Add mappers to BootTradeModuleController dependency injection The addition of five different mapper classes to the BootTradeModuleController was completed. These mappers bring about a new functionality to map data transfer objects (DTOs) to domain objects. The change will affect the way data is processed within the BootTradeModuleController, hence enhancing its functionality and encapsulation adherence. * Remove multiple objects and their mapper classes Several DTO, entity, and mapper classes related to the exploration-module have been deleted. This significant cleanup removes unnecessary code related to several classes like BodyDto, StarEntity, and StationMaxLandingPadSizeRequestEntity. The elimination of these files may impact functionality, so other solutions should be considered for the functionalities they provided. --- .../BootExplorationModuleController.java | 11 +- build.gradle | 4 +- exploration-module/build.gradle | 2 + .../adapter/config/KafkaMapperConfig.java | 24 ---- .../config/MessageProcessorConfig.java | 15 ++- .../adapter/config/RepositoryConfig.java | 23 ++-- .../adapter/config/ServiceConfig.java | 32 +---- .../adapter/kafka/dto/KafkaMessageDto.java | 8 +- .../kafka/dto/mapper/KafkaMessageMapper.java | 4 +- ...aStationArrivalDistanceResponseMapper.java | 17 --- .../KafkaSystemCoordinatesResponseMapper.java | 20 --- .../KafkaSystemEliteIdResponseMapper.java | 18 --- .../StationDataRequestMessageProcessor.java | 2 +- .../SystemDataRequestMessageProcessor.java | 2 +- .../kafka/sender/KafkaMessageSender.java | 16 ++- .../adapter/persistence/BodyRepository.java | 5 +- .../persistence/MybatisBodyRepository.java | 13 +- .../persistence/MybatisRingRepository.java | 6 +- .../persistence/MybatisStarRepository.java | 7 +- ...ationArrivalDistanceRequestRepository.java | 10 +- ...ionMaxLandingPadSizeRequestRepository.java | 5 +- ...MybatisSystemEliteIdRequestRepository.java | 5 +- .../persistence/MybatisSystemRepository.java | 2 +- .../adapter/persistence/RingRepository.java | 9 +- .../adapter/persistence/StarRepository.java | 5 +- ...ationArrivalDistanceRequestRepository.java | 16 +-- .../persistence/StationRepository.java | 8 +- .../adapter/persistence/SystemRepository.java | 5 +- .../persistence/entity/MybatisBodyEntity.java | 3 +- .../persistence/entity/MybatisRingEntity.java | 3 +- .../persistence/entity/MybatisStarEntity.java | 3 +- ...isStationArrivalDistanceRequestEntity.java | 3 +- .../entity/MybatisStationEntity.java | 12 +- ...StationMaxLandingPadSizeRequestEntity.java | 3 +- .../MybatisSystemCoordinateRequestEntity.java | 3 +- .../MybatisSystemEliteIdRequestEntity.java | 3 +- .../entity/MybatisSystemEntity.java | 3 +- .../mapper/MybatisBodyEntityMapper.java | 25 ++-- .../mapper/MybatisRingEntityMapper.java | 10 +- .../mapper/MybatisStarEntityMapper.java | 25 ++-- ...ionArrivalDistanceRequestEntityMapper.java | 11 +- .../mapper/MybatisStationEntityMapper.java | 14 +- ...nMaxLandingPadSizeRequestEntityMapper.java | 8 +- ...isSystemCoordinateRequestEntityMapper.java | 8 +- ...batisSystemEliteIdRequestEntityMapper.java | 8 +- .../mapper/MybatisSystemEntityMapper.java | 10 +- .../adapter/web/SystemController.java | 11 +- .../adapter/web/dto/RestCoordinateDto.java | 4 +- .../adapter/web/dto/RestSystemDto.java | 7 +- .../web/dto/mapper/RestSystemDtoMapper.java | 9 +- .../StationArrivalDistanceResponse.java | 18 +++ .../StationDataRequest.java | 10 ++ .../StationMaxLandingPadSizeResponse.java} | 19 +-- .../SystemCoordinatesResponse.java | 18 +++ .../SystemDataRequest.java | 9 ++ .../SystemEliteIdResponse.java | 16 +++ .../dto/persistence/entity/BodyEntity.java | 79 ------------ .../dto/persistence/entity/RingEntity.java | 21 --- .../dto/persistence/entity/StarEntity.java | 51 -------- .../StationArrivalDistanceRequestEntity.java | 12 -- .../dto/persistence/entity/StationEntity.java | 38 ------ ...StationMaxLandingPadSizeRequestEntity.java | 13 -- .../entity/SystemCoordinateRequestEntity.java | 11 -- .../entity/SystemEliteIdRequestEntity.java | 11 -- .../dto/persistence/entity/SystemEntity.java | 20 --- .../entity/mapper/BodyEntityMapper.java | 10 -- .../entity/mapper/RingEntityMapper.java | 10 -- .../entity/mapper/StarEntityMapper.java | 10 -- ...ionArrivalDistanceRequestEntityMapper.java | 10 -- .../StationArrivalDistanceResponseMapper.java | 8 -- .../entity/mapper/StationEntityMapper.java | 10 -- ...nMaxLandingPadSizeRequestEntityMapper.java | 10 -- ...tationMaxLandingPadSizeResponseMapper.java | 8 -- .../SystemCoordinateRequestEntityMapper.java | 10 -- .../SystemCoordinatesResponseMapper.java | 8 -- .../SystemEliteIdRequestEntityMapper.java | 10 -- .../mapper/SystemEliteIdResponseMapper.java | 8 -- .../entity/mapper/SystemEntityMapper.java | 10 -- .../application/dto/web/object/BodyDto.java | 76 ----------- .../dto/web/object/CoordinateDto.java | 9 -- .../dto/web/object/MessageDto.java | 7 - .../application/dto/web/object/RingDto.java | 19 --- .../application/dto/web/object/StarDto.java | 47 ------- .../application/dto/web/object/SystemDto.java | 11 -- .../dto/web/object/mapper/BodyDtoMapper.java | 8 -- .../web/object/mapper/MessageDtoMapper.java | 8 -- .../dto/web/object/mapper/RingDtoMapper.java | 8 -- .../dto/web/object/mapper/StarDtoMapper.java | 8 -- .../web/object/mapper/SystemDtoMapper.java | 8 -- .../FindSystemsByNameContainingUseCase.java | 4 +- .../outgoing/message/SendMessagePort.java | 4 +- ...stanceInterModuleCommunicationService.java | 2 +- ...nArrivalDistanceResponseSenderService.java | 22 ++-- ...adSizeInterModuleCommunicationService.java | 2 +- ...axLandingPadSizeResponseSenderService.java | 15 +-- .../service/SystemControllerService.java | 11 +- ...dinateInterModuleCommunicationService.java | 2 +- ...ystemCoordinatesResponseSenderService.java | 12 +- ...liteIdInterModuleCommunicationService.java | 2 +- .../SystemEliteIdResponseSenderService.java | 12 +- .../src/main/java/module-info.java | 4 +- .../dto/mapper/KafkaMessageMapperTest.java | 7 +- ...tationDataRequestMessageProcessorTest.java | 2 +- ...SystemDataRequestMessageProcessorTest.java | 2 +- .../kafka/sender/KafkaMessageSenderTest.java | 35 ++--- .../persistence/body/LoadBodyPortTest.java | 22 ++-- .../body/SaveOrUpdateBodyPortTest.java | 22 ++-- .../mapper/MybatisBodyEntityMapperTest.java | 59 ++++----- .../mapper/MybatisRingEntityMapperTest.java | 27 ++-- .../mapper/MybatisStarEntityMapperTest.java | 37 +++--- ...tationArrivalDistanceEntityMapperTest.java | 25 ++-- .../MybatisStationEntityMapperTest.java | 13 +- ...LandingPadSizeRequestEntityMapperTest.java | 10 +- ...stemCoordinateRequestEntityMapperTest.java | 8 +- ...sSystemEliteIdRequestEntityMapperTest.java | 8 +- .../mapper/MybatisSystemEntityMapperTest.java | 12 +- .../ring/SaveOrUpdateRingPortTest.java | 22 ++-- .../star/SaveOrUpdateStarPortTest.java | 22 ++-- .../station/LoadStationPortTest.java | 4 +- .../station/SaveOrUpdateStationPortTest.java | 22 ++-- .../system/LoadSystemPortTest.java | 4 +- .../LoadSystemsByNameContainingPortTest.java | 4 +- .../system/SaveOrUpdateSystemPortTest.java | 4 +- .../adapter/web/SystemControllerPortTest.java | 22 ++-- .../mapper/RestRestSystemDtoMapperTest.java | 13 +- .../StationArrivalDistanceResponseTest.java} | 15 +-- ...StationMaxLandingPadSizeResponseTest.java} | 16 +-- .../SystemCoordinatesResponseTest.java} | 16 +-- .../SystemEliteIdResponseTest.java} | 16 +-- ...ivalDistanceRequestMessageServiceTest.java | 2 +- ...ndingPadSizeRequestMessageServiceTest.java | 2 +- ...emCoordinateRequestMessageServiceTest.java | 2 +- ...ystemEliteIdRequestMessageServiceTest.java | 2 +- ...onMaxLandingPadSizeResponseSenderTest.java | 120 ++++++++---------- .../service/SystemControllerServiceTest.java | 23 +--- .../SystemCoordinatesResponseSenderTest.java | 116 ++++++++--------- .../SystemEliteIdResponseSenderTest.java | 72 +++++------ readme.md | 1 - .../config/MessageProcessorConfig.java | 10 +- ...rivalDistanceResponseMessageProcessor.java | 2 +- ...andingPadSizeResponseMessageProcessor.java | 2 +- ...tionPlanetaryResponseMessageProcessor.java | 2 +- ...equireOdysseyResponseMessageProcessor.java | 2 +- ...emCoordinatesResponseMessageProcessor.java | 2 +- ...SystemEliteIdResponseMessageProcessor.java | 2 +- ...ationArrivalDistanceRequestRepository.java | 2 +- ...tationLandingPadSizeRequestRepository.java | 2 +- .../StationPlanetaryRequestRepository.java | 2 +- ...tationRequireOdysseyRequestRepository.java | 2 +- .../SystemCoordinateRequestRepository.java | 2 +- .../SystemEliteIdRequestRepository.java | 2 +- ...MybatisStationDataRequestEntityMapper.java | 2 +- .../MybatisSystemDataRequestEntityMapper.java | 2 +- .../StationArrivalDistanceResponse.java | 10 ++ .../StationDataRequest.java | 10 ++ .../StationMaxLandingPadSizeResponse.java | 10 ++ .../StationPlanetaryResponse.java | 8 ++ .../StationRequireOdysseyResponse.java | 8 ++ .../SystemCoordinatesResponse.java | 9 ++ .../SystemDataRequest.java | 9 ++ .../SystemEliteIdResponse.java | 8 ++ ...AllStationArrivalDistanceRequestsPort.java | 2 +- ...dAllStationLandingPadSizeRequestsPort.java | 2 +- .../LoadAllStationPlanetaryRequestsPort.java | 2 +- ...dAllStationRequireOdysseyRequestsPort.java | 2 +- .../LoadAllSystemCoordinateRequestsPort.java | 2 +- .../LoadAllSystemEliteIdRequestsPort.java | 2 +- ...stanceInterModuleCommunicationService.java | 4 +- ...adSizeInterModuleCommunicationService.java | 4 +- ...netaryInterModuleCommunicationService.java | 4 +- ...dysseyInterModuleCommunicationService.java | 4 +- ...dinateInterModuleCommunicationService.java | 4 +- ...liteIdInterModuleCommunicationService.java | 4 +- trade-module/src/main/java/module-info.java | 1 + ...lDistanceResponseMessageProcessorTest.java | 2 +- ...MaxLandingPadSizeMessageProcessorTest.java | 24 ++-- ...oordinateResponseMessageProcessorTest.java | 2 +- .../SystemEliteIdMessageProcessorTest.java | 2 +- ...rTest.java => KafkaMessageSenderTest.java} | 3 +- ...tisStationDataRequestEntityMapperTest.java | 2 +- ...atisSystemDataRequestEntityMapperTest.java | 2 +- ...tationArrivalDistanceRequestsPortTest.java | 2 +- ...StationLandingPadSizeRequestsPortTest.java | 2 +- ...adAllStationPlanetaryRequestsPortTest.java | 2 +- ...StationRequireOdysseyRequestsPortTest.java | 2 +- ...adAllSystemCoordinateRequestsPortTest.java | 2 +- .../LoadAllSystemEliteIdRequestsPortTest.java | 2 +- ...ionArrivalDistanceRequestsUseCaseTest.java | 2 +- ...tionLandingPadSizeRequestsUseCaseTest.java | 2 +- ...teStationPlanetaryRequestsUseCaseTest.java | 2 +- ...tionRequireOdysseyRequestsUseCaseTest.java | 2 +- ...teSystemCoordinateRequestsUseCaseTest.java | 2 +- ...oleteSystemEliteIdRequestsUseCaseTest.java | 2 +- ...ionArrivalDistanceResponseUseCaseTest.java | 2 +- ...nMaxLandingPadSizeResponseUseCaseTest.java | 5 +- ...veStationPlanetaryResponseUseCaseTest.java | 5 +- ...tionRequireOdysseyResponseUseCaseTest.java | 2 +- ...eSystemCoordinatesResponseUseCaseTest.java | 2 +- ...ceiveSystemEliteIdResponseUseCaseTest.java | 5 +- ...singStationArrivalDistanceUseCaseTest.java | 2 +- ...ssingStationLandingPadSizeUseCaseTest.java | 2 +- ...estMissingStationPlanetaryUseCaseTest.java | 2 +- ...ssingStationRequireOdysseyUseCaseTest.java | 2 +- ...stMissingSystemCoordinatesUseCaseTest.java | 2 +- ...equestMissingSystemEliteIdUseCaseTest.java | 2 +- ...uestStationArrivalDistanceServiceTest.java | 2 +- ...questStationLandingPadSizeServiceTest.java | 2 +- .../RequestStationPlanetaryServiceTest.java | 2 +- ...questStationRequireOdysseyServiceTest.java | 2 +- .../RequestSystemCoordinatesServiceTest.java | 2 +- .../RequestSystemEliteIdServiceTest.java | 2 +- 211 files changed, 794 insertions(+), 1517 deletions(-) delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemCoordinatesResponseMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemEliteIdResponseMapper.java create mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java create mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationDataRequest.java rename exploration-module/src/main/java/io/edpn/backend/exploration/{adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapper.java => application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java} (59%) create mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemCoordinatesResponse.java create mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemDataRequest.java create mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemEliteIdResponse.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/BodyEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/RingEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StarEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationArrivalDistanceRequestEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationMaxLandingPadSizeRequestEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemCoordinateRequestEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEliteIdRequestEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEntity.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/BodyEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/RingEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StarEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceRequestEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceResponseMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeRequestEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeResponseMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinateRequestEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinatesResponseMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdRequestEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdResponseMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEntityMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/BodyDto.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/CoordinateDto.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/MessageDto.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/RingDto.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/StarDto.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/SystemDto.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/BodyDtoMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/MessageDtoMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/RingDtoMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/StarDtoMapper.java delete mode 100644 exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/SystemDtoMapper.java rename exploration-module/src/test/java/io/edpn/backend/exploration/{adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapperTest.java => application/domain/intermodulecommunication/StationArrivalDistanceResponseTest.java} (78%) rename exploration-module/src/test/java/io/edpn/backend/exploration/{adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapperTest.java => application/domain/intermodulecommunication/StationMaxLandingPadSizeResponseTest.java} (84%) rename exploration-module/src/test/java/io/edpn/backend/exploration/{adapter/kafka/dto/mapper/KafkaSystemCoordinatesResponseMapperTest.java => application/domain/intermodulecommunication/SystemCoordinatesResponseTest.java} (62%) rename exploration-module/src/test/java/io/edpn/backend/exploration/{adapter/kafka/dto/mapper/KafkaSystemEliteIdResponseMapperTest.java => application/domain/intermodulecommunication/SystemEliteIdResponseTest.java} (55%) create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationDataRequest.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationPlanetaryResponse.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationRequireOdysseyResponse.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemCoordinatesResponse.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemDataRequest.java create mode 100644 trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemEliteIdResponse.java rename trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/{MessageSenderTest.java => KafkaMessageSenderTest.java} (98%) diff --git a/boot/src/main/java/io/edpn/backend/application/controller/BootExplorationModuleController.java b/boot/src/main/java/io/edpn/backend/application/controller/BootExplorationModuleController.java index d52de16c..dfdbf7a0 100644 --- a/boot/src/main/java/io/edpn/backend/application/controller/BootExplorationModuleController.java +++ b/boot/src/main/java/io/edpn/backend/application/controller/BootExplorationModuleController.java @@ -1,7 +1,8 @@ package io.edpn.backend.application.controller; -import io.edpn.backend.exploration.adapter.web.SystemController; import io.edpn.backend.exploration.adapter.web.FindSystemsByNameContainingInputValidator; +import io.edpn.backend.exploration.adapter.web.SystemController; +import io.edpn.backend.exploration.adapter.web.dto.mapper.RestSystemDtoMapper; import io.edpn.backend.exploration.application.port.incomming.FindSystemsByNameContainingUseCase; import org.springframework.web.bind.annotation.RestController; @@ -9,7 +10,11 @@ @RestController public class BootExplorationModuleController extends SystemController { - public BootExplorationModuleController(FindSystemsByNameContainingUseCase findSystemsByNameContainingUseCase, FindSystemsByNameContainingInputValidator findSystemsByNameContainingInputValidator) { - super(findSystemsByNameContainingUseCase, findSystemsByNameContainingInputValidator); + public BootExplorationModuleController( + FindSystemsByNameContainingUseCase findSystemsByNameContainingUseCase, + FindSystemsByNameContainingInputValidator findSystemsByNameContainingInputValidator, + RestSystemDtoMapper restSystemDtoMapper + ) { + super(findSystemsByNameContainingUseCase, findSystemsByNameContainingInputValidator, restSystemDtoMapper); } } diff --git a/build.gradle b/build.gradle index 6b16d572..cfcdf5b3 100644 --- a/build.gradle +++ b/build.gradle @@ -103,9 +103,10 @@ subprojects { prometheusVersion = '1.11.1' backendUtilVersion = '0.2.0-SNAPSHOT' backendMybatisUtilVersion = '0.0.4-SNAPSHOT' - backendMessageProcessorLibVersion = '0.1.0-SNAPSHOT' + backendMessageProcessorLibVersion = '1.0.0-SNAPSHOT' junitJupiterVersion = "5.9.3" mockitoVersion = "5.4.0" + mockitoInlineVersion = "3.4.0" hamcrestVersion = "2.2" swaggerAnnotationsVersion = "2.1.13" } @@ -139,6 +140,7 @@ subprojects { testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}" testImplementation "org.mockito:mockito-junit-jupiter:${mockitoVersion}" + testImplementation "org.mockito:mockito-inline:${mockitoInlineVersion}" testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}" testCompileOnly "org.projectlombok:lombok:${lombokVersion}" testCompileOnly "org.mockito:mockito-core:${mockitoVersion}" diff --git a/exploration-module/build.gradle b/exploration-module/build.gradle index 3f8fa036..e9991c8b 100644 --- a/exploration-module/build.gradle +++ b/exploration-module/build.gradle @@ -23,6 +23,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-engine' testImplementation 'org.junit.jupiter:junit-jupiter-params' testImplementation 'org.mockito:mockito-junit-jupiter' + testImplementation 'org.mockito:mockito-inline' testImplementation 'org.hamcrest:hamcrest' testCompileOnly 'org.projectlombok:lombok' @@ -37,4 +38,5 @@ extraJavaModuleInfo { automaticModule("jsr305-3.0.2.jar","jsr305") automaticModule("snappy-java-1.1.8.4.jar","snappy.java") automaticModule("liquibase-core-4.17.2.jar","liquibase.core") + automaticModule("mockito-inline-3.4.0.jar","mockito") } \ No newline at end of file diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/KafkaMapperConfig.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/KafkaMapperConfig.java index 228b84b5..89a63c5f 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/KafkaMapperConfig.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/KafkaMapperConfig.java @@ -1,10 +1,6 @@ package io.edpn.backend.exploration.adapter.config; import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaMessageMapper; -import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaStationArrivalDistanceResponseMapper; -import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaStationMaxLandingPadSizeResponseMapper; -import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaSystemCoordinatesResponseMapper; -import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaSystemEliteIdResponseMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,26 +8,6 @@ public class KafkaMapperConfig { - @Bean(name = "explorationSystemCoordinatesResponseMapper") - public KafkaSystemCoordinatesResponseMapper systemCoordinatesResponseMapper() { - return new KafkaSystemCoordinatesResponseMapper(); - } - - @Bean(name = "explorationSystemEliteIdResponseMapper") - public KafkaSystemEliteIdResponseMapper systemEliteIdResponseMapper() { - return new KafkaSystemEliteIdResponseMapper(); - } - - @Bean(name = "explorationStationArrivalDistanceResponseMapper") - public KafkaStationArrivalDistanceResponseMapper stationArrivalDistanceResponseMapper(){ - return new KafkaStationArrivalDistanceResponseMapper(); - } - - @Bean(name = "explorationStationMaxLandingPadSizeResponseMapper") - public KafkaStationMaxLandingPadSizeResponseMapper stationMaxLandingPadSizeResponseMapper() { - return new KafkaStationMaxLandingPadSizeResponseMapper(); - } - @Bean(name = "explorationKafkaMessageMapper") public KafkaMessageMapper kafkaMessageMapper() { return new KafkaMessageMapper(); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/MessageProcessorConfig.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/MessageProcessorConfig.java index d4fdd6d7..2439b98d 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/MessageProcessorConfig.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/MessageProcessorConfig.java @@ -2,18 +2,18 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaMessageMapper; import io.edpn.backend.exploration.adapter.kafka.processor.JournalDockedV1MessageProcessor; import io.edpn.backend.exploration.adapter.kafka.processor.JournalScanV1MessageProcessor; import io.edpn.backend.exploration.adapter.kafka.processor.NavRouteV1MessageProcessor; import io.edpn.backend.exploration.adapter.kafka.processor.StationDataRequestMessageProcessor; import io.edpn.backend.exploration.adapter.kafka.processor.SystemDataRequestMessageProcessor; import io.edpn.backend.exploration.adapter.kafka.sender.KafkaMessageSender; -import io.edpn.backend.exploration.application.domain.StationArrivalDistanceRequest; import io.edpn.backend.exploration.application.port.incomming.ReceiveKafkaMessageUseCase; import io.edpn.backend.exploration.application.port.outgoing.topic.CreateTopicPort; import io.edpn.backend.messageprocessorlib.application.dto.eddn.NavRouteMessage; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.messageprocessorlib.application.dto.eddn.journal.DockedMessage; import io.edpn.backend.messageprocessorlib.application.dto.eddn.journal.ScanMessage; import org.springframework.beans.factory.annotation.Qualifier; @@ -32,7 +32,7 @@ public NavRouteV1MessageProcessor navRouteV1MessageProcessor( ) { return new NavRouteV1MessageProcessor(receiveNavRouteMessageUseCase, objectMapper); } - + @Bean(name = "explorationJournalScanV1MessageProcessor") public JournalScanV1MessageProcessor journalScanV1MessageProcessor( ReceiveKafkaMessageUseCase receiveJournalScanMessageUseCase, @@ -64,7 +64,7 @@ public SystemDataRequestMessageProcessor systemEliteIdRequestMessageProcessor( ) { return new SystemDataRequestMessageProcessor(receiveSystemDataRequestUseCase, objectMapper); } - + @Bean(name = "explorationStationArrivalDistanceRequestMessageProcessor") public StationDataRequestMessageProcessor stationArrivalDistanceRequestMessageProcessor( @Qualifier("explorationStationArrivalDistanceInterModuleCommunicationService") ReceiveKafkaMessageUseCase receiveStationDataRequestUseCase, @@ -72,7 +72,7 @@ public StationDataRequestMessageProcessor stationArrivalDistanceRequestMessagePr ) { return new StationDataRequestMessageProcessor(receiveStationDataRequestUseCase, objectMapper); } - + @Bean(name = "explorationStationMaxLandingPadSizeRequestMessageProcessor") public StationDataRequestMessageProcessor stationMaxLandingPadSizerRequestMessageProcessor( @Qualifier("explorationStationMaxLandingPadSizeInterModuleCommunicationService") ReceiveKafkaMessageUseCase receiveStationDataRequestUseCase, @@ -84,9 +84,10 @@ public StationDataRequestMessageProcessor stationMaxLandingPadSizerRequestMessag @Bean(name = "explorationKafkaMessageSender") public KafkaMessageSender kafkaMessageSender( CreateTopicPort createTopicPort, + KafkaMessageMapper messageMapper, @Qualifier("explorationObjectMapper") ObjectMapper objectMapper, @Qualifier("explorationJsonNodekafkaTemplate") KafkaTemplate jsonNodekafkaTemplate ) { - return new KafkaMessageSender(createTopicPort, objectMapper, jsonNodekafkaTemplate); + return new KafkaMessageSender(createTopicPort, messageMapper, objectMapper, jsonNodekafkaTemplate); } } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/RepositoryConfig.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/RepositoryConfig.java index b1250552..96872f58 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/RepositoryConfig.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/RepositoryConfig.java @@ -18,18 +18,15 @@ import io.edpn.backend.exploration.adapter.persistence.SystemCoordinateRequestRepository; import io.edpn.backend.exploration.adapter.persistence.SystemEliteIdRequestRepository; import io.edpn.backend.exploration.adapter.persistence.SystemRepository; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStarEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisBodyEntityMapper; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisRingEntityMapper; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStarEntityMapper; import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStationArrivalDistanceRequestEntityMapper; import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStationEntityMapper; import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStationMaxLandingPadSizeRequestEntityMapper; import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemCoordinateRequestEntityMapper; import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemEliteIdRequestEntityMapper; import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.BodyEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StarEntityMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -67,7 +64,7 @@ public SystemEliteIdRequestRepository systemEliteIdRequestRepository( ) { return new SystemEliteIdRequestRepository(mybatisSystemEliteIdRequestRepository, mybatisSystemEliteIdRequestEntityMapper); } - + @Bean(name = "explorationStationArrivalDistanceRequestRepository") public StationArrivalDistanceRequestRepository stationArrivalDistanceRequestRepository( MybatisStationArrivalDistanceRequestRepository mybatisStationArrivalDistanceRequestRepository, @@ -83,27 +80,27 @@ public StationMaxLandingPadSizeRequestRepository stationMaxLandingPadSizeRequest ) { return new StationMaxLandingPadSizeRequestRepository(mybatisStationMaxLandingPadSizeRequestRepository, mybatisStationMaxLandingPadSizeRequestEntityMapper); } - + @Bean(name = "explorationBodyRepository") public BodyRepository bodyRepository( MybatisBodyRepository mybatisBodyRepository, - BodyEntityMapper bodyEntityMapper + MybatisBodyEntityMapper bodyEntityMapper ) { return new BodyRepository(mybatisBodyRepository, bodyEntityMapper); } - + @Bean(name = "explorationStarRepository") public StarRepository starRepository( MybatisStarRepository mybatisStarRepository, - StarEntityMapper starEntityMapper + MybatisStarEntityMapper starEntityMapper ) { return new StarRepository(mybatisStarRepository, starEntityMapper); } - + @Bean(name = "explorationRingRepository") public RingRepository ringRepository( MybatisRingRepository mybatisRingRepository, - RingEntityMapper ringEntityMapper + MybatisRingEntityMapper ringEntityMapper ) { return new RingRepository(mybatisRingRepository, ringEntityMapper); } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/ServiceConfig.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/ServiceConfig.java index 4ffbff61..e8438636 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/ServiceConfig.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/ServiceConfig.java @@ -2,12 +2,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.exploration.adapter.persistence.SystemRepository; -import io.edpn.backend.exploration.adapter.web.dto.mapper.RestSystemDtoMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationArrivalDistanceResponseMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationMaxLandingPadSizeResponseMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemCoordinatesResponseMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEliteIdResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; import io.edpn.backend.exploration.application.port.outgoing.body.SaveOrUpdateBodyPort; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.ring.SaveOrUpdateRingPort; @@ -147,7 +141,7 @@ public SystemEliteIdInterModuleCommunicationService systemEliteIdInterModuleComm executorService ); } - + @Bean(name = "explorationStationArrivalDistanceInterModuleCommunicationService") public StationArrivalDistanceInterModuleCommunicationService stationArrivalDistanceInterModuleCommunicationService( LoadAllStationArrivalDistanceRequestPort loadAllStationArrivalDistanceRequestPort, @@ -198,12 +192,10 @@ public LoadByNameContainingValidator loadByNameContainingValidator( @Bean(name = "explorationSystemControllerService") public SystemControllerService systemControllerService( SystemRepository systemRepository, - LoadByNameContainingValidator loadByNameContainingValidator, - RestSystemDtoMapper restSystemDtoMapper) { + LoadByNameContainingValidator loadByNameContainingValidator) { return new SystemControllerService( systemRepository, - loadByNameContainingValidator, - restSystemDtoMapper); + loadByNameContainingValidator); } @Bean("explorationSystemCoordinatesResponseSender") @@ -212,8 +204,6 @@ public SystemCoordinatesResponseSender systemCoordinatesResponseSender( LoadSystemCoordinateRequestByIdentifierPort loadSystemCoordinateRequestBySystemNamePort, DeleteSystemCoordinateRequestPort deleteSystemCoordinateRequestPort, SendMessagePort sendMessagePort, - SystemCoordinatesResponseMapper systemCoordinatesResponseMapper, - MessageDtoMapper messageMapper, ObjectMapper objectMapper, @Qualifier("explorationRetryTemplate") RetryTemplate retryTemplate, @Qualifier("virtualThreadPerTaskExecutor") ExecutorService executorService @@ -223,8 +213,6 @@ public SystemCoordinatesResponseSender systemCoordinatesResponseSender( loadSystemCoordinateRequestBySystemNamePort, deleteSystemCoordinateRequestPort, sendMessagePort, - systemCoordinatesResponseMapper, - messageMapper, objectMapper, retryTemplate, executorService @@ -237,8 +225,6 @@ public SystemEliteIdResponseSender systemEliteIdResponseSender( LoadSystemEliteIdRequestByIdentifierPort loadSystemEliteIdRequestBySystemNamePort, DeleteSystemEliteIdRequestPort deleteSystemEliteIdRequestPort, SendMessagePort sendMessagePort, - SystemEliteIdResponseMapper systemEliteIdResponseMapper, - MessageDtoMapper messageMapper, ObjectMapper objectMapper, @Qualifier("explorationRetryTemplate") RetryTemplate retryTemplate, @Qualifier("virtualThreadPerTaskExecutor") ExecutorService executorService @@ -248,22 +234,18 @@ public SystemEliteIdResponseSender systemEliteIdResponseSender( loadSystemEliteIdRequestBySystemNamePort, deleteSystemEliteIdRequestPort, sendMessagePort, - systemEliteIdResponseMapper, - messageMapper, objectMapper, retryTemplate, executorService ); } - + @Bean("explorationStationArrivalDistanceResponseSender") public StationArrivalDistanceResponseSender stationArrivalDistanceResponseSender( LoadStationPort loadStationPort, LoadStationArrivalDistanceRequestByIdentifierPort loadStationArrivalDistanceRequestByIdentifierPort, DeleteStationArrivalDistanceRequestPort deleteStationArrivalDistanceRequestPort, SendMessagePort sendMessagePort, - StationArrivalDistanceResponseMapper stationArrivalDistanceResponseMapper, - MessageDtoMapper messageMapper, ObjectMapper objectMapper, @Qualifier("explorationRetryTemplate") RetryTemplate retryTemplate, @Qualifier("virtualThreadPerTaskExecutor") ExecutorService executorService @@ -273,8 +255,6 @@ public StationArrivalDistanceResponseSender stationArrivalDistanceResponseSender loadStationArrivalDistanceRequestByIdentifierPort, deleteStationArrivalDistanceRequestPort, sendMessagePort, - stationArrivalDistanceResponseMapper, - messageMapper, objectMapper, retryTemplate, executorService @@ -287,8 +267,6 @@ public StationMaxLandingPadSizeResponseSender stationMaxLandingPadSizeResponseSe LoadStationMaxLandingPadSizeRequestByIdentifierPort loadStationMaxLandingPadSizeRequestByIdentifierPort, DeleteStationMaxLandingPadSizeRequestPort deleteStationMaxLandingPadSizeRequestPort, SendMessagePort sendMessagePort, - StationMaxLandingPadSizeResponseMapper stationMaxLandingPadSizeResponseMapper, - MessageDtoMapper messageMapper, ObjectMapper objectMapper, @Qualifier("explorationRetryTemplate") RetryTemplate retryTemplate, @Qualifier("virtualThreadPerTaskExecutor") ExecutorService executorService @@ -298,8 +276,6 @@ public StationMaxLandingPadSizeResponseSender stationMaxLandingPadSizeResponseSe loadStationMaxLandingPadSizeRequestByIdentifierPort, deleteStationMaxLandingPadSizeRequestPort, sendMessagePort, - stationMaxLandingPadSizeResponseMapper, - messageMapper, objectMapper, retryTemplate, executorService diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/KafkaMessageDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/KafkaMessageDto.java index 2c8df85e..4bd080eb 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/KafkaMessageDto.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/KafkaMessageDto.java @@ -1,7 +1,7 @@ package io.edpn.backend.exploration.adapter.kafka.dto; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; - -public record KafkaMessageDto(String topic, - String message) implements MessageDto { +public record KafkaMessageDto( + String topic, + String message +) { } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapper.java index efd8137f..25e559aa 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapper.java @@ -2,10 +2,8 @@ import io.edpn.backend.exploration.adapter.kafka.dto.KafkaMessageDto; import io.edpn.backend.exploration.application.domain.Message; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; -public class KafkaMessageMapper implements MessageDtoMapper { - @Override +public class KafkaMessageMapper { public KafkaMessageDto map(Message message) { return new KafkaMessageDto(message.topic(), message.message()); } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapper.java deleted file mode 100644 index 8c16e588..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.edpn.backend.exploration.adapter.kafka.dto.mapper; - -import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationArrivalDistanceResponseMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor -public class KafkaStationArrivalDistanceResponseMapper implements StationArrivalDistanceResponseMapper { - @Override - public StationArrivalDistanceResponse map(Station station) { - return new StationArrivalDistanceResponse( - station.name(), - station.system().name(), - station.distanceFromStar()); - } -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemCoordinatesResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemCoordinatesResponseMapper.java deleted file mode 100644 index c28494ad..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemCoordinatesResponseMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.edpn.backend.exploration.adapter.kafka.dto.mapper; - -import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemCoordinatesResponseMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor -public class KafkaSystemCoordinatesResponseMapper implements SystemCoordinatesResponseMapper { - - @Override - public SystemCoordinatesResponse map(System system) { - - return new SystemCoordinatesResponse( - system.name(), - system.coordinate().x(), - system.coordinate().y(), - system.coordinate().z()); - } -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemEliteIdResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemEliteIdResponseMapper.java deleted file mode 100644 index e9af84fe..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaSystemEliteIdResponseMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.edpn.backend.exploration.adapter.kafka.dto.mapper; - -import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEliteIdResponseMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor -public class KafkaSystemEliteIdResponseMapper implements SystemEliteIdResponseMapper { - - @Override - public SystemEliteIdResponse map(System system) { - - return new SystemEliteIdResponse( - system.name(), - system.eliteId()); - } -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessor.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessor.java index 76e1a80c..50d768a6 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessor.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessor.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import io.edpn.backend.exploration.application.port.incomming.ReceiveKafkaMessageUseCase; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessor.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessor.java index 819e99f5..ad988b81 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessor.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessor.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import io.edpn.backend.exploration.application.port.incomming.ReceiveKafkaMessageUseCase; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSender.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSender.java index 28f8becf..356af83f 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSender.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSender.java @@ -3,9 +3,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.port.outgoing.topic.CreateTopicPort; +import io.edpn.backend.exploration.adapter.kafka.dto.KafkaMessageDto; +import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaMessageMapper; +import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; +import io.edpn.backend.exploration.application.port.outgoing.topic.CreateTopicPort; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.core.KafkaTemplate; @@ -17,17 +19,19 @@ public class KafkaMessageSender implements SendMessagePort { private final CreateTopicPort createTopicPort; + private final KafkaMessageMapper messageMapper; private final ObjectMapper objectMapper; private final KafkaTemplate jsonNodekafkaTemplate; @Override - public Boolean send(MessageDto messageDto) { - return createTopicPort.createTopicIfNotExists(messageDto.topic()) + public Boolean send(Message message) { + KafkaMessageDto kafkaMessageDto = messageMapper.map(message); + return createTopicPort.createTopicIfNotExists(kafkaMessageDto.topic()) .thenCompose(v -> { try { - JsonNode jsonNodeMessage = objectMapper.readTree(messageDto.message()); - jsonNodekafkaTemplate.send(messageDto.topic(), jsonNodeMessage); + JsonNode jsonNodeMessage = objectMapper.readTree(kafkaMessageDto.message()); + jsonNodekafkaTemplate.send(kafkaMessageDto.topic(), jsonNodeMessage); return CompletableFuture.completedFuture(true); } catch (JsonProcessingException e) { log.error("Unable to send message to Kafka", e); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/BodyRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/BodyRepository.java index ece20fb5..e2363ad2 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/BodyRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/BodyRepository.java @@ -1,9 +1,8 @@ package io.edpn.backend.exploration.adapter.persistence; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisBodyEntityMapper; import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.BodyEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.body.LoadBodyPort; import io.edpn.backend.exploration.application.port.outgoing.body.SaveOrUpdateBodyPort; import lombok.RequiredArgsConstructor; @@ -16,7 +15,7 @@ public class BodyRepository implements SaveOrUpdateBodyPort, LoadBodyPort { private final MybatisBodyRepository mybatisBodyRepository; - private final BodyEntityMapper bodyEntityMapper; + private final MybatisBodyEntityMapper bodyEntityMapper; @Override public Optional load(String name) { diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisBodyRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisBodyRepository.java index a704beec..0bfdf71f 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisBodyRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisBodyRepository.java @@ -1,7 +1,6 @@ package io.edpn.backend.exploration.adapter.persistence; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.mybatisutil.IntegerStringMapTypeHandler; import io.edpn.backend.mybatisutil.StringDoubleMapTypeHandler; @@ -20,7 +19,7 @@ import java.util.UUID; public interface MybatisBodyRepository { - + @Select({"INSERT INTO body (id, arrival_distance, ascending_node, atmosphere, atmospheric_composition, axial_tilt, body_composition," + "discovered, mapped, name, local_id, eccentricity, landable, mass, materials, mean_anomaly, orbital_inclination, orbital_period, " + "parents, periapsis, planet_class, radius, rotation_period, semi_major_axis, surface_gravity, surface_pressure, surface_temperature, system_id," + @@ -67,8 +66,8 @@ public interface MybatisBodyRepository { }) @ResultMap("bodyResultMap") MybatisBodyEntity insertOrUpdateOnConflict(MybatisBodyEntity body); - - + + @Select({"SELECT * " + "FROM body" + "WHERE name = #{name}"} @@ -114,10 +113,10 @@ public interface MybatisBodyRepository { @Result(property = "estimatedScanValue", column = "estimated_scan_value", javaType = Double.class) }) Optional findByName(@Param("name") String name); - + @Select({"SELECT * FROM body WHERE id = #{id}"}) @ResultMap("bodyResultMap") Optional findById(UUID id); - - + + } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisRingRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisRingRepository.java index cfee3020..08e0944a 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisRingRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisRingRepository.java @@ -11,7 +11,7 @@ import java.util.UUID; public interface MybatisRingRepository { - + @Select({"INSERT INTO ring (id, inner_radius, mass, name, outer_radius, ring_class, body_id, star_id) " + "VALUES (#{id}, #{innerRadius}, #{mass}, #{name}, #{outerRadius}, #{ringClass}, #{bodyId}, #{starId}) " + "ON CONFLICT (name, body_id, star_id) " + @@ -25,7 +25,7 @@ public interface MybatisRingRepository { "RETURNING *"}) @ResultMap("ringResultMap") MybatisRingEntity insertOrUpdateOnConflict(MybatisRingEntity ring); - + @Select("SELECT * FROM ring WHERE body_id = #{id}") @Results(id = "ringResultMap", value = { @Result(property = "id", column = "id", javaType = UUID.class), @@ -38,7 +38,7 @@ public interface MybatisRingRepository { @Result(property = "starId", column = "star_id", javaType = UUID.class, typeHandler = UuidTypeHandler.class) }) List findRingsByBodyId(UUID id); - + @Select("SELECT * FROM ring WHERE star_id = #{id}") @ResultMap("ringResultMap") List findRingsByStarId(UUID id); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStarRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStarRepository.java index 6c69fa54..df6583be 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStarRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStarRepository.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStarEntity; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import org.apache.ibatis.annotations.Many; @@ -16,7 +15,7 @@ import java.util.UUID; public interface MybatisStarRepository { - + @Select({"INSERT INTO star (id, absolute_magnitude, age, arrival_distance, axial_tilt, discovered, local_id, luminosity, mapped, " + "name, radius, rotational_period, star_type, stellar_mass, subclass, surface_temperature, system_id, system_address, " + "horizons, odyssey) " + @@ -47,7 +46,7 @@ public interface MybatisStarRepository { }) @ResultMap("starResultMap") MybatisStarEntity insertOrUpdateOnConflict(MybatisStarEntity star); - + @Select({"SELECT id, absolute_magnitude, age, arrival_distance, axial_tilt, discovered, local_id, luminosity, mapped, " + "name, radius, rings, rotational_period, star_type, stellar_mass, subclass, surface_temperature, system, system_address, " + "horizons, odyssey, estimated_scan_value ", @@ -80,7 +79,7 @@ public interface MybatisStarRepository { @Result(property = "estimatedScanValue", column = "estimated_scan_value", javaType = Double.class), }) Optional findByName(@Param("name") String name); - + @Select({"SELECT * FROM star WHERE id = #{id}"}) @ResultMap("starResultMap") Optional findById(UUID id); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationArrivalDistanceRequestRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationArrivalDistanceRequestRepository.java index 7e9e250b..f7947545 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationArrivalDistanceRequestRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationArrivalDistanceRequestRepository.java @@ -14,7 +14,7 @@ import java.util.Optional; public interface MybatisStationArrivalDistanceRequestRepository { - + @Insert({ "INSERT INTO station_arrivaldistance_data_request (requesting_module, system_name, station_name)", "VALUES (#{requestingModule}, #{systemName}, #{stationName})", @@ -22,14 +22,14 @@ public interface MybatisStationArrivalDistanceRequestRepository { "DO NOTHING" }) void insertIfNotExists(MybatisStationArrivalDistanceRequestEntity stationArrivalDistanceRequestEntity); - + @Delete("DELETE FROM station_arrivaldistance_data_request WHERE requesting_module = #{requestingModule} AND system_name = #{systemName} AND station_name = #{stationName}") void delete(MybatisStationArrivalDistanceRequestEntity stationArrivalDistanceRequestEntity); - + @Select("SELECT * FROM station_arrivaldistance_data_request") @ResultMap("stationArrivalDistanceRequestResultMap") List findAll(); - + @Select("SELECT * FROM station_arrivaldistance_data_request WHERE system_name = #{systemName} AND station_name = #{stationName}") @Results(id = "stationArrivalDistanceRequestResultMap", value = { @Result(property = "systemName", column = "system_name"), @@ -37,7 +37,7 @@ public interface MybatisStationArrivalDistanceRequestRepository { @Result(property = "requestingModule", column = "requesting_module") }) List findByIdentifier(@Param("systemName") String systemName, @Param("stationName") String stationName); - + @Select("SELECT * FROM station_arrivaldistance_data_request WHERE requesting_module = #{requestingModule} AND system_name = #{systemName} AND station_name = #{stationName}") @ResultMap("stationArrivalDistanceRequestResultMap") Optional find(@Param("requestingModule") Module requestingModule, @Param("systemName") String systemName, @Param("stationName") String stationName); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationMaxLandingPadSizeRequestRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationMaxLandingPadSizeRequestRepository.java index ccb7e6cf..5a44860b 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationMaxLandingPadSizeRequestRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisStationMaxLandingPadSizeRequestRepository.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationMaxLandingPadSizeRequestEntity; import io.edpn.backend.util.Module; -import java.util.List; -import java.util.Optional; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; @@ -12,6 +10,9 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; +import java.util.List; +import java.util.Optional; + public interface MybatisStationMaxLandingPadSizeRequestRepository { @Insert({ diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemEliteIdRequestRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemEliteIdRequestRepository.java index 93923f24..5e21fb67 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemEliteIdRequestRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemEliteIdRequestRepository.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEliteIdRequestEntity; import io.edpn.backend.util.Module; -import java.util.List; -import java.util.Optional; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; @@ -12,6 +10,9 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; +import java.util.List; +import java.util.Optional; + public interface MybatisSystemEliteIdRequestRepository { @Insert({ diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemRepository.java index e86b540c..ac85e6f4 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/MybatisSystemRepository.java @@ -42,7 +42,7 @@ public interface MybatisSystemRepository { @Result(property = "zCoordinate", column = "z_coordinate", javaType = Double.class) }) Optional findByName(@Param("name") String name); - + @Select({"SELECT id, name, star_class, elite_id, ST_X(coordinates_geom) as x_coordinate, ST_Y(coordinates_geom) as y_coordinate, ST_Z(coordinates_geom) as z_coordinate", "FROM system", "WHERE id = #{id}"} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/RingRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/RingRepository.java index 6ecff3f5..16725a54 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/RingRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/RingRepository.java @@ -1,8 +1,7 @@ package io.edpn.backend.exploration.adapter.persistence; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisRingEntityMapper; import io.edpn.backend.exploration.application.domain.Ring; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.ring.SaveOrUpdateRingPort; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -10,10 +9,10 @@ @RequiredArgsConstructor @Slf4j public class RingRepository implements SaveOrUpdateRingPort { - + private final MybatisRingRepository ringRepository; - private final RingEntityMapper ringEntityMapper; - + private final MybatisRingEntityMapper ringEntityMapper; + @Override public Ring saveOrUpdate(Ring ring) { return ringEntityMapper.map(ringRepository.insertOrUpdateOnConflict(ringEntityMapper.map(ring))); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StarRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StarRepository.java index dafd3528..6c24edc4 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StarRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StarRepository.java @@ -1,9 +1,8 @@ package io.edpn.backend.exploration.adapter.persistence; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStarEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStarEntityMapper; import io.edpn.backend.exploration.application.domain.Star; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StarEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.star.SaveOrUpdateStarPort; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -13,7 +12,7 @@ public class StarRepository implements SaveOrUpdateStarPort { private final MybatisStarRepository mybatisStarRepository; - private final StarEntityMapper starEntityMapper; + private final MybatisStarEntityMapper starEntityMapper; @Override public Star saveOrUpdate(Star star) { diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationArrivalDistanceRequestRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationArrivalDistanceRequestRepository.java index 5db7582c..152fb397 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationArrivalDistanceRequestRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationArrivalDistanceRequestRepository.java @@ -23,36 +23,36 @@ public class StationArrivalDistanceRequestRepository implements LoadStationArrivalDistanceRequestByIdentifierPort, LoadAllStationArrivalDistanceRequestPort, DeleteStationArrivalDistanceRequestPort { - + private final MybatisStationArrivalDistanceRequestRepository mybatisStationArrivalDistanceRequestRepository; private final MybatisStationArrivalDistanceRequestEntityMapper mybatisStationArrivalDistanceRequestEntityMapper; - - + + @Override public void createIfNotExists(StationArrivalDistanceRequest stationArrivalDistanceRequest) { mybatisStationArrivalDistanceRequestRepository.insertIfNotExists(mybatisStationArrivalDistanceRequestEntityMapper.map(stationArrivalDistanceRequest)); - + } - + @Override public void delete(String systemName, String stationName, Module requestingModule) { mybatisStationArrivalDistanceRequestRepository.delete(new MybatisStationArrivalDistanceRequestEntity(systemName, stationName, requestingModule)); } - + @Override public List loadAll() { return mybatisStationArrivalDistanceRequestRepository.findAll().stream() .map(mybatisStationArrivalDistanceRequestEntityMapper::map) .toList(); } - + @Override public List loadByIdentifier(String systemName, String stationName) { return mybatisStationArrivalDistanceRequestRepository.findByIdentifier(systemName, stationName).stream() .map(mybatisStationArrivalDistanceRequestEntityMapper::map) .toList(); } - + @Override public Optional load(StationArrivalDistanceRequest stationArrivalDistanceRequest) { return mybatisStationArrivalDistanceRequestRepository.find(stationArrivalDistanceRequest.requestingModule(), stationArrivalDistanceRequest.systemName(), stationArrivalDistanceRequest.stationName()) diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationRepository.java index 7ded43b8..b2827767 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/StationRepository.java @@ -1,21 +1,21 @@ package io.edpn.backend.exploration.adapter.persistence; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStationEntityMapper; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.station.LoadStationPort; import io.edpn.backend.exploration.application.port.outgoing.station.SaveOrUpdateStationPort; -import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import java.util.Optional; + @RequiredArgsConstructor @Slf4j public class StationRepository implements SaveOrUpdateStationPort, LoadStationPort { private final MybatisStationRepository mybatisStationRepository; - private final StationEntityMapper stationEntityMapper; + private final MybatisStationEntityMapper stationEntityMapper; @Override public Station saveOrUpdate(Station station) { diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/SystemRepository.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/SystemRepository.java index f5d3ce5e..79d1f97f 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/SystemRepository.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/SystemRepository.java @@ -1,9 +1,8 @@ package io.edpn.backend.exploration.adapter.persistence; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemEntityMapper; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemPort; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemsByNameContainingPort; import io.edpn.backend.exploration.application.port.outgoing.system.SaveOrUpdateSystemPort; @@ -18,7 +17,7 @@ public class SystemRepository implements SaveOrUpdateSystemPort, LoadSystemPort, LoadSystemsByNameContainingPort { private final MybatisSystemRepository mybatisSystemRepository; - private final SystemEntityMapper systemEntityMapper; + private final MybatisSystemEntityMapper systemEntityMapper; @Override public Optional load(String name) { diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisBodyEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisBodyEntity.java index efe8d3ff..5922de93 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisBodyEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisBodyEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.BodyEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -20,7 +19,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisBodyEntity implements BodyEntity { +public class MybatisBodyEntity { private UUID id; private Double arrivalDistance; private Double ascendingNode; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisRingEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisRingEntity.java index 727a5e2f..f5e73461 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisRingEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisRingEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.RingEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -18,7 +17,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisRingEntity implements RingEntity { +public class MybatisRingEntity { private UUID id; private Long innerRadius; private Long mass; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStarEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStarEntity.java index 2dd87cfb..6767509e 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStarEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStarEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.StarEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -19,7 +18,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisStarEntity implements StarEntity { +public class MybatisStarEntity { private UUID id; private Double absoluteMagnitude; private Long age; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationArrivalDistanceRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationArrivalDistanceRequestEntity.java index 4bc1317e..1fbc81df 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationArrivalDistanceRequestEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationArrivalDistanceRequestEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationArrivalDistanceRequestEntity; import io.edpn.backend.util.Module; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +16,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisStationArrivalDistanceRequestEntity implements StationArrivalDistanceRequestEntity { +public class MybatisStationArrivalDistanceRequestEntity { private String systemName; private String stationName; private Module requestingModule; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationEntity.java index c6ba344b..e82436c4 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationEntity.java @@ -1,10 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationEntity; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.UUID; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -13,6 +8,11 @@ import lombok.Setter; import lombok.ToString; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; +import java.util.UUID; + @Setter @Getter @ToString @@ -20,7 +20,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisStationEntity implements StationEntity { +public class MybatisStationEntity { private UUID id; private Long marketId; private String name; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationMaxLandingPadSizeRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationMaxLandingPadSizeRequestEntity.java index 62bf1b27..144517ac 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationMaxLandingPadSizeRequestEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisStationMaxLandingPadSizeRequestEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationMaxLandingPadSizeRequestEntity; import io.edpn.backend.util.Module; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +16,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisStationMaxLandingPadSizeRequestEntity implements StationMaxLandingPadSizeRequestEntity { +public class MybatisStationMaxLandingPadSizeRequestEntity { private String systemName; private String stationName; private Module requestingModule; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemCoordinateRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemCoordinateRequestEntity.java index 72043a23..e31f5d7b 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemCoordinateRequestEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemCoordinateRequestEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemCoordinateRequestEntity; import io.edpn.backend.util.Module; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +16,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisSystemCoordinateRequestEntity implements SystemCoordinateRequestEntity { +public class MybatisSystemCoordinateRequestEntity { private String systemName; private Module requestingModule; } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEliteIdRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEliteIdRequestEntity.java index 151d39e9..5cf3ea20 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEliteIdRequestEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEliteIdRequestEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEliteIdRequestEntity; import io.edpn.backend.util.Module; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +16,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisSystemEliteIdRequestEntity implements SystemEliteIdRequestEntity { +public class MybatisSystemEliteIdRequestEntity { private String systemName; private Module requestingModule; } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEntity.java index 6b456bc0..432a117b 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEntity.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/MybatisSystemEntity.java @@ -1,6 +1,5 @@ package io.edpn.backend.exploration.adapter.persistence.entity; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -18,7 +17,7 @@ @AllArgsConstructor @Builder @EqualsAndHashCode -public class MybatisSystemEntity implements SystemEntity { +public class MybatisSystemEntity { private UUID id; private String name; private Long eliteId; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapper.java index 622ba5c8..90870e21 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapper.java @@ -1,25 +1,19 @@ package io.edpn.backend.exploration.adapter.persistence.entity.mapper; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.persistence.entity.BodyEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.BodyEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; +import lombok.RequiredArgsConstructor; + import java.util.ArrayList; import java.util.Optional; -import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class MybatisBodyEntityMapper implements BodyEntityMapper { - - private final RingEntityMapper ringEntityMapper; - private final SystemEntityMapper systemEntityMapper; - - @Override - public Body map(BodyEntity bodyEntity) { +public class MybatisBodyEntityMapper { + + private final MybatisRingEntityMapper ringEntityMapper; + private final MybatisSystemEntityMapper systemEntityMapper; + + public Body map(MybatisBodyEntity bodyEntity) { return new Body( bodyEntity.getId(), bodyEntity.getArrivalDistance(), @@ -65,8 +59,7 @@ public Body map(BodyEntity bodyEntity) { bodyEntity.getEstimatedScanValue() ); } - - @Override + public MybatisBodyEntity map(Body body) { return MybatisBodyEntity.builder() .id(body.id()) diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapper.java index ebdf84de..572e787f 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapper.java @@ -2,15 +2,12 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; import io.edpn.backend.exploration.application.domain.Ring; -import io.edpn.backend.exploration.application.dto.persistence.entity.RingEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class MybatisRingEntityMapper implements RingEntityMapper { +public class MybatisRingEntityMapper { - @Override - public Ring map(RingEntity ringEntity) { + public Ring map(MybatisRingEntity ringEntity) { return new Ring( ringEntity.getId(), ringEntity.getInnerRadius(), @@ -21,8 +18,7 @@ public Ring map(RingEntity ringEntity) { ringEntity.getBodyId(), ringEntity.getStarId()); } - - @Override + public MybatisRingEntity map(Ring ring) { return MybatisRingEntity.builder() .id(ring.id()) diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapper.java index 72a676b1..b3cea58d 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapper.java @@ -1,25 +1,19 @@ package io.edpn.backend.exploration.adapter.persistence.entity.mapper; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStarEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.Star; -import io.edpn.backend.exploration.application.dto.persistence.entity.StarEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StarEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; +import lombok.RequiredArgsConstructor; + import java.util.ArrayList; import java.util.Optional; -import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class MybatisStarEntityMapper implements StarEntityMapper { - - private final RingEntityMapper ringEntityMapper; - private final SystemEntityMapper systemEntityMapper; - - @Override - public Star map(StarEntity starEntity) { +public class MybatisStarEntityMapper { + + private final MybatisRingEntityMapper ringEntityMapper; + private final MybatisSystemEntityMapper systemEntityMapper; + + public Star map(MybatisStarEntity starEntity) { return Star.builder() .id(starEntity.getId()) .absoluteMagnitude(starEntity.getAbsoluteMagnitude()) @@ -49,8 +43,7 @@ public Star map(StarEntity starEntity) { .estimatedScanValue(starEntity.getEstimatedScanValue()) .build(); } - - @Override + public MybatisStarEntity map(Star star) { return MybatisStarEntity.builder() .id(star.id()) diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceRequestEntityMapper.java index 273447be..fe2a9bf3 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceRequestEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceRequestEntityMapper.java @@ -2,20 +2,17 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationArrivalDistanceRequestEntity; import io.edpn.backend.exploration.application.domain.StationArrivalDistanceRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationArrivalDistanceRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationArrivalDistanceRequestEntityMapper; -public class MybatisStationArrivalDistanceRequestEntityMapper implements StationArrivalDistanceRequestEntityMapper { - @Override - public StationArrivalDistanceRequest map(StationArrivalDistanceRequestEntity stationArrivalDistanceRequestEntity) { +public class MybatisStationArrivalDistanceRequestEntityMapper { + + public StationArrivalDistanceRequest map(MybatisStationArrivalDistanceRequestEntity stationArrivalDistanceRequestEntity) { return new StationArrivalDistanceRequest( stationArrivalDistanceRequestEntity.getSystemName(), stationArrivalDistanceRequestEntity.getStationName(), stationArrivalDistanceRequestEntity.getRequestingModule() ); } - - @Override + public MybatisStationArrivalDistanceRequestEntity map(StationArrivalDistanceRequest stationArrivalDistanceRequest) { return new MybatisStationArrivalDistanceRequestEntity( stationArrivalDistanceRequest.systemName(), diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapper.java index 27e9c793..f3d85c32 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapper.java @@ -1,12 +1,8 @@ package io.edpn.backend.exploration.adapter.persistence.entity.mapper; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.LandingPadSize; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import lombok.RequiredArgsConstructor; import java.util.HashMap; @@ -15,9 +11,9 @@ import java.util.stream.Collectors; @RequiredArgsConstructor -public class MybatisStationEntityMapper implements StationEntityMapper { +public class MybatisStationEntityMapper { - private final SystemEntityMapper systemEntityMapper; + private final MybatisSystemEntityMapper systemEntityMapper; private static Map getLandingPads(Station station) { return LandingPadSize.KNOWN_LANDING_PAD_SIZES.stream() @@ -26,7 +22,7 @@ private static Map getLandingPads(Station station) { landingPadSize -> station.landingPads().getOrDefault(landingPadSize, 0))); } - private static Map getLandingPads(StationEntity stationEntity) { + private static Map getLandingPads(MybatisStationEntity stationEntity) { if (stationEntity.getLandingPads() == null) { return new HashMap<>(); } @@ -38,8 +34,7 @@ private static Map getLandingPads(StationEntity station (first, second) -> first)); } - @Override - public Station map(StationEntity stationEntity) { + public Station map(MybatisStationEntity stationEntity) { return new Station( stationEntity.getId(), stationEntity.getMarketId(), @@ -58,7 +53,6 @@ public Station map(StationEntity stationEntity) { ); } - @Override public MybatisStationEntity map(Station station) { return MybatisStationEntity.builder() .id(station.id()) diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapper.java index e3e58287..956affdd 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapper.java @@ -2,22 +2,18 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationMaxLandingPadSizeRequestEntity; import io.edpn.backend.exploration.application.domain.StationMaxLandingPadSizeRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationMaxLandingPadSizeRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationMaxLandingPadSizeRequestEntityMapper; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class MybatisStationMaxLandingPadSizeRequestEntityMapper implements StationMaxLandingPadSizeRequestEntityMapper { +public class MybatisStationMaxLandingPadSizeRequestEntityMapper { - @Override - public StationMaxLandingPadSizeRequest map(StationMaxLandingPadSizeRequestEntity stationMaxLandingPadSizeRequestEntity) { + public StationMaxLandingPadSizeRequest map(MybatisStationMaxLandingPadSizeRequestEntity stationMaxLandingPadSizeRequestEntity) { return new StationMaxLandingPadSizeRequest( stationMaxLandingPadSizeRequestEntity.getSystemName(), stationMaxLandingPadSizeRequestEntity.getStationName(), stationMaxLandingPadSizeRequestEntity.getRequestingModule()); } - @Override public MybatisStationMaxLandingPadSizeRequestEntity map(StationMaxLandingPadSizeRequest stationMaxLandingPadSizeRequest) { return new MybatisStationMaxLandingPadSizeRequestEntity( stationMaxLandingPadSizeRequest.systemName(), diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapper.java index efc7a2bc..f057ba16 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapper.java @@ -2,19 +2,15 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemCoordinateRequestEntity; import io.edpn.backend.exploration.application.domain.SystemCoordinateRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemCoordinateRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemCoordinateRequestEntityMapper; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class MybatisSystemCoordinateRequestEntityMapper implements SystemCoordinateRequestEntityMapper { +public class MybatisSystemCoordinateRequestEntityMapper { - @Override - public SystemCoordinateRequest map(SystemCoordinateRequestEntity systemCoordinateDataRequestEntity) { + public SystemCoordinateRequest map(MybatisSystemCoordinateRequestEntity systemCoordinateDataRequestEntity) { return new SystemCoordinateRequest(systemCoordinateDataRequestEntity.getSystemName(), systemCoordinateDataRequestEntity.getRequestingModule()); } - @Override public MybatisSystemCoordinateRequestEntity map(SystemCoordinateRequest systemCoordinateDataRequest) { return new MybatisSystemCoordinateRequestEntity( systemCoordinateDataRequest.systemName(), diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapper.java index aff851b1..b5f7f835 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapper.java @@ -2,19 +2,15 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEliteIdRequestEntity; import io.edpn.backend.exploration.application.domain.SystemEliteIdRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEliteIdRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEliteIdRequestEntityMapper; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class MybatisSystemEliteIdRequestEntityMapper implements SystemEliteIdRequestEntityMapper { +public class MybatisSystemEliteIdRequestEntityMapper { - @Override - public SystemEliteIdRequest map(SystemEliteIdRequestEntity systemEliteIdRequestEntity) { + public SystemEliteIdRequest map(MybatisSystemEliteIdRequestEntity systemEliteIdRequestEntity) { return new SystemEliteIdRequest(systemEliteIdRequestEntity.getSystemName(), systemEliteIdRequestEntity.getRequestingModule()); } - @Override public MybatisSystemEliteIdRequestEntity map(SystemEliteIdRequest systemEliteIdRequest) { return new MybatisSystemEliteIdRequestEntity( systemEliteIdRequest.systemName(), diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapper.java index b0852e89..ca5e7d57 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapper.java @@ -3,8 +3,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.Coordinate; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -12,10 +10,9 @@ @RequiredArgsConstructor @Slf4j -public class MybatisSystemEntityMapper implements SystemEntityMapper { +public class MybatisSystemEntityMapper { - @Override - public System map(SystemEntity systemEntity) { + public System map(MybatisSystemEntity systemEntity) { return new System( systemEntity.getId(), systemEntity.getEliteId(), @@ -24,7 +21,6 @@ public System map(SystemEntity systemEntity) { coordinateFromCoordinateEntity(systemEntity)); } - @Override public MybatisSystemEntity map(System system) { return new MybatisSystemEntity( system.id(), @@ -36,7 +32,7 @@ public MybatisSystemEntity map(System system) { Optional.ofNullable(system.coordinate()).map(Coordinate::z).orElse(null)); } - private Coordinate coordinateFromCoordinateEntity(SystemEntity systemEntity) { + private Coordinate coordinateFromCoordinateEntity(MybatisSystemEntity systemEntity) { return new Coordinate(systemEntity.getXCoordinate(), systemEntity.getYCoordinate(), systemEntity.getZCoordinate()); } } \ No newline at end of file diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/SystemController.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/SystemController.java index ef486c16..3aa42632 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/SystemController.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/SystemController.java @@ -1,6 +1,7 @@ package io.edpn.backend.exploration.adapter.web; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; +import io.edpn.backend.exploration.adapter.web.dto.RestSystemDto; +import io.edpn.backend.exploration.adapter.web.dto.mapper.RestSystemDtoMapper; import io.edpn.backend.exploration.application.port.incomming.FindSystemsByNameContainingUseCase; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -19,14 +20,18 @@ public class SystemController { final FindSystemsByNameContainingUseCase findSystemsByNameContainingUseCase; final FindSystemsByNameContainingInputValidator findSystemsByNameContainingInputValidator; + final RestSystemDtoMapper restSystemDtoMapper; @Operation(summary = "Find systems by name containing a specific substring, will give priority to return systems starting with the given substring") @GetMapping("/by-name-containing") - public List findByNameContaining( + public List findByNameContaining( @Parameter(description = "Substring to search for in the system name, minimal 3 characters", required = true) @RequestParam(name = "subString") String subString, @Parameter(description = "Amount of results to retrieve. values 1...100", required = false) @RequestParam(name = "amount", required = false, defaultValue = "10") Integer amount) { findSystemsByNameContainingInputValidator.validateSubString(subString); findSystemsByNameContainingInputValidator.validateAmount(amount); - return findSystemsByNameContainingUseCase.findSystemsByNameContaining(subString, amount); + return findSystemsByNameContainingUseCase.findSystemsByNameContaining(subString, amount) + .stream() + .map(restSystemDtoMapper::map) + .toList(); } } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestCoordinateDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestCoordinateDto.java index c2a5984f..839e6915 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestCoordinateDto.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestCoordinateDto.java @@ -1,8 +1,6 @@ package io.edpn.backend.exploration.adapter.web.dto; -import io.edpn.backend.exploration.application.dto.web.object.CoordinateDto; - public record RestCoordinateDto(Double x, Double y, - Double z) implements CoordinateDto { + Double z) { } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestSystemDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestSystemDto.java index a6ae3548..87654617 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestSystemDto.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/RestSystemDto.java @@ -1,10 +1,7 @@ package io.edpn.backend.exploration.adapter.web.dto; -import io.edpn.backend.exploration.application.dto.web.object.CoordinateDto; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; - public record RestSystemDto(String name, - CoordinateDto coordinate, + RestCoordinateDto coordinate, Long eliteId, - String primaryStarClass) implements SystemDto { + String primaryStarClass) { } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestSystemDtoMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestSystemDtoMapper.java index a0cfb268..a8f79216 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestSystemDtoMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestSystemDtoMapper.java @@ -4,9 +4,6 @@ import io.edpn.backend.exploration.adapter.web.dto.RestSystemDto; import io.edpn.backend.exploration.application.domain.Coordinate; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.web.object.CoordinateDto; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.SystemDtoMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,13 +11,13 @@ @RequiredArgsConstructor @Slf4j -public class RestSystemDtoMapper implements SystemDtoMapper { +public class RestSystemDtoMapper { - public SystemDto map(System system) { + public RestSystemDto map(System system) { return new RestSystemDto(system.name(), coordinateFromSystem(system), system.eliteId(), system.primaryStarClass()); } - private CoordinateDto coordinateFromSystem(System system) { + private RestCoordinateDto coordinateFromSystem(System system) { boolean isFilled = Optional.ofNullable(system.coordinate()) .map(Coordinate::x) .isPresent(); diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java new file mode 100644 index 00000000..2272c7ac --- /dev/null +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java @@ -0,0 +1,18 @@ +package io.edpn.backend.exploration.application.domain.intermodulecommunication; + +import io.edpn.backend.exploration.application.domain.Station; + +public record StationArrivalDistanceResponse( + String stationName, + + String systemName, + + double arrivalDistance +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationArrivalDistanceResponse { + public static StationArrivalDistanceResponse from(Station station) { + return new StationArrivalDistanceResponse( + station.name(), + station.system().name(), + station.distanceFromStar()); + } +} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationDataRequest.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationDataRequest.java new file mode 100644 index 00000000..d54bb5b2 --- /dev/null +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationDataRequest.java @@ -0,0 +1,10 @@ +package io.edpn.backend.exploration.application.domain.intermodulecommunication; + +import io.edpn.backend.util.Module; + +public record StationDataRequest( + Module requestingModule, + String stationName, + String systemName +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationDataRequest { +} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java similarity index 59% rename from exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapper.java rename to exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java index 2d7f775a..837a6353 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapper.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java @@ -1,19 +1,20 @@ -package io.edpn.backend.exploration.adapter.kafka.dto.mapper; +package io.edpn.backend.exploration.application.domain.intermodulecommunication; import io.edpn.backend.exploration.application.domain.LandingPadSize; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationMaxLandingPadSizeResponseMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; -import lombok.RequiredArgsConstructor; import java.util.Map; import java.util.Objects; -@RequiredArgsConstructor -public class KafkaStationMaxLandingPadSizeResponseMapper implements StationMaxLandingPadSizeResponseMapper { +public record StationMaxLandingPadSizeResponse( + String stationName, - @Override - public StationMaxLandingPadSizeResponse map(Station station) { + String systemName, + + String maxLandingPadSize +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationMaxLandingPadSizeResponse { + + public static StationMaxLandingPadSizeResponse from(Station station) { return new StationMaxLandingPadSizeResponse( station.name(), @@ -21,7 +22,7 @@ public StationMaxLandingPadSizeResponse map(Station station) { getMaxLandingPadSize(station.landingPads()).name()); } - private LandingPadSize getMaxLandingPadSize(Map landingPads) { + private static LandingPadSize getMaxLandingPadSize(Map landingPads) { if (Objects.isNull(landingPads) || landingPads.isEmpty()) { return LandingPadSize.UNKNOWN; } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemCoordinatesResponse.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemCoordinatesResponse.java new file mode 100644 index 00000000..6eb8e4f2 --- /dev/null +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemCoordinatesResponse.java @@ -0,0 +1,18 @@ +package io.edpn.backend.exploration.application.domain.intermodulecommunication; + +import io.edpn.backend.exploration.application.domain.System; + +public record SystemCoordinatesResponse( + String systemName, + double xCoordinate, + double yCoordinate, + double zCoordinate +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.SystemCoordinatesResponse { + public static SystemCoordinatesResponse from(System system) { + return new SystemCoordinatesResponse( + system.name(), + system.coordinate().x(), + system.coordinate().y(), + system.coordinate().z()); + } +} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemDataRequest.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemDataRequest.java new file mode 100644 index 00000000..2bc6bab9 --- /dev/null +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemDataRequest.java @@ -0,0 +1,9 @@ +package io.edpn.backend.exploration.application.domain.intermodulecommunication; + +import io.edpn.backend.util.Module; + +public record SystemDataRequest( + Module requestingModule, + String systemName +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.SystemDataRequest { +} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemEliteIdResponse.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemEliteIdResponse.java new file mode 100644 index 00000000..2b8f26ac --- /dev/null +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/SystemEliteIdResponse.java @@ -0,0 +1,16 @@ +package io.edpn.backend.exploration.application.domain.intermodulecommunication; + +import io.edpn.backend.exploration.application.domain.System; + +public record SystemEliteIdResponse( + + String systemName, + long eliteId +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.SystemEliteIdResponse { + public static SystemEliteIdResponse from(System system) { + + return new SystemEliteIdResponse( + system.name(), + system.eliteId()); + } +} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/BodyEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/BodyEntity.java deleted file mode 100644 index 9a1f97a3..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/BodyEntity.java +++ /dev/null @@ -1,79 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import java.util.List; -import java.util.Map; -import java.util.UUID; - -public interface BodyEntity { - UUID getId(); - - Double getArrivalDistance(); // LS - - Double getAscendingNode(); - - String getAtmosphere(); - - Map getAtmosphericComposition(); - - Double getAxialTilt(); - - Map getBodyComposition(); - - Boolean getDiscovered(); - - Boolean getMapped(); - - String getName(); - - Long getLocalId(); - - Double getEccentricity(); - - Boolean getLandable(); - - Double getMass(); - - Map getMaterials(); - - Double getMeanAnomaly(); - - Double getOrbitalInclination(); - - Double getOrbitalPeriod(); - - Map getParents(); // ID's are system local - - Double getPeriapsis(); - - String getPlanetClass(); - - Double getRadius(); - - List getRings(); - - Double getRotationPeriod(); // seconds - - Double getSemiMajorAxis(); - - Double getSurfaceGravity(); - - Double getSurfacePressure(); - - Double getSurfaceTemperature(); - - SystemEntity getSystem(); - - Long getSystemAddress(); - - String getTerraformState(); - - Boolean getTidalLock(); - - String getVolcanism(); - - Boolean getHorizons(); - - Boolean getOdyssey(); - - Double getEstimatedScanValue(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/RingEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/RingEntity.java deleted file mode 100644 index 25992966..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/RingEntity.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import java.util.UUID; - -public interface RingEntity { - UUID getId(); - - Long getInnerRadius(); - - Long getMass(); // MT MegaTonnes? - - String getName(); - - Long getOuterRadius(); - - String getRingClass(); - - UUID getBodyId(); - - UUID getStarId(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StarEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StarEntity.java deleted file mode 100644 index 2a9f719b..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StarEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import java.util.List; -import java.util.UUID; - -public interface StarEntity { - UUID getId(); - - Double getAbsoluteMagnitude(); - - Long getAge(); // millions of years - - Double getArrivalDistance();// LS - - Double getAxialTilt(); - - Boolean getDiscovered(); - - Long getLocalId(); - - String getLuminosity(); - - Boolean getMapped(); - - String getName(); - - Double getRadius(); - - List getRings(); - - Double getRotationalPeriod(); - - String getStarType(); - - Long getStellarMass(); // in multiples of Sol - - Integer getSubclass(); - - Double getSurfaceTemperature(); - - SystemEntity getSystem(); - - Long getSystemAddress(); - - Boolean getHorizons(); - - Boolean getOdyssey(); - - Double getEstimatedScanValue(); -} - diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationArrivalDistanceRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationArrivalDistanceRequestEntity.java deleted file mode 100644 index 823c5639..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationArrivalDistanceRequestEntity.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import io.edpn.backend.util.Module; - -public interface StationArrivalDistanceRequestEntity { - - String getSystemName(); - - String getStationName(); - - Module getRequestingModule(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationEntity.java deleted file mode 100644 index 84692c64..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationEntity.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -public interface StationEntity { - - UUID getId(); - - Long getMarketId(); - - String getName(); - - String getType(); - - Double getDistanceFromStar(); - - SystemEntity getSystem(); - - Map getLandingPads(); - - String getGovernment(); - - String getEconomy(); - - Map getEconomies(); - - List getServices(); - - Boolean getOdyssey(); - - Boolean getHorizons(); - - LocalDateTime getUpdatedAt(); - -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationMaxLandingPadSizeRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationMaxLandingPadSizeRequestEntity.java deleted file mode 100644 index 8a207d60..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/StationMaxLandingPadSizeRequestEntity.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import io.edpn.backend.util.Module; - -public interface StationMaxLandingPadSizeRequestEntity { - - String getSystemName(); - - String getStationName(); - - Module getRequestingModule(); - -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemCoordinateRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemCoordinateRequestEntity.java deleted file mode 100644 index faf2ef04..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemCoordinateRequestEntity.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import io.edpn.backend.util.Module; - -public interface SystemCoordinateRequestEntity { - - String getSystemName(); - - Module getRequestingModule(); - -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEliteIdRequestEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEliteIdRequestEntity.java deleted file mode 100644 index 9c58db88..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEliteIdRequestEntity.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import io.edpn.backend.util.Module; - -public interface SystemEliteIdRequestEntity { - - String getSystemName(); - - Module getRequestingModule(); - -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEntity.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEntity.java deleted file mode 100644 index 5838e307..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/SystemEntity.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity; - -import java.util.UUID; - -public interface SystemEntity { - - UUID getId(); - - String getName(); - - Long getEliteId(); - - String getPrimaryStarClass(); - - Double getXCoordinate(); - - Double getYCoordinate(); - - Double getZCoordinate(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/BodyEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/BodyEntityMapper.java deleted file mode 100644 index 60fe6715..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/BodyEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.persistence.entity.BodyEntity; - -public interface BodyEntityMapper { - Body map(BodyEntity bodyEntity); - - T map(Body body); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/RingEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/RingEntityMapper.java deleted file mode 100644 index e02a4051..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/RingEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.Ring; -import io.edpn.backend.exploration.application.dto.persistence.entity.RingEntity; - -public interface RingEntityMapper { - Ring map(RingEntity ringEntity); - - T map(Ring ring); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StarEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StarEntityMapper.java deleted file mode 100644 index 67ba011a..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StarEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.Star; -import io.edpn.backend.exploration.application.dto.persistence.entity.StarEntity; - -public interface StarEntityMapper { - Star map(StarEntity starEntity); - - T map(Star star); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceRequestEntityMapper.java deleted file mode 100644 index be03cbee..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceRequestEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.StationArrivalDistanceRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationArrivalDistanceRequestEntity; - -public interface StationArrivalDistanceRequestEntityMapper { - StationArrivalDistanceRequest map(StationArrivalDistanceRequestEntity stationArrivalDistanceRequestEntity); - - T map(StationArrivalDistanceRequest stationArrivalDistanceRequest); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceResponseMapper.java deleted file mode 100644 index 2146e598..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationArrivalDistanceResponseMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; - -public interface StationArrivalDistanceResponseMapper { - StationArrivalDistanceResponse map(Station station); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationEntityMapper.java deleted file mode 100644 index 27dc31af..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationEntity; - -public interface StationEntityMapper { - Station map(StationEntity stationEntity); - - T map(Station station); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeRequestEntityMapper.java deleted file mode 100644 index 4456a530..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeRequestEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.StationMaxLandingPadSizeRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationMaxLandingPadSizeRequestEntity; - -public interface StationMaxLandingPadSizeRequestEntityMapper { - StationMaxLandingPadSizeRequest map(StationMaxLandingPadSizeRequestEntity stationMaxLandingPadSizeRequestEntity); - - T map(StationMaxLandingPadSizeRequest stationMaxLandingPadSizeRequest); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeResponseMapper.java deleted file mode 100644 index 0f58d3db..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/StationMaxLandingPadSizeResponseMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; - -public interface StationMaxLandingPadSizeResponseMapper { - StationMaxLandingPadSizeResponse map(Station station); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinateRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinateRequestEntityMapper.java deleted file mode 100644 index 5ea79b77..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinateRequestEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.SystemCoordinateRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemCoordinateRequestEntity; - -public interface SystemCoordinateRequestEntityMapper { - SystemCoordinateRequest map(SystemCoordinateRequestEntity systemCoordinateDataRequestEntity); - - T map(SystemCoordinateRequest systemCoordinateDataRequest); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinatesResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinatesResponseMapper.java deleted file mode 100644 index 4615a99e..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemCoordinatesResponseMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; - -public interface SystemCoordinatesResponseMapper { - SystemCoordinatesResponse map(System system); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdRequestEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdRequestEntityMapper.java deleted file mode 100644 index 3c83d71d..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdRequestEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.SystemEliteIdRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEliteIdRequestEntity; - -public interface SystemEliteIdRequestEntityMapper { - SystemEliteIdRequest map(SystemEliteIdRequestEntity systemEliteIdRequestEntity); - - T map(SystemEliteIdRequest systemEliteIdRequest); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdResponseMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdResponseMapper.java deleted file mode 100644 index 5587b03f..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEliteIdResponseMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; - -public interface SystemEliteIdResponseMapper { - SystemEliteIdResponse map(System system); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEntityMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEntityMapper.java deleted file mode 100644 index 16ed2cd6..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/persistence/entity/mapper/SystemEntityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.edpn.backend.exploration.application.dto.persistence.entity.mapper; - -import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEntity; - -public interface SystemEntityMapper { - System map(SystemEntity systemEntity); - - T map(System system); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/BodyDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/BodyDto.java deleted file mode 100644 index 145437b5..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/BodyDto.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object; - -import java.util.List; -import java.util.Map; - -public interface BodyDto { - Double getArrivalDistance(); // LS - - Double getAscendingNode(); - - String getAtmosphere(); - - Map getAtmosphericComposition(); - - Double getAxialTilt(); - - Map getBodyComposition(); - - Boolean getDiscovered(); - - Boolean getMapped(); - - String getName(); - - Long getLocalId(); - - Double getEccentricity(); - - Boolean getLandable(); - - Double getMass(); - - Map getMaterials(); - - Double getMeanAnomaly(); - - Double getOrbitalInclination(); - - Double getOrbitalPeriod(); - - Map getParents(); // ID's are system local - - Double getPeriapsis(); - - String getPlanetClass(); - - Double getRadius(); - - List getRings(); - - Double getRotationPeriod(); // seconds - - Double getSemiMajorAxis(); - - Double getSurfaceGravity(); - - Double getSurfacePressure(); - - Double getSurfaceTemperature(); - - SystemDto getSystemDto(); - - Long getSystemAddress(); - - String getTerraformState(); - - Boolean getTidalLock(); - - String getVolcanism(); - - Boolean getHorizons(); - - Boolean getOdyssey(); - - Double getEstimatedScanValue(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/CoordinateDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/CoordinateDto.java deleted file mode 100644 index 170ce8cd..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/CoordinateDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object; - -public interface CoordinateDto { - Double x(); - - Double y(); - - Double z(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/MessageDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/MessageDto.java deleted file mode 100644 index f9454b0a..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/MessageDto.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object; - -public interface MessageDto { - String topic(); - - String message(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/RingDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/RingDto.java deleted file mode 100644 index 6baa45d3..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/RingDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object; - -import java.util.UUID; - -public interface RingDto{ - Long getInnerRadius(); - - Long getMass(); // MT MegaTonnes? - - String getName(); - - Long getOuterRadius(); - - String getRingClass(); - - UUID getBodyId(); - - UUID getStarId(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/StarDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/StarDto.java deleted file mode 100644 index 5ee8b2f8..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/StarDto.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object; - -import java.util.List; - -public interface StarDto { - Double getAbsoluteMagnitude(); - - Long getAge(); // millions of years - - Double getArrivalDistance();// LS - - Double getAxialTilt(); - - Boolean getDiscovered(); - - Long getLocalId(); - - String getLuminosity(); - - Boolean getMapped(); - - String getName(); - - Double getRadius(); - - List getRings(); - - Double getRotationalPeriod(); - - String getStarType(); - - Long getStellarMass(); // in multiples of Sol - - Long getSubclass(); - - Double getSurfaceTemperature(); - - SystemDto getSystem(); - - Long getSystemAddress(); - - Boolean getHorizons(); - - Boolean getOdyssey(); - - Double getEstimatedScanValue(); -} \ No newline at end of file diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/SystemDto.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/SystemDto.java deleted file mode 100644 index ff6dc32a..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/SystemDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object; - -public interface SystemDto { - String name(); - - CoordinateDto coordinate(); - - Long eliteId(); - - String primaryStarClass(); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/BodyDtoMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/BodyDtoMapper.java deleted file mode 100644 index 2032ed28..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/BodyDtoMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object.mapper; - -import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.web.object.BodyDto; - -public interface BodyDtoMapper { - BodyDto map(Body body); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/MessageDtoMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/MessageDtoMapper.java deleted file mode 100644 index c5a49080..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/MessageDtoMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object.mapper; - -import io.edpn.backend.exploration.application.domain.Message; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; - -public interface MessageDtoMapper { - MessageDto map(Message message); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/RingDtoMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/RingDtoMapper.java deleted file mode 100644 index fe8f109b..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/RingDtoMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object.mapper; - -import io.edpn.backend.exploration.application.domain.Ring; -import io.edpn.backend.exploration.application.dto.web.object.RingDto; - -public interface RingDtoMapper { - RingDto map(Ring ring); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/StarDtoMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/StarDtoMapper.java deleted file mode 100644 index 7abab79c..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/StarDtoMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object.mapper; - -import io.edpn.backend.exploration.application.domain.Star; -import io.edpn.backend.exploration.application.dto.web.object.StarDto; - -public interface StarDtoMapper { - StarDto map(Star star); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/SystemDtoMapper.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/SystemDtoMapper.java deleted file mode 100644 index b52331a9..00000000 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/dto/web/object/mapper/SystemDtoMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.edpn.backend.exploration.application.dto.web.object.mapper; - -import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; - -public interface SystemDtoMapper { - SystemDto map(System system); -} diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/incomming/FindSystemsByNameContainingUseCase.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/incomming/FindSystemsByNameContainingUseCase.java index 86c8d065..94605a80 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/incomming/FindSystemsByNameContainingUseCase.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/incomming/FindSystemsByNameContainingUseCase.java @@ -1,10 +1,10 @@ package io.edpn.backend.exploration.application.port.incomming; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; +import io.edpn.backend.exploration.application.domain.System; import java.util.List; public interface FindSystemsByNameContainingUseCase { - List findSystemsByNameContaining(String subString, int amount); + List findSystemsByNameContaining(String subString, int amount); } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/outgoing/message/SendMessagePort.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/outgoing/message/SendMessagePort.java index 69571f56..df4a87bc 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/outgoing/message/SendMessagePort.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/port/outgoing/message/SendMessagePort.java @@ -1,7 +1,7 @@ package io.edpn.backend.exploration.application.port.outgoing.message; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; +import io.edpn.backend.exploration.application.domain.Message; public interface SendMessagePort { - Boolean send(MessageDto messageDto); + Boolean send(Message messageDto); } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceInterModuleCommunicationService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceInterModuleCommunicationService.java index 191a2488..288145ad 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceInterModuleCommunicationService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceInterModuleCommunicationService.java @@ -7,7 +7,7 @@ import io.edpn.backend.exploration.application.port.outgoing.stationarrivaldistancerequest.CreateIfNotExistsStationArrivalDistanceRequestPort; import io.edpn.backend.exploration.application.port.outgoing.stationarrivaldistancerequest.LoadAllStationArrivalDistanceRequestPort; import io.edpn.backend.exploration.application.port.outgoing.stationarrivaldistancerequest.StationArrivalDistanceResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Module; import lombok.RequiredArgsConstructor; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceResponseSenderService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceResponseSenderService.java index 065645ee..e7776a4a 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceResponseSenderService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationArrivalDistanceResponseSenderService.java @@ -4,15 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationArrivalDistanceResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.station.LoadStationPort; import io.edpn.backend.exploration.application.port.outgoing.stationarrivaldistancerequest.DeleteStationArrivalDistanceRequestPort; import io.edpn.backend.exploration.application.port.outgoing.stationarrivaldistancerequest.LoadStationArrivalDistanceRequestByIdentifierPort; import io.edpn.backend.exploration.application.port.outgoing.stationarrivaldistancerequest.StationArrivalDistanceResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationArrivalDistanceResponse; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Topic; import lombok.RequiredArgsConstructor; @@ -28,13 +25,11 @@ public class StationArrivalDistanceResponseSenderService implements StationArriv private final LoadStationArrivalDistanceRequestByIdentifierPort loadStationArrivalDistanceRequestByIdentifierPort; private final DeleteStationArrivalDistanceRequestPort deleteStationArrivalDistanceRequestPort; private final SendMessagePort sendMessagePort; - private final StationArrivalDistanceResponseMapper stationArrivalDistanceResponseMapper; - private final MessageDtoMapper messageDtoMapper; private final ObjectMapper objectMapper; private final RetryTemplate retryTemplate; private final ExecutorService executorService; - - + + @Override public void sendResponsesForStation(String systemName, String stationName) { loadStationArrivalDistanceRequestByIdentifierPort.loadByIdentifier(systemName, stationName).parallelStream() @@ -42,13 +37,12 @@ public void sendResponsesForStation(String systemName, String stationName) { executorService.submit(ConcurrencyUtil.errorHandlingWrapper(() -> { try { Station station = loadStationPort.load(systemName, stationName).orElseThrow(() -> new IllegalStateException("System with name %s not found when application event for it was triggered".formatted(systemName))); - StationArrivalDistanceResponse stationArrivalDistanceResponse = stationArrivalDistanceResponseMapper.map(station); + StationArrivalDistanceResponse stationArrivalDistanceResponse = StationArrivalDistanceResponse.from(station); String stringJson = objectMapper.writeValueAsString(stationArrivalDistanceResponse); String topic = Topic.Response.STATION_ARRIVAL_DISTANCE.getFormattedTopicName(stationArrivalDistanceRequest.requestingModule()); Message message = new Message(topic, stringJson); - MessageDto messageDto = messageDtoMapper.map(message); - - boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(messageDto)); + + boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(message)); if (sendSuccessful) { deleteStationArrivalDistanceRequestPort.delete(systemName, stationName, stationArrivalDistanceRequest.requestingModule()); } @@ -57,8 +51,8 @@ public void sendResponsesForStation(String systemName, String stationName) { } }, exception -> log.error("Error while processing stationArrivalDistanceResponse for station {} in system: {}", stationName, systemName, exception)))); - - + + } } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeInterModuleCommunicationService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeInterModuleCommunicationService.java index d553e1a5..501c7095 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeInterModuleCommunicationService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeInterModuleCommunicationService.java @@ -7,7 +7,7 @@ import io.edpn.backend.exploration.application.port.outgoing.stationmaxlandingpadsizerequest.CreateIfNotExistsStationMaxLandingPadSizeRequestPort; import io.edpn.backend.exploration.application.port.outgoing.stationmaxlandingpadsizerequest.LoadAllStationMaxLandingPadSizeRequestPort; import io.edpn.backend.exploration.application.port.outgoing.stationmaxlandingpadsizerequest.StationMaxLandingPadSizeResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Module; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeResponseSenderService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeResponseSenderService.java index 8b1d8eb6..a1a50c96 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeResponseSenderService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/StationMaxLandingPadSizeResponseSenderService.java @@ -4,22 +4,20 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationMaxLandingPadSizeResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.station.LoadStationPort; import io.edpn.backend.exploration.application.port.outgoing.stationmaxlandingpadsizerequest.DeleteStationMaxLandingPadSizeRequestPort; import io.edpn.backend.exploration.application.port.outgoing.stationmaxlandingpadsizerequest.LoadStationMaxLandingPadSizeRequestByIdentifierPort; import io.edpn.backend.exploration.application.port.outgoing.stationmaxlandingpadsizerequest.StationMaxLandingPadSizeResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationMaxLandingPadSizeResponse; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Topic; -import java.util.concurrent.ExecutorService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.retry.support.RetryTemplate; +import java.util.concurrent.ExecutorService; + @RequiredArgsConstructor @Slf4j public class StationMaxLandingPadSizeResponseSenderService implements StationMaxLandingPadSizeResponseSender { @@ -28,8 +26,6 @@ public class StationMaxLandingPadSizeResponseSenderService implements StationMax private final LoadStationMaxLandingPadSizeRequestByIdentifierPort loadStationMaxLandingPadSizeRequestByIdentifierPort; private final DeleteStationMaxLandingPadSizeRequestPort deleteStationMaxLandingPadSizeRequestPort; private final SendMessagePort sendMessagePort; - private final StationMaxLandingPadSizeResponseMapper stationMaxLandingPadSizeResponseMapper; - private final MessageDtoMapper messageMapper; private final ObjectMapper objectMapper; private final RetryTemplate retryTemplate; private final ExecutorService executorService; @@ -41,13 +37,12 @@ public void sendResponsesForStation(String systemName, String stationName) { executorService.submit(ConcurrencyUtil.errorHandlingWrapper(() -> { try { Station station = loadStationPort.load(systemName, stationName).orElseThrow(() -> new IllegalStateException("System with name %s not found when application event for it was triggered".formatted(systemName))); - StationMaxLandingPadSizeResponse stationMaxLandingPadSizeResponse = stationMaxLandingPadSizeResponseMapper.map(station); + StationMaxLandingPadSizeResponse stationMaxLandingPadSizeResponse = StationMaxLandingPadSizeResponse.from(station); String stringJson = objectMapper.writeValueAsString(stationMaxLandingPadSizeResponse); String topic = Topic.Response.STATION_MAX_LANDING_PAD_SIZE.getFormattedTopicName(stationMaxLandingPadSizeRequest.requestingModule()); Message message = new Message(topic, stringJson); - MessageDto messageDto = messageMapper.map(message); - boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(messageDto)); + boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(message)); if (sendSuccessful) { deleteStationMaxLandingPadSizeRequestPort.delete(systemName, stationName, stationMaxLandingPadSizeRequest.requestingModule()); } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemControllerService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemControllerService.java index 19ecd371..174db218 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemControllerService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemControllerService.java @@ -1,8 +1,7 @@ package io.edpn.backend.exploration.application.service; +import io.edpn.backend.exploration.application.domain.System; import io.edpn.backend.exploration.application.domain.exception.ValidationException; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.SystemDtoMapper; import io.edpn.backend.exploration.application.port.incomming.FindSystemsByNameContainingUseCase; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemsByNameContainingPort; import io.edpn.backend.exploration.application.validation.LoadByNameContainingValidator; @@ -18,18 +17,14 @@ public class SystemControllerService implements FindSystemsByNameContainingUseCa private final LoadSystemsByNameContainingPort loadSystemsByNameContainingPort; private final LoadByNameContainingValidator loadByNameContainingValidator; - private final SystemDtoMapper systemDtoMapper; @Override - public List findSystemsByNameContaining(String subString, int amount) { + public List findSystemsByNameContaining(String subString, int amount) { Optional validationResult = loadByNameContainingValidator.validate(subString, amount); if (validationResult.isPresent()) { throw validationResult.get(); } - return loadSystemsByNameContainingPort.loadByNameContaining(subString, amount) - .stream() - .map(systemDtoMapper::map) - .toList(); + return loadSystemsByNameContainingPort.loadByNameContaining(subString, amount); } } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinateInterModuleCommunicationService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinateInterModuleCommunicationService.java index 62024e98..16db2e44 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinateInterModuleCommunicationService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinateInterModuleCommunicationService.java @@ -7,7 +7,7 @@ import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.CreateIfNotExistsSystemCoordinateRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.LoadAllSystemCoordinateRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.SystemCoordinatesResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Module; import java.util.concurrent.ExecutorService; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderService.java index 007420f1..20360ce8 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderService.java @@ -4,15 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemCoordinatesResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemCoordinatesResponse; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.DeleteSystemCoordinateRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.LoadSystemCoordinateRequestByIdentifierPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.SystemCoordinatesResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Topic; import lombok.RequiredArgsConstructor; @@ -29,8 +26,6 @@ public class SystemCoordinatesResponseSenderService implements SystemCoordinates private final LoadSystemCoordinateRequestByIdentifierPort loadSystemCoordinateRequestBySystemNamePort; private final DeleteSystemCoordinateRequestPort deleteSystemCoordinateRequestPort; private final SendMessagePort sendMessagePort; - private final SystemCoordinatesResponseMapper systemCoordinatesResponseMapper; - private final MessageDtoMapper messageMapper; private final ObjectMapper objectMapper; private final RetryTemplate retryTemplate; private final ExecutorService executorService; @@ -42,13 +37,12 @@ public void sendResponsesForSystem(String systemName) { .forEach(systemCoordinateRequest -> executorService.submit(ConcurrencyUtil.errorHandlingWrapper(() -> { try { System system = loadSystemPort.load(systemName).orElseThrow(() -> new IllegalStateException("System with name %s not found when application event for it was triggered".formatted(systemName))); - SystemCoordinatesResponse systemCoordinatesResponse = systemCoordinatesResponseMapper.map(system); + SystemCoordinatesResponse systemCoordinatesResponse = SystemCoordinatesResponse.from(system); String stringJson = objectMapper.writeValueAsString(systemCoordinatesResponse); String topic = Topic.Response.SYSTEM_COORDINATES.getFormattedTopicName(systemCoordinateRequest.requestingModule()); Message message = new Message(topic, stringJson); - MessageDto messageDto = messageMapper.map(message); - boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(messageDto)); + boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(message)); if (sendSuccessful) { deleteSystemCoordinateRequestPort.delete(systemName, systemCoordinateRequest.requestingModule()); } diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdInterModuleCommunicationService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdInterModuleCommunicationService.java index 1e567b82..1f330c77 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdInterModuleCommunicationService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdInterModuleCommunicationService.java @@ -7,7 +7,7 @@ import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.CreateIfNotExistsSystemEliteIdRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.LoadAllSystemEliteIdRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.SystemEliteIdResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Module; import java.util.concurrent.ExecutorService; diff --git a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderService.java b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderService.java index 98dab1ea..290f2ae9 100644 --- a/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderService.java +++ b/exploration-module/src/main/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderService.java @@ -4,15 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEliteIdResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.DeleteSystemEliteIdRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.LoadSystemEliteIdRequestByIdentifierPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.SystemEliteIdResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.util.ConcurrencyUtil; import io.edpn.backend.util.Topic; import lombok.RequiredArgsConstructor; @@ -29,8 +26,6 @@ public class SystemEliteIdResponseSenderService implements SystemEliteIdResponse private final LoadSystemEliteIdRequestByIdentifierPort loadSystemEliteIdRequestBySystemNamePort; private final DeleteSystemEliteIdRequestPort deleteSystemEliteIdRequestPort; private final SendMessagePort sendMessagePort; - private final SystemEliteIdResponseMapper systemEliteIdResponseMapper; - private final MessageDtoMapper messageMapper; private final ObjectMapper objectMapper; private final RetryTemplate retryTemplate; private final ExecutorService executorService; @@ -42,13 +37,12 @@ public void sendResponsesForSystem(String systemName) { executorService.submit(ConcurrencyUtil.errorHandlingWrapper(() -> { try { System system = loadSystemPort.load(systemName).orElseThrow(() -> new IllegalStateException("System with name %s not found when application event for it was triggered".formatted(systemName))); - SystemEliteIdResponse systemEliteIdResponse = systemEliteIdResponseMapper.map(system); + SystemEliteIdResponse systemEliteIdResponse = SystemEliteIdResponse.from(system); String stringJson = objectMapper.writeValueAsString(systemEliteIdResponse); String topic = Topic.Response.SYSTEM_ELITE_ID.getFormattedTopicName(systemEliteIdRequest.requestingModule()); Message message = new Message(topic, stringJson); - MessageDto messageDto = messageMapper.map(message); - boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(messageDto)); + boolean sendSuccessful = retryTemplate.execute(retryContext -> sendMessagePort.send(message)); if (sendSuccessful) { deleteSystemEliteIdRequestPort.delete(systemName, systemEliteIdRequest.requestingModule()); } diff --git a/exploration-module/src/main/java/module-info.java b/exploration-module/src/main/java/module-info.java index ef08e03b..8b297bcc 100644 --- a/exploration-module/src/main/java/module-info.java +++ b/exploration-module/src/main/java/module-info.java @@ -25,8 +25,8 @@ requires spring.core; exports io.edpn.backend.exploration.application.port.incomming; - exports io.edpn.backend.exploration.application.dto.persistence.entity; exports io.edpn.backend.exploration.adapter.web; + exports io.edpn.backend.exploration.adapter.web.dto; + exports io.edpn.backend.exploration.adapter.web.dto.mapper; exports io.edpn.backend.exploration.application.domain; - exports io.edpn.backend.exploration.application.dto.web.object; } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapperTest.java index d002eac3..ee4459d2 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaMessageMapperTest.java @@ -1,8 +1,7 @@ package io.edpn.backend.exploration.adapter.kafka.dto.mapper; +import io.edpn.backend.exploration.adapter.kafka.dto.KafkaMessageDto; import io.edpn.backend.exploration.application.domain.Message; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,7 +13,7 @@ @ExtendWith(MockitoExtension.class) class KafkaMessageMapperTest { - private MessageDtoMapper underTest; + private KafkaMessageMapper underTest; @BeforeEach void setUp() { @@ -29,7 +28,7 @@ void map_shouldReturnCorrectKafkaMessageDto() { Message kafkaMessage = new Message(topic, message); - MessageDto result = underTest.map(kafkaMessage); + KafkaMessageDto result = underTest.map(kafkaMessage); assertThat(result.topic(), is(topic)); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessorTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessorTest.java index 20927a06..455e508c 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessorTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/StationDataRequestMessageProcessorTest.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import io.edpn.backend.exploration.application.port.incomming.ReceiveKafkaMessageUseCase; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessorTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessorTest.java index 069939df..acda8297 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessorTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/processor/SystemDataRequestMessageProcessorTest.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import io.edpn.backend.exploration.application.port.incomming.ReceiveKafkaMessageUseCase; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSenderTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSenderTest.java index e22b414e..417c95f4 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSenderTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/sender/KafkaMessageSenderTest.java @@ -4,7 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.exploration.adapter.kafka.dto.KafkaMessageDto; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; +import io.edpn.backend.exploration.adapter.kafka.dto.mapper.KafkaMessageMapper; +import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.topic.CreateTopicPort; import org.junit.jupiter.api.BeforeEach; @@ -31,6 +32,9 @@ class KafkaMessageSenderTest { @Mock private CreateTopicPort createTopicPort; + @Mock + private KafkaMessageMapper messageMapper; + @Mock private ObjectMapper objectMapper; @@ -41,20 +45,21 @@ class KafkaMessageSenderTest { @BeforeEach void setUp() { - underTest = new KafkaMessageSender(createTopicPort, objectMapper, jsonNodekafkaTemplate); + underTest = new KafkaMessageSender(createTopicPort, messageMapper, objectMapper, jsonNodekafkaTemplate); } @Test void send_shouldInvokeCreateTopicPortAndSendKafkaMessage() throws JsonProcessingException { - - MessageDto messageDto = new KafkaMessageDto("test-topic", "test-message"); + Message message = new Message("test-topic", "test-message"); + KafkaMessageDto kafkaMessageDto = new KafkaMessageDto("test-topic", "test-message"); + when(messageMapper.map(message)).thenReturn(kafkaMessageDto); JsonNode jsonNode = Mockito.mock(JsonNode.class); when(createTopicPort.createTopicIfNotExists(any(String.class))).thenReturn(CompletableFuture.completedFuture(null)); when(objectMapper.readTree(any(String.class))).thenReturn(jsonNode); - Boolean result = underTest.send(messageDto); + Boolean result = underTest.send(message); verify(createTopicPort, times(1)).createTopicIfNotExists(any(String.class)); @@ -64,29 +69,25 @@ void send_shouldInvokeCreateTopicPortAndSendKafkaMessage() throws JsonProcessing @Test void send_shouldReturnFalse_whenJsonProcessingExceptionOccurs() throws JsonProcessingException { - - MessageDto messageDto = new KafkaMessageDto("test-topic", "test-message"); - + Message message = new Message("test-topic", "test-message"); + KafkaMessageDto kafkaMessageDto = new KafkaMessageDto("test-topic", "test-message"); + when(messageMapper.map(message)).thenReturn(kafkaMessageDto); when(createTopicPort.createTopicIfNotExists(any(String.class))).thenReturn(CompletableFuture.completedFuture(null)); when(objectMapper.readTree(any(String.class))).thenThrow(JsonProcessingException.class); - - Boolean result = underTest.send(messageDto); - + Boolean result = underTest.send(message); assertThat(result, equalTo(false)); } @Test void send_shouldReturnFalse_whenExceptionOccursWhileCreatingTopic() { - - MessageDto messageDto = new KafkaMessageDto("test-topic", "test-message"); - + Message message = new Message("test-topic", "test-message"); + KafkaMessageDto kafkaMessageDto = new KafkaMessageDto("test-topic", "test-message"); + when(messageMapper.map(message)).thenReturn(kafkaMessageDto); when(createTopicPort.createTopicIfNotExists(any(String.class))).thenReturn(CompletableFuture.failedFuture(new ExecutionException("Exception occurred", new Throwable()))); - - Boolean result = underTest.send(messageDto); - + Boolean result = underTest.send(message); assertThat(result, equalTo(false)); } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/LoadBodyPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/LoadBodyPortTest.java index dd97b18a..e1f7a465 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/LoadBodyPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/LoadBodyPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.BodyRepository; import io.edpn.backend.exploration.adapter.persistence.MybatisBodyRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisBodyEntityMapper; import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.BodyEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.body.LoadBodyPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -23,30 +23,30 @@ public class LoadBodyPortTest { @Mock private MybatisBodyRepository mybatisBodyRepository; - + @Mock - private BodyEntityMapper bodyEntityMapper; - + private MybatisBodyEntityMapper bodyEntityMapper; + private LoadBodyPort underTest; - + @BeforeEach void setUp() { underTest = new BodyRepository(mybatisBodyRepository, bodyEntityMapper); } - + @Test void load_shouldFindByNameAndMap() { - + String name = "body"; MybatisBodyEntity entity = mock(MybatisBodyEntity.class); Body mapped = mock(Body.class); when(mybatisBodyRepository.findByName(name)).thenReturn(Optional.of(entity)); when(bodyEntityMapper.map(entity)).thenReturn(mapped); - - + + Optional result = underTest.load(name); - - + + assertThat(result.isPresent(), is(true)); assertThat(result.get(), is(mapped)); } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/SaveOrUpdateBodyPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/SaveOrUpdateBodyPortTest.java index 630bcbf0..ff6ad312 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/SaveOrUpdateBodyPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/body/SaveOrUpdateBodyPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.BodyRepository; import io.edpn.backend.exploration.adapter.persistence.MybatisBodyRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisBodyEntityMapper; import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.BodyEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.body.SaveOrUpdateBodyPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -23,31 +23,31 @@ public class SaveOrUpdateBodyPortTest { @Mock private MybatisBodyRepository mybatisBodyRepository; - + @Mock - private BodyEntityMapper bodyEntityMapper; - + private MybatisBodyEntityMapper bodyEntityMapper; + private SaveOrUpdateBodyPort underTest; - + @BeforeEach void setUp() { underTest = new BodyRepository(mybatisBodyRepository, bodyEntityMapper); } - + @Test void save_shouldUpdateAndLoad() { - + Body body = mock(Body.class); MybatisBodyEntity entity = mock(MybatisBodyEntity.class); Body loaded = mock(Body.class); when(bodyEntityMapper.map(body)).thenReturn(entity); when(mybatisBodyRepository.insertOrUpdateOnConflict(any())).thenReturn(entity); when(bodyEntityMapper.map(entity)).thenReturn(loaded); - - + + Body result = underTest.saveOrUpdate(body); - - + + assertThat(result, is(loaded)); } } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapperTest.java index 9c4cc696..abab099c 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisBodyEntityMapperTest.java @@ -1,15 +1,7 @@ package io.edpn.backend.exploration.adapter.persistence.entity.mapper; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisBodyEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.Body; -import io.edpn.backend.exploration.application.dto.persistence.entity.BodyEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.BodyEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; -import java.util.Map; -import java.util.UUID; import org.apache.commons.collections4.map.HashedMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -17,38 +9,41 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Map; +import java.util.UUID; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @ExtendWith(MockitoExtension.class) class MybatisBodyEntityMapperTest { - - private BodyEntityMapper underTest; - + + private MybatisBodyEntityMapper underTest; + @Mock - private RingEntityMapper mockRingEntityMapper; - + private MybatisRingEntityMapper mockRingEntityMapper; + @Mock - private SystemEntityMapper mockSystemEntityMapper; - + private MybatisSystemEntityMapper mockSystemEntityMapper; + @BeforeEach - public void setUp(){ + public void setUp() { underTest = new MybatisBodyEntityMapper(mockRingEntityMapper, mockSystemEntityMapper); } - - + + @Test public void testMap_givenDto_shouldReturnDomainObject() { - - BodyEntity entity = MybatisBodyEntity.builder() + + MybatisBodyEntity entity = MybatisBodyEntity.builder() .id(UUID.randomUUID()) .arrivalDistance(137.2) .ascendingNode(300.5) .atmosphere("Body Atmosphere") - .atmosphericComposition(new HashedMap<>(Map.of("Nitrogen", 95.5 ,"Oxygen", 5.5))) + .atmosphericComposition(new HashedMap<>(Map.of("Nitrogen", 95.5, "Oxygen", 5.5))) .axialTilt(0.0) - .bodyComposition(new HashedMap<>(Map.of("Carbon", 95.5 ,"Silicon", 5.5))) + .bodyComposition(new HashedMap<>(Map.of("Carbon", 95.5, "Silicon", 5.5))) .discovered(false) .mapped(true) .name("Body Name") @@ -56,7 +51,7 @@ public void testMap_givenDto_shouldReturnDomainObject() { .eccentricity(123456.1) .landable(true) .mass(357.5) - .materials(Map.of("Carbon", 95.5 ,"Silicon", 5.5)) + .materials(Map.of("Carbon", 95.5, "Silicon", 5.5)) .meanAnomaly(12345.1) .orbitalInclination(2.5) .orbitalPeriod(35.5) @@ -77,7 +72,7 @@ public void testMap_givenDto_shouldReturnDomainObject() { .odyssey(true) .estimatedScanValue(35.5) .build(); - + Body result = underTest.map(entity); @@ -115,9 +110,9 @@ public void testMap_givenDto_shouldReturnDomainObject() { assertThat(result.horizons(), equalTo(entity.getHorizons())); assertThat(result.odyssey(), equalTo(entity.getOdyssey())); assertThat(result.estimatedScanValue(), equalTo(entity.getEstimatedScanValue())); - + } - + @Test public void testMap_givenDomainObject_shouldReturnEntity() { Body object = Body.builder() @@ -125,9 +120,9 @@ public void testMap_givenDomainObject_shouldReturnEntity() { .arrivalDistance(137.2) .ascendingNode(300.5) .atmosphere("Body Atmosphere") - .atmosphericComposition(new HashedMap<>(Map.of("Nitrogen", 95.5 ,"Oxygen", 5.5))) + .atmosphericComposition(new HashedMap<>(Map.of("Nitrogen", 95.5, "Oxygen", 5.5))) .axialTilt(0.0) - .bodyComposition(new HashedMap<>(Map.of("Carbon", 95.5 ,"Silicon", 5.5))) + .bodyComposition(new HashedMap<>(Map.of("Carbon", 95.5, "Silicon", 5.5))) .discovered(false) .mapped(true) .name("Body Name") @@ -135,7 +130,7 @@ public void testMap_givenDomainObject_shouldReturnEntity() { .eccentricity(123456.1) .landable(true) .mass(357.5) - .materials(Map.of("Carbon", 95.5 ,"Silicon", 5.5)) + .materials(Map.of("Carbon", 95.5, "Silicon", 5.5)) .meanAnomaly(12345.1) .orbitalInclination(2.5) .orbitalPeriod(35.5) @@ -156,8 +151,8 @@ public void testMap_givenDomainObject_shouldReturnEntity() { .odyssey(true) .estimatedScanValue(35.5) .build(); - - BodyEntity result = underTest.map(object); + + MybatisBodyEntity result = underTest.map(object); assertThat(result.getId(), equalTo(object.id())); @@ -195,5 +190,5 @@ public void testMap_givenDomainObject_shouldReturnEntity() { assertThat(result.getOdyssey(), equalTo(object.odyssey())); assertThat(result.getEstimatedScanValue(), equalTo(object.estimatedScanValue())); } - + } \ No newline at end of file diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapperTest.java index f7c05a83..2b8776a5 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisRingEntityMapperTest.java @@ -2,29 +2,28 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; import io.edpn.backend.exploration.application.domain.Ring; -import io.edpn.backend.exploration.application.dto.persistence.entity.RingEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; -import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.UUID; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; class MybatisRingEntityMapperTest { - - RingEntityMapper underTest; - + + private MybatisRingEntityMapper underTest; + @BeforeEach - public void setUp(){ + public void setUp() { underTest = new MybatisRingEntityMapper(); } - - + + @Test public void testMap_givenDto_shouldReturnDomainObject() { - RingEntity entity = MybatisRingEntity.builder() + MybatisRingEntity entity = MybatisRingEntity.builder() .id(UUID.randomUUID()) .innerRadius(465L) .mass(123456L) @@ -34,7 +33,7 @@ public void testMap_givenDto_shouldReturnDomainObject() { .bodyId(UUID.randomUUID()) .starId(UUID.randomUUID()) .build(); - + Ring result = underTest.map(entity); assertThat(result.id(), equalTo(entity.getId())); @@ -46,7 +45,7 @@ public void testMap_givenDto_shouldReturnDomainObject() { assertThat(result.bodyId(), equalTo(entity.getBodyId())); assertThat(result.starId(), equalTo(entity.getStarId())); } - + @Test public void testMap_givenDomainObject_shouldReturnEntity() { Ring object = Ring.builder() @@ -59,8 +58,8 @@ public void testMap_givenDomainObject_shouldReturnEntity() { .bodyId(UUID.randomUUID()) .starId(UUID.randomUUID()) .build(); - - RingEntity result = underTest.map(object); + + MybatisRingEntity result = underTest.map(object); assertThat(result.getId(), equalTo(object.id())); assertThat(result.getInnerRadius(), equalTo(object.innerRadius())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapperTest.java index c3f322d5..7ee8ae42 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStarEntityMapperTest.java @@ -1,43 +1,38 @@ package io.edpn.backend.exploration.adapter.persistence.entity.mapper; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStarEntity; -import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.Star; -import io.edpn.backend.exploration.application.dto.persistence.entity.StarEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StarEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; -import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.UUID; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @ExtendWith(MockitoExtension.class) class MybatisStarEntityMapperTest { - - private StarEntityMapper underTest; - + + private MybatisStarEntityMapper underTest; + @Mock - private RingEntityMapper mockRingEntityMapper; - + private MybatisRingEntityMapper mockRingEntityMapper; + @Mock - private SystemEntityMapper mockSystemEntityMapper; - + private MybatisSystemEntityMapper mockSystemEntityMapper; + @BeforeEach public void setUp() { underTest = new MybatisStarEntityMapper(mockRingEntityMapper, mockSystemEntityMapper); } - - + + @Test public void testMap_givenDto_shouldReturnDomainObject() { - StarEntity entity = MybatisStarEntity.builder() + MybatisStarEntity entity = MybatisStarEntity.builder() .id(UUID.randomUUID()) .absoluteMagnitude(12345.5) .age(12345L) @@ -59,7 +54,7 @@ public void testMap_givenDto_shouldReturnDomainObject() { .odyssey(true) .estimatedScanValue(987.5) .build(); - + Star result = underTest.map(entity); assertThat(result.id(), equalTo(entity.getId())); @@ -83,7 +78,7 @@ public void testMap_givenDto_shouldReturnDomainObject() { assertThat(result.odyssey(), equalTo(entity.getOdyssey())); assertThat(result.estimatedScanValue(), equalTo(entity.getEstimatedScanValue())); } - + @Test public void testMap_givenDomainObject_shouldReturnEntity() { Star object = Star.builder() @@ -108,8 +103,8 @@ public void testMap_givenDomainObject_shouldReturnEntity() { .odyssey(true) .estimatedScanValue(987.5) .build(); - - StarEntity result = underTest.map(object); + + MybatisStarEntity result = underTest.map(object); assertThat(result.getId(), equalTo(object.id())); assertThat(result.getAbsoluteMagnitude(), equalTo(object.absoluteMagnitude())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceEntityMapperTest.java index 12497233..f223e652 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationArrivalDistanceEntityMapperTest.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationArrivalDistanceRequestEntity; import io.edpn.backend.exploration.application.domain.StationArrivalDistanceRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationArrivalDistanceRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationArrivalDistanceRequestEntityMapper; import io.edpn.backend.util.Module; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,32 +9,33 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; + class MybatisStationArrivalDistanceEntityMapperTest { - - private StationArrivalDistanceRequestEntityMapper underTest; - + + private MybatisStationArrivalDistanceRequestEntityMapper underTest; + @BeforeEach public void setUp() { underTest = new MybatisStationArrivalDistanceRequestEntityMapper(); } - + @Test public void testMap_givenDto_shouldReturnDomainObject() { - StationArrivalDistanceRequestEntity dto = new MybatisStationArrivalDistanceRequestEntity("systemName", "stationName", mock(Module.class)); - + MybatisStationArrivalDistanceRequestEntity dto = new MybatisStationArrivalDistanceRequestEntity("systemName", "stationName", mock(Module.class)); + StationArrivalDistanceRequest result = underTest.map(dto); - + assertThat(result.systemName(), equalTo(dto.getSystemName())); assertThat(result.stationName(), equalTo(dto.getStationName())); assertThat(result.requestingModule(), equalTo(dto.getRequestingModule())); } - + @Test public void testMap_givenDomainObject_shouldReturnEntity() { StationArrivalDistanceRequest domainObject = new StationArrivalDistanceRequest("systemName", "stationName", mock(Module.class)); - - StationArrivalDistanceRequestEntity result = underTest.map(domainObject); - + + MybatisStationArrivalDistanceRequestEntity result = underTest.map(domainObject); + assertThat(result.getSystemName(), equalTo(domainObject.systemName())); assertThat(result.getStationName(), equalTo(domainObject.stationName())); assertThat(result.getRequestingModule(), equalTo(domainObject.requestingModule())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapperTest.java index 3bc6b148..a9fdc2ec 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapperTest.java @@ -5,9 +5,6 @@ import io.edpn.backend.exploration.application.domain.LandingPadSize; import io.edpn.backend.exploration.application.domain.Station; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationEntityMapper; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,8 +26,8 @@ class MybatisStationEntityMapperTest { @Mock - private SystemEntityMapper systemEntityMapper; - private StationEntityMapper underTest; + private MybatisSystemEntityMapper systemEntityMapper; + private MybatisStationEntityMapper underTest; @BeforeEach public void setUp() { @@ -49,7 +46,7 @@ public void testMap_givenStationEntity_shouldReturnStation() { LandingPadSize.SMALL, 3 ); - StationEntity stationEntity = new MybatisStationEntity( + MybatisStationEntity stationEntity = new MybatisStationEntity( stationId, 123L, "stationName", @@ -65,7 +62,7 @@ public void testMap_givenStationEntity_shouldReturnStation() { "economy1", 0.1, "economy2", 0.9 ), - "economy2", + "economy2", List.of("service1", "service2"), "government", true, @@ -128,7 +125,7 @@ public void testMap_givenStation_shouldReturnStationEntity() { ); - StationEntity result = underTest.map(station); + MybatisStationEntity result = underTest.map(station); assertThat(result.getId(), equalTo(station.id())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapperTest.java index a012e10c..b630f105 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationMaxLandingPadSizeRequestEntityMapperTest.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationMaxLandingPadSizeRequestEntity; import io.edpn.backend.exploration.application.domain.StationMaxLandingPadSizeRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.StationMaxLandingPadSizeRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationMaxLandingPadSizeRequestEntityMapper; import io.edpn.backend.util.Module; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,7 +12,7 @@ class MybatisStationMaxLandingPadSizeRequestEntityMapperTest { - private StationMaxLandingPadSizeRequestEntityMapper underTest; + private MybatisStationMaxLandingPadSizeRequestEntityMapper underTest; @BeforeEach public void setUp() { @@ -24,7 +22,7 @@ public void setUp() { @Test public void testMap_givenDto_shouldReturnDomainObject() { - StationMaxLandingPadSizeRequestEntity dto = new MybatisStationMaxLandingPadSizeRequestEntity("systemName", "stationName", mock(Module.class)); + MybatisStationMaxLandingPadSizeRequestEntity dto = new MybatisStationMaxLandingPadSizeRequestEntity("systemName", "stationName", mock(Module.class)); StationMaxLandingPadSizeRequest result = underTest.map(dto); @@ -38,10 +36,10 @@ public void testMap_givenDto_shouldReturnDomainObject() { @Test public void testMap_givenDomainObject_shouldReturnEntity() { - StationMaxLandingPadSizeRequest domainObject = new StationMaxLandingPadSizeRequest("systemName", "stationName",mock(Module.class)); + StationMaxLandingPadSizeRequest domainObject = new StationMaxLandingPadSizeRequest("systemName", "stationName", mock(Module.class)); - StationMaxLandingPadSizeRequestEntity result = underTest.map(domainObject); + MybatisStationMaxLandingPadSizeRequestEntity result = underTest.map(domainObject); assertThat(result.getSystemName(), equalTo(domainObject.systemName())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapperTest.java index b5746a02..e13ce235 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemCoordinateRequestEntityMapperTest.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemCoordinateRequestEntity; import io.edpn.backend.exploration.application.domain.SystemCoordinateRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemCoordinateRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemCoordinateRequestEntityMapper; import io.edpn.backend.util.Module; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,7 +12,7 @@ class MybatisSystemCoordinateRequestEntityMapperTest { - private SystemCoordinateRequestEntityMapper underTest; + private MybatisSystemCoordinateRequestEntityMapper underTest; @BeforeEach public void setUp() { @@ -24,7 +22,7 @@ public void setUp() { @Test public void testMap_givenDto_shouldReturnDomainObject() { - SystemCoordinateRequestEntity dto = new MybatisSystemCoordinateRequestEntity("systemName", mock(Module.class)); + MybatisSystemCoordinateRequestEntity dto = new MybatisSystemCoordinateRequestEntity("systemName", mock(Module.class)); SystemCoordinateRequest result = underTest.map(dto); @@ -40,7 +38,7 @@ public void testMap_givenDomainObject_shouldReturnEntity() { SystemCoordinateRequest domainObject = new SystemCoordinateRequest("systemName", mock(Module.class)); - SystemCoordinateRequestEntity result = underTest.map(domainObject); + MybatisSystemCoordinateRequestEntity result = underTest.map(domainObject); assertThat(result.getSystemName(), equalTo(domainObject.systemName())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapperTest.java index a11868e1..263f4c28 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEliteIdRequestEntityMapperTest.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEliteIdRequestEntity; import io.edpn.backend.exploration.application.domain.SystemEliteIdRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEliteIdRequestEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEliteIdRequestEntityMapper; import io.edpn.backend.util.Module; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,7 +12,7 @@ class MybatisSystemEliteIdRequestEntityMapperTest { - private SystemEliteIdRequestEntityMapper underTest; + private MybatisSystemEliteIdRequestEntityMapper underTest; @BeforeEach public void setUp() { @@ -24,7 +22,7 @@ public void setUp() { @Test public void testMap_givenDto_shouldReturnDomainObject() { - SystemEliteIdRequestEntity dto = new MybatisSystemEliteIdRequestEntity("systemName", mock(Module.class)); + MybatisSystemEliteIdRequestEntity dto = new MybatisSystemEliteIdRequestEntity("systemName", mock(Module.class)); SystemEliteIdRequest result = underTest.map(dto); @@ -40,7 +38,7 @@ public void testMap_givenDomainObject_shouldReturnEntity() { SystemEliteIdRequest domainObject = new SystemEliteIdRequest("systemName", mock(Module.class)); - SystemEliteIdRequestEntity result = underTest.map(domainObject); + MybatisSystemEliteIdRequestEntity result = underTest.map(domainObject); assertThat(result.getSystemName(), equalTo(domainObject.systemName())); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapperTest.java index 800ef034..405fd56d 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/entity/mapper/MybatisSystemEntityMapperTest.java @@ -3,8 +3,6 @@ import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; import io.edpn.backend.exploration.application.domain.Coordinate; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.SystemEntity; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -17,7 +15,7 @@ class MybatisSystemEntityMapperTest { - private SystemEntityMapper underTest; + private MybatisSystemEntityMapper underTest; @BeforeEach public void setUp() { @@ -26,7 +24,7 @@ public void setUp() { @Test public void testMap_givenSystemEntity_shouldReturnSystem() { - SystemEntity systemEntity = new MybatisSystemEntity(UUID.randomUUID(), "systemName", 123L, "starClass", 1.0, 2.0, 3.0); + MybatisSystemEntity systemEntity = new MybatisSystemEntity(UUID.randomUUID(), "systemName", 123L, "starClass", 1.0, 2.0, 3.0); System result = underTest.map(systemEntity); @@ -47,7 +45,7 @@ public void testMap_givenSystem_shouldReturnSystemEntity() { System system = new System(UUID.randomUUID(), 123L, "systemName", "starClass", coordinate); - SystemEntity result = underTest.map(system); + MybatisSystemEntity result = underTest.map(system); assertThat(result.getId(), equalTo(system.id())); @@ -62,7 +60,7 @@ public void testMap_givenSystem_shouldReturnSystemEntity() { @Test public void testMap_givenSystemEntityWithNullCoordinate_shouldReturnSystemWithNullCoordinate() { - SystemEntity systemEntity = new MybatisSystemEntity(UUID.randomUUID(), "systemName", 123L, "starClass", null, null, null); + MybatisSystemEntity systemEntity = new MybatisSystemEntity(UUID.randomUUID(), "systemName", 123L, "starClass", null, null, null); System result = underTest.map(systemEntity); @@ -80,7 +78,7 @@ public void testMap_givenSystemWithNullCoordinate_shouldReturnSystemEntityWithNu System system = new System(UUID.randomUUID(), 123L, "systemName", "starClass", null); - SystemEntity result = underTest.map(system); + MybatisSystemEntity result = underTest.map(system); assertThat(result.getXCoordinate(), nullValue()); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/ring/SaveOrUpdateRingPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/ring/SaveOrUpdateRingPortTest.java index f25be51a..139d7d33 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/ring/SaveOrUpdateRingPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/ring/SaveOrUpdateRingPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisRingRepository; import io.edpn.backend.exploration.adapter.persistence.RingRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisRingEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisRingEntityMapper; import io.edpn.backend.exploration.application.domain.Ring; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.RingEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.ring.SaveOrUpdateRingPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,31 +22,31 @@ public class SaveOrUpdateRingPortTest { @Mock private MybatisRingRepository mybatisRingRepository; - + @Mock - private RingEntityMapper ringEntityMapper; - + private MybatisRingEntityMapper ringEntityMapper; + private SaveOrUpdateRingPort underTest; - + @BeforeEach void setUp() { underTest = new RingRepository(mybatisRingRepository, ringEntityMapper); } - + @Test void save_shouldUpdateAndLoad() { - + Ring ring = mock(Ring.class); MybatisRingEntity entity = mock(MybatisRingEntity.class); Ring loaded = mock(Ring.class); when(ringEntityMapper.map(ring)).thenReturn(entity); when(mybatisRingRepository.insertOrUpdateOnConflict(any())).thenReturn(entity); when(ringEntityMapper.map(entity)).thenReturn(loaded); - - + + Ring result = underTest.saveOrUpdate(ring); - - + + assertThat(result, is(loaded)); } } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/star/SaveOrUpdateStarPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/star/SaveOrUpdateStarPortTest.java index ce5e0606..528cba89 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/star/SaveOrUpdateStarPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/star/SaveOrUpdateStarPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisStarRepository; import io.edpn.backend.exploration.adapter.persistence.StarRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStarEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStarEntityMapper; import io.edpn.backend.exploration.application.domain.Star; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StarEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.star.SaveOrUpdateStarPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -23,31 +23,31 @@ public class SaveOrUpdateStarPortTest { @Mock private MybatisStarRepository mybatisStarRepository; - + @Mock - private StarEntityMapper starEntityMapper; - + private MybatisStarEntityMapper starEntityMapper; + private SaveOrUpdateStarPort underTest; - + @BeforeEach void setUp() { underTest = new StarRepository(mybatisStarRepository, starEntityMapper); } - + @Test void save_shouldUpdateAndLoad() { - + Star star = mock(Star.class); MybatisStarEntity entity = mock(MybatisStarEntity.class); Star loaded = mock(Star.class); when(starEntityMapper.map(star)).thenReturn(entity); when(mybatisStarRepository.insertOrUpdateOnConflict(any())).thenReturn(entity); when(starEntityMapper.map(entity)).thenReturn(loaded); - - + + Star result = underTest.saveOrUpdate(star); - - + + assertThat(result, is(loaded)); } } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/LoadStationPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/LoadStationPortTest.java index 1203987a..a557eb47 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/LoadStationPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/LoadStationPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisStationRepository; import io.edpn.backend.exploration.adapter.persistence.StationRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStationEntityMapper; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.station.LoadStationPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ class LoadStationPortTest { private MybatisStationRepository mybatisStationRepository; @Mock - private StationEntityMapper systemEntityMapper; + private MybatisStationEntityMapper systemEntityMapper; private LoadStationPort underTest; diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/SaveOrUpdateStationPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/SaveOrUpdateStationPortTest.java index e4d2838d..f9bde08d 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/SaveOrUpdateStationPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/station/SaveOrUpdateStationPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisStationRepository; import io.edpn.backend.exploration.adapter.persistence.StationRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisStationEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisStationEntityMapper; import io.edpn.backend.exploration.application.domain.Station; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.station.SaveOrUpdateStationPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -23,31 +23,31 @@ public class SaveOrUpdateStationPortTest { @Mock private MybatisStationRepository mybatisStationRepository; - + @Mock - private StationEntityMapper starEntityMapper; - + private MybatisStationEntityMapper starEntityMapper; + private SaveOrUpdateStationPort underTest; - + @BeforeEach void setUp() { underTest = new StationRepository(mybatisStationRepository, starEntityMapper); } - + @Test void save_shouldUpdateAndLoad() { - + Station star = mock(Station.class); MybatisStationEntity entity = mock(MybatisStationEntity.class); Station loaded = mock(Station.class); when(starEntityMapper.map(star)).thenReturn(entity); when(mybatisStationRepository.insertOrUpdateOnConflict(any())).thenReturn(entity); when(starEntityMapper.map(entity)).thenReturn(loaded); - - + + Station result = underTest.saveOrUpdate(star); - - + + assertThat(result, is(loaded)); } } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemPortTest.java index 87ce30cd..11cb815f 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisSystemRepository; import io.edpn.backend.exploration.adapter.persistence.SystemRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemEntityMapper; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ class LoadSystemPortTest { private MybatisSystemRepository mybatisSystemRepository; @Mock - private SystemEntityMapper systemEntityMapper; + private MybatisSystemEntityMapper systemEntityMapper; private LoadSystemPort underTest; diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemsByNameContainingPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemsByNameContainingPortTest.java index 529e80f3..540a8ede 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemsByNameContainingPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/LoadSystemsByNameContainingPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisSystemRepository; import io.edpn.backend.exploration.adapter.persistence.SystemRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemEntityMapper; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemsByNameContainingPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ class LoadSystemsByNameContainingPortTest { private MybatisSystemRepository mybatisSystemRepository; @Mock - private SystemEntityMapper systemEntityMapper; + private MybatisSystemEntityMapper systemEntityMapper; private LoadSystemsByNameContainingPort underTest; diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/SaveOrUpdateSystemPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/SaveOrUpdateSystemPortTest.java index f0c3d452..0b8245d8 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/SaveOrUpdateSystemPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/persistence/system/SaveOrUpdateSystemPortTest.java @@ -3,8 +3,8 @@ import io.edpn.backend.exploration.adapter.persistence.MybatisSystemRepository; import io.edpn.backend.exploration.adapter.persistence.SystemRepository; import io.edpn.backend.exploration.adapter.persistence.entity.MybatisSystemEntity; +import io.edpn.backend.exploration.adapter.persistence.entity.mapper.MybatisSystemEntityMapper; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEntityMapper; import io.edpn.backend.exploration.application.port.outgoing.system.SaveOrUpdateSystemPort; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ class SaveOrUpdateSystemPortTest { private MybatisSystemRepository mybatisSystemRepository; @Mock - private SystemEntityMapper systemEntityMapper; + private MybatisSystemEntityMapper systemEntityMapper; private SaveOrUpdateSystemPort underTest; diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/SystemControllerPortTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/SystemControllerPortTest.java index 77150cd6..25efc099 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/SystemControllerPortTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/SystemControllerPortTest.java @@ -1,6 +1,8 @@ package io.edpn.backend.exploration.adapter.web; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; +import io.edpn.backend.exploration.adapter.web.dto.RestSystemDto; +import io.edpn.backend.exploration.adapter.web.dto.mapper.RestSystemDtoMapper; +import io.edpn.backend.exploration.application.domain.System; import io.edpn.backend.exploration.application.port.incomming.FindSystemsByNameContainingUseCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,7 +13,7 @@ import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.contains; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -25,12 +27,14 @@ public class SystemControllerPortTest { private FindSystemsByNameContainingUseCase findSystemsByNameContainingUseCase; @Mock private FindSystemsByNameContainingInputValidator findSystemsByNameContainingInputValidator; + @Mock + private RestSystemDtoMapper restSystemDtoMapper; private SystemController underTest; @BeforeEach void setUp() { - underTest = new SystemController(findSystemsByNameContainingUseCase, findSystemsByNameContainingInputValidator); + underTest = new SystemController(findSystemsByNameContainingUseCase, findSystemsByNameContainingInputValidator, restSystemDtoMapper); } @Test @@ -62,17 +66,17 @@ public void testFindSystemsFromSearchBar_shouldThrowOnInvalidAmount() { @Test public void testFindSystemsFromSearchBar_shouldReturnSystems() { - String subString = "test"; int amount = 10; - SystemDto systemDto = mock(SystemDto.class); - List expectedSystems = List.of(systemDto); + System system = mock(System.class); + RestSystemDto restSystemDto = mock(RestSystemDto.class); + List expectedSystems = List.of(system); when(findSystemsByNameContainingUseCase.findSystemsByNameContaining(subString, amount)).thenReturn(expectedSystems); + when(restSystemDtoMapper.map(system)).thenReturn(restSystemDto); - List actualSystems = underTest.findByNameContaining(subString, amount); - + List actualSystems = underTest.findByNameContaining(subString, amount); - assertThat(actualSystems, is(expectedSystems)); + assertThat(actualSystems, contains(restSystemDto)); verify(findSystemsByNameContainingUseCase).findSystemsByNameContaining(subString, amount); } } \ No newline at end of file diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestRestSystemDtoMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestRestSystemDtoMapperTest.java index 705cf09c..09c8ef8b 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestRestSystemDtoMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/web/dto/mapper/RestRestSystemDtoMapperTest.java @@ -1,9 +1,8 @@ package io.edpn.backend.exploration.adapter.web.dto.mapper; +import io.edpn.backend.exploration.adapter.web.dto.RestSystemDto; import io.edpn.backend.exploration.application.domain.Coordinate; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.SystemDtoMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,7 +15,7 @@ class RestRestSystemDtoMapperTest { - private SystemDtoMapper underTest; + private RestSystemDtoMapper underTest; @BeforeEach void setUp() { @@ -25,7 +24,7 @@ void setUp() { @Test void testMap_systemWithCoordinate_shouldReturnMappedSystemDto() { - + UUID id = UUID.fromString("b85e6a0c-bc0f-447e-812e-9adf3b63cda9"); String name = "system"; Long eliteId = 123L; @@ -37,7 +36,7 @@ void testMap_systemWithCoordinate_shouldReturnMappedSystemDto() { System system = new System(id, eliteId, name, starClass, coordinate); - SystemDto result = underTest.map(system); + RestSystemDto result = underTest.map(system); assertThat(result.name(), equalTo(name)); @@ -51,7 +50,7 @@ void testMap_systemWithCoordinate_shouldReturnMappedSystemDto() { @Test void testMap_systemWithoutCoordinate_shouldReturnMappedSystemDtoWithNullCoordinate() { - + UUID id = UUID.fromString("b85e6a0c-bc0f-447e-812e-9adf3b63cda9"); String name = "system"; Long eliteId = 123L; @@ -59,7 +58,7 @@ void testMap_systemWithoutCoordinate_shouldReturnMappedSystemDtoWithNullCoordina System system = new System(id, eliteId, name, starClass, null); - SystemDto result = underTest.map(system); + RestSystemDto result = underTest.map(system); assertThat(result.name(), equalTo(name)); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponseTest.java similarity index 78% rename from exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapperTest.java rename to exploration-module/src/test/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponseTest.java index c9872e4e..a36c25e3 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationArrivalDistanceResponseMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationArrivalDistanceResponseTest.java @@ -1,9 +1,7 @@ -package io.edpn.backend.exploration.adapter.kafka.dto.mapper; +package io.edpn.backend.exploration.application.domain.intermodulecommunication; import io.edpn.backend.exploration.application.domain.Station; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -18,9 +16,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class KafkaStationArrivalDistanceResponseMapperTest { - - private KafkaStationArrivalDistanceResponseMapper underTest; +class StationArrivalDistanceResponseTest { public static Stream map_shouldReturnCorrectStationArrivalDistanceResponseTestCases() { return Stream.of( @@ -35,11 +31,6 @@ public static Stream map_shouldReturnCorrectStationArrivalDistanceRes ); } - @BeforeEach - void setUp() { - underTest = new KafkaStationArrivalDistanceResponseMapper(); - } - @ParameterizedTest @MethodSource("map_shouldReturnCorrectStationArrivalDistanceResponseTestCases") void map_shouldReturnCorrectStationArrivalDistanceResponse(Double arrivalDistance, Double expectedArrivalDistance) { @@ -52,7 +43,7 @@ void map_shouldReturnCorrectStationArrivalDistanceResponse(Double arrivalDistanc when(station.name()).thenReturn(stationName); when(station.distanceFromStar()).thenReturn(arrivalDistance); - StationArrivalDistanceResponse result = underTest.map(station); + StationArrivalDistanceResponse result = StationArrivalDistanceResponse.from(station); assertThat(result.systemName(), is(systemName)); assertThat(result.stationName(), is(stationName)); diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapperTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponseTest.java similarity index 84% rename from exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapperTest.java rename to exploration-module/src/test/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponseTest.java index 3a8976be..2d00c33b 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/adapter/kafka/dto/mapper/KafkaStationMaxLandingPadSizeResponseMapperTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponseTest.java @@ -1,11 +1,8 @@ -package io.edpn.backend.exploration.adapter.kafka.dto.mapper; +package io.edpn.backend.exploration.application.domain.intermodulecommunication; import io.edpn.backend.exploration.application.domain.LandingPadSize; import io.edpn.backend.exploration.application.domain.Station; import io.edpn.backend.exploration.application.domain.System; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.StationMaxLandingPadSizeResponseMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -21,9 +18,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class KafkaStationMaxLandingPadSizeResponseMapperTest { - - private StationMaxLandingPadSizeResponseMapper underTest; +class StationMaxLandingPadSizeResponseTest { public static Stream map_shouldReturnCorrectStationMaxLandingPadSizeResponseTestCases() { return Stream.of( @@ -69,11 +64,6 @@ public static Stream map_shouldReturnCorrectStationMaxLandingPadSizeR )); } - @BeforeEach - void setUp() { - underTest = new KafkaStationMaxLandingPadSizeResponseMapper(); - } - @ParameterizedTest @MethodSource("map_shouldReturnCorrectStationMaxLandingPadSizeResponseTestCases") void map_shouldReturnCorrectStationMaxLandingPadSizeResponse(Map landingPads, String expectedMaxLandingPadSize) { @@ -87,7 +77,7 @@ void map_shouldReturnCorrectStationMaxLandingPadSizeResponse(Map runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); - Station mockStation = mock(Station.class); - when(loadStationPort.load(systemName, stationName)).thenReturn(Optional.of(mockStation)); - StationMaxLandingPadSizeResponse mockStationMaxLandingPadSizeResponse = mock(StationMaxLandingPadSizeResponse.class); - when(stationMaxLandingPadSizeResponseMapper.map(mockStation)).thenReturn(mockStationMaxLandingPadSizeResponse); - when(objectMapper.writeValueAsString(mockStationMaxLandingPadSizeResponse)).thenReturn("JSON_STRING"); - Message kafkaMessage = new Message("module_stationMaxLandingPadSizeResponse", "JSON_STRING"); - MessageDto messageDto = mock(MessageDto.class); - when(messageMapper.map(kafkaMessage)).thenReturn(messageDto); - when(sendMessagePort.send(messageDto)).thenReturn(true); - doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); - - underTest.sendResponsesForStation(systemName, stationName); - - verify(executorService).submit(runnableArgumentCaptor.capture()); - - // Verify runnable - runnableArgumentCaptor.getAllValues().forEach(Runnable::run); - verify(sendMessagePort).send(messageDto); - verify(deleteStationMaxLandingPadSizeRequestPort).delete(systemName, stationName, module); + try (MockedStatic stationMaxLandingPadSizeResponseMockedStatic = mockStatic(StationMaxLandingPadSizeResponse.class)) { + String systemName = "systemName"; + String stationName = "stationName"; + Module module = mock(Module.class); + when(module.getName()).thenReturn("module"); + StationMaxLandingPadSizeRequest request1 = mock(StationMaxLandingPadSizeRequest.class); + when(request1.requestingModule()).thenReturn(module); + when(loadStationMaxLandingPadSizeRequestByIdentifierPort.loadByIdentifier(systemName, stationName)).thenReturn(List.of(request1)); + ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); + Station mockStation = mock(Station.class); + when(loadStationPort.load(systemName, stationName)).thenReturn(Optional.of(mockStation)); + StationMaxLandingPadSizeResponse mockStationMaxLandingPadSizeResponse = mock(StationMaxLandingPadSizeResponse.class); + stationMaxLandingPadSizeResponseMockedStatic.when(() -> StationMaxLandingPadSizeResponse.from(mockStation)).thenReturn(mockStationMaxLandingPadSizeResponse); + when(objectMapper.writeValueAsString(mockStationMaxLandingPadSizeResponse)).thenReturn("JSON_STRING"); + Message message = new Message("module_stationMaxLandingPadSizeResponse", "JSON_STRING"); + when(sendMessagePort.send(message)).thenReturn(true); + doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); + + underTest.sendResponsesForStation(systemName, stationName); + + verify(executorService).submit(runnableArgumentCaptor.capture()); + + // Verify runnable + runnableArgumentCaptor.getAllValues().forEach(Runnable::run); + verify(sendMessagePort).send(message); + verify(deleteStationMaxLandingPadSizeRequestPort).delete(systemName, stationName, module); + } } @SneakyThrows @@ -127,32 +120,31 @@ void onEvent_shouldThrowErrorWhenStationNotFound() { @SneakyThrows @Test void onEvent_shouldNotDeleteRequestWhenSendFails() { - String systemName = "systemName"; - String stationName = "stationName"; - StationMaxLandingPadSizeRequest request1 = mock(StationMaxLandingPadSizeRequest.class); - Module module = mock(Module.class); - when(module.getName()).thenReturn("module"); - when(request1.requestingModule()).thenReturn(module); - when(loadStationMaxLandingPadSizeRequestByIdentifierPort.loadByIdentifier(systemName, stationName)).thenReturn(List.of(request1)); - ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); - Station mockStation = mock(Station.class); - when(loadStationPort.load(systemName, stationName)).thenReturn(Optional.of(mockStation)); - StationMaxLandingPadSizeResponse mockStationMaxLandingPadSizeResponse = mock(StationMaxLandingPadSizeResponse.class); - when(stationMaxLandingPadSizeResponseMapper.map(mockStation)).thenReturn(mockStationMaxLandingPadSizeResponse); - when(objectMapper.writeValueAsString(mockStationMaxLandingPadSizeResponse)).thenReturn("JSON_STRING"); - Message kafkaMessage = new Message("module_stationMaxLandingPadSizeResponse", "JSON_STRING"); - MessageDto messageDto = mock(MessageDto.class); - when(messageMapper.map(kafkaMessage)).thenReturn(messageDto); - when(sendMessagePort.send(messageDto)).thenReturn(false); - doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); - - underTest.sendResponsesForStation(systemName, stationName); - - verify(executorService).submit(runnableArgumentCaptor.capture()); - - // Verify runnable - runnableArgumentCaptor.getAllValues().forEach(Runnable::run); - verify(sendMessagePort).send(messageDto); - verify(deleteStationMaxLandingPadSizeRequestPort, never()).delete(systemName, stationName, module); + try (MockedStatic stationMaxLandingPadSizeResponseMockedStatic = mockStatic(StationMaxLandingPadSizeResponse.class)) { + String systemName = "systemName"; + String stationName = "stationName"; + StationMaxLandingPadSizeRequest request1 = mock(StationMaxLandingPadSizeRequest.class); + Module module = mock(Module.class); + when(module.getName()).thenReturn("module"); + when(request1.requestingModule()).thenReturn(module); + when(loadStationMaxLandingPadSizeRequestByIdentifierPort.loadByIdentifier(systemName, stationName)).thenReturn(List.of(request1)); + ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); + Station mockStation = mock(Station.class); + when(loadStationPort.load(systemName, stationName)).thenReturn(Optional.of(mockStation)); + StationMaxLandingPadSizeResponse mockStationMaxLandingPadSizeResponse = mock(StationMaxLandingPadSizeResponse.class); + stationMaxLandingPadSizeResponseMockedStatic.when(() -> StationMaxLandingPadSizeResponse.from(mockStation)).thenReturn(mockStationMaxLandingPadSizeResponse); + when(objectMapper.writeValueAsString(mockStationMaxLandingPadSizeResponse)).thenReturn("JSON_STRING"); + Message message = new Message("module_stationMaxLandingPadSizeResponse", "JSON_STRING"); + when(sendMessagePort.send(message)).thenReturn(false); + doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); + + underTest.sendResponsesForStation(systemName, stationName); + + verify(executorService).submit(runnableArgumentCaptor.capture()); + + // Verify runnable + runnableArgumentCaptor.getAllValues().forEach(Runnable::run); + verify(deleteStationMaxLandingPadSizeRequestPort, never()).delete(systemName, stationName, module); + } } } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemControllerServiceTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemControllerServiceTest.java index 9e22f16d..e6a2d6df 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemControllerServiceTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemControllerServiceTest.java @@ -2,8 +2,6 @@ import io.edpn.backend.exploration.application.domain.System; import io.edpn.backend.exploration.application.domain.exception.ValidationException; -import io.edpn.backend.exploration.application.dto.web.object.SystemDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.SystemDtoMapper; import io.edpn.backend.exploration.application.port.incomming.FindSystemsByNameContainingUseCase; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemsByNameContainingPort; import io.edpn.backend.exploration.application.validation.LoadByNameContainingValidator; @@ -21,7 +19,6 @@ import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; @@ -32,14 +29,12 @@ class SystemControllerServiceTest { private LoadSystemsByNameContainingPort loadSystemsByNameContainingPort; @Mock private LoadByNameContainingValidator loadByNameContainingValidator; - @Mock - private SystemDtoMapper systemDtoMapper; private FindSystemsByNameContainingUseCase underTest; @BeforeEach void setUp() { - underTest = new SystemControllerService(loadSystemsByNameContainingPort, loadByNameContainingValidator, systemDtoMapper); + underTest = new SystemControllerService(loadSystemsByNameContainingPort, loadByNameContainingValidator); } @Test @@ -51,8 +46,7 @@ void testFindSystemsFromSearchBar_shouldThrowOnValidationError() { assertThrows(ValidationException.class, () -> underTest.findSystemsByNameContaining(subString, amount)); - verify(loadByNameContainingValidator).validate(subString, amount); - verifyNoInteractions(loadSystemsByNameContainingPort, systemDtoMapper); + verifyNoInteractions(loadSystemsByNameContainingPort); } @Test @@ -62,21 +56,12 @@ void testFindSystemsFromSearchBar_shouldReturnListOfSystemDto() { int amount = 10; System system1 = mock(System.class); System system2 = mock(System.class); - SystemDto systemDto1 = mock(SystemDto.class); - SystemDto systemDto2 = mock(SystemDto.class); when(loadByNameContainingValidator.validate(subString, amount)).thenReturn(Optional.empty()); when(loadSystemsByNameContainingPort.loadByNameContaining(subString, amount)).thenReturn(List.of(system1, system2)); - when(systemDtoMapper.map(system1)).thenReturn(systemDto1); - when(systemDtoMapper.map(system2)).thenReturn(systemDto2); - - - List result = underTest.findSystemsByNameContaining(subString, amount); + List result = underTest.findSystemsByNameContaining(subString, amount); - verify(loadSystemsByNameContainingPort).loadByNameContaining(subString, amount); - verify(systemDtoMapper).map(system1); - verify(systemDtoMapper).map(system2); assertThat(result, hasSize(2)); - assertThat(result, containsInAnyOrder(systemDto1, systemDto2)); + assertThat(result, containsInAnyOrder(system1, system2)); } } \ No newline at end of file diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderTest.java index 62af1fba..7316034d 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemCoordinatesResponseSenderTest.java @@ -4,15 +4,12 @@ import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.domain.System; import io.edpn.backend.exploration.application.domain.SystemCoordinateRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemCoordinatesResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemCoordinatesResponse; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.DeleteSystemCoordinateRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.LoadSystemCoordinateRequestByIdentifierPort; import io.edpn.backend.exploration.application.port.outgoing.systemcoordinaterequest.SystemCoordinatesResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; import io.edpn.backend.util.Module; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; @@ -20,6 +17,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; +import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.retry.RetryCallback; import org.springframework.retry.support.RetryTemplate; @@ -31,6 +29,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -47,10 +46,6 @@ class SystemCoordinatesResponseSenderTest { @Mock private SendMessagePort sendMessagePort; @Mock - private SystemCoordinatesResponseMapper systemCoordinatesResponseMapper; - @Mock - private MessageDtoMapper messageMapper; - @Mock private ObjectMapper objectMapper; @Mock private RetryTemplate retryTemplate; @@ -66,8 +61,6 @@ void setUp() { loadSystemCoordinateRequestBySystemNamePort, deleteSystemCoordinateRequestPort, sendMessagePort, - systemCoordinatesResponseMapper, - messageMapper, objectMapper, retryTemplate, executorService); @@ -76,32 +69,31 @@ void setUp() { @SneakyThrows @Test void onEvent_shouldProcessPendingRequest() { - String systemName = "systemName"; - Module module = mock(Module.class); - when(module.getName()).thenReturn("module"); - SystemCoordinateRequest request1 = mock(SystemCoordinateRequest.class); - when(request1.requestingModule()).thenReturn(module); - when(loadSystemCoordinateRequestBySystemNamePort.loadByIdentifier(systemName)).thenReturn(List.of(request1)); - ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); - System mockSystem = mock(System.class); - when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); - SystemCoordinatesResponse mockSystemCoordinatesResponse = mock(SystemCoordinatesResponse.class); - when(systemCoordinatesResponseMapper.map(mockSystem)).thenReturn(mockSystemCoordinatesResponse); - when(objectMapper.writeValueAsString(mockSystemCoordinatesResponse)).thenReturn("JSON_STRING"); - Message coordinateKafkaMessage = new Message("module_systemCoordinatesResponse", "JSON_STRING"); - MessageDto coordinateMessageDto = mock(MessageDto.class); - when(messageMapper.map(coordinateKafkaMessage)).thenReturn(coordinateMessageDto); - when(sendMessagePort.send(coordinateMessageDto)).thenReturn(true); - doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); - - underTest.sendResponsesForSystem(systemName); - - verify(executorService).submit(runnableArgumentCaptor.capture()); - - // Verify runnable - runnableArgumentCaptor.getAllValues().forEach(Runnable::run); - verify(sendMessagePort).send(coordinateMessageDto); - verify(deleteSystemCoordinateRequestPort).delete(systemName, module); + try (MockedStatic systemCoordinatesResponseMockedStatic = mockStatic(SystemCoordinatesResponse.class)) { + String systemName = "systemName"; + Module module = mock(Module.class); + when(module.getName()).thenReturn("module"); + SystemCoordinateRequest request1 = mock(SystemCoordinateRequest.class); + when(request1.requestingModule()).thenReturn(module); + when(loadSystemCoordinateRequestBySystemNamePort.loadByIdentifier(systemName)).thenReturn(List.of(request1)); + ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); + System mockSystem = mock(System.class); + when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); + SystemCoordinatesResponse mockSystemCoordinatesResponse = mock(SystemCoordinatesResponse.class); + systemCoordinatesResponseMockedStatic.when(() -> SystemCoordinatesResponse.from(mockSystem)).thenReturn(mockSystemCoordinatesResponse); + when(objectMapper.writeValueAsString(mockSystemCoordinatesResponse)).thenReturn("JSON_STRING"); + Message message = new Message("module_systemCoordinatesResponse", "JSON_STRING"); + when(sendMessagePort.send(message)).thenReturn(true); + doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); + + underTest.sendResponsesForSystem(systemName); + + verify(executorService).submit(runnableArgumentCaptor.capture()); + + // Verify runnable + runnableArgumentCaptor.getAllValues().forEach(Runnable::run); + verify(deleteSystemCoordinateRequestPort).delete(systemName, module); + } } @SneakyThrows @@ -124,31 +116,31 @@ void onEvent_shouldDoNothingWhenSystemNotFound() { @SneakyThrows @Test void onEvent_shouldNotDeleteRequestWhenSendFails() { - String systemName = "systemName"; - SystemCoordinateRequest request1 = mock(SystemCoordinateRequest.class); - Module module = mock(Module.class); - when(module.getName()).thenReturn("module"); - when(request1.requestingModule()).thenReturn(module); - when(loadSystemCoordinateRequestBySystemNamePort.loadByIdentifier(systemName)).thenReturn(List.of(request1)); - ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); - System mockSystem = mock(System.class); - when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); - SystemCoordinatesResponse mockSystemCoordinatesResponse = mock(SystemCoordinatesResponse.class); - when(systemCoordinatesResponseMapper.map(mockSystem)).thenReturn(mockSystemCoordinatesResponse); - when(objectMapper.writeValueAsString(mockSystemCoordinatesResponse)).thenReturn("JSON_STRING"); - Message coordinateKafkaMessage = new Message("module_systemCoordinatesResponse", "JSON_STRING"); - MessageDto coordinateMessageDto = mock(MessageDto.class); - when(messageMapper.map(coordinateKafkaMessage)).thenReturn(coordinateMessageDto); - when(sendMessagePort.send(coordinateMessageDto)).thenReturn(false); - doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); - - underTest.sendResponsesForSystem(systemName); - - verify(executorService).submit(runnableArgumentCaptor.capture()); - - // Verify runnable - runnableArgumentCaptor.getAllValues().forEach(Runnable::run); - verify(sendMessagePort).send(coordinateMessageDto); - verify(deleteSystemCoordinateRequestPort, never()).delete(systemName, module); + try (MockedStatic systemCoordinatesResponseMockedStatic = mockStatic(SystemCoordinatesResponse.class)) { + String systemName = "systemName"; + SystemCoordinateRequest request1 = mock(SystemCoordinateRequest.class); + Module module = mock(Module.class); + when(module.getName()).thenReturn("module"); + when(request1.requestingModule()).thenReturn(module); + when(loadSystemCoordinateRequestBySystemNamePort.loadByIdentifier(systemName)).thenReturn(List.of(request1)); + ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); + System mockSystem = mock(System.class); + when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); + SystemCoordinatesResponse mockSystemCoordinatesResponse = mock(SystemCoordinatesResponse.class); + systemCoordinatesResponseMockedStatic.when(() -> SystemCoordinatesResponse.from(mockSystem)).thenReturn(mockSystemCoordinatesResponse); + when(objectMapper.writeValueAsString(mockSystemCoordinatesResponse)).thenReturn("JSON_STRING"); + Message message = new Message("module_systemCoordinatesResponse", "JSON_STRING"); + when(sendMessagePort.send(message)).thenReturn(false); + doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); + + underTest.sendResponsesForSystem(systemName); + + verify(executorService).submit(runnableArgumentCaptor.capture()); + + // Verify runnable + runnableArgumentCaptor.getAllValues().forEach(Runnable::run); + verify(sendMessagePort).send(message); + verify(deleteSystemCoordinateRequestPort, never()).delete(systemName, module); + } } } diff --git a/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderTest.java b/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderTest.java index 195799a4..c165a0a7 100644 --- a/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderTest.java +++ b/exploration-module/src/test/java/io/edpn/backend/exploration/application/service/SystemEliteIdResponseSenderTest.java @@ -4,15 +4,12 @@ import io.edpn.backend.exploration.application.domain.Message; import io.edpn.backend.exploration.application.domain.System; import io.edpn.backend.exploration.application.domain.SystemEliteIdRequest; -import io.edpn.backend.exploration.application.dto.persistence.entity.mapper.SystemEliteIdResponseMapper; -import io.edpn.backend.exploration.application.dto.web.object.MessageDto; -import io.edpn.backend.exploration.application.dto.web.object.mapper.MessageDtoMapper; +import io.edpn.backend.exploration.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.exploration.application.port.outgoing.message.SendMessagePort; import io.edpn.backend.exploration.application.port.outgoing.system.LoadSystemPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.DeleteSystemEliteIdRequestPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.LoadSystemEliteIdRequestByIdentifierPort; import io.edpn.backend.exploration.application.port.outgoing.systemeliteidrequest.SystemEliteIdResponseSender; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.util.Module; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; @@ -20,6 +17,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; +import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.retry.RetryCallback; import org.springframework.retry.support.RetryTemplate; @@ -31,6 +29,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -47,10 +46,6 @@ class SystemEliteIdResponseSenderTest { @Mock private SendMessagePort sendMessagePort; @Mock - private SystemEliteIdResponseMapper systemEliteIdResponseMapper; - @Mock - private MessageDtoMapper messageMapper; - @Mock private ObjectMapper objectMapper; @Mock private RetryTemplate retryTemplate; @@ -66,8 +61,6 @@ void setUp() { loadSystemEliteIdRequestBySystemNamePort, deleteSystemEliteIdRequestPort, sendMessagePort, - systemEliteIdResponseMapper, - messageMapper, objectMapper, retryTemplate, executorService); @@ -76,32 +69,31 @@ void setUp() { @SneakyThrows @Test void onEvent_shouldProcessPendingRequest() { - String systemName = "systemName"; - Module module = mock(Module.class); - when(module.getName()).thenReturn("module"); - SystemEliteIdRequest request1 = mock(SystemEliteIdRequest.class); - when(request1.requestingModule()).thenReturn(module); - when(loadSystemEliteIdRequestBySystemNamePort.loadByIdentifier(systemName)).thenReturn(List.of(request1)); - ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); - System mockSystem = mock(System.class); - when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); - SystemEliteIdResponse mockSystemEliteIdResponse = mock(SystemEliteIdResponse.class); - when(systemEliteIdResponseMapper.map(mockSystem)).thenReturn(mockSystemEliteIdResponse); - when(objectMapper.writeValueAsString(mockSystemEliteIdResponse)).thenReturn("JSON_STRING"); - Message coordinateKafkaMessage = new Message("module_systemEliteIdResponse", "JSON_STRING"); - MessageDto coordinateMessageDto = mock(MessageDto.class); - when(messageMapper.map(coordinateKafkaMessage)).thenReturn(coordinateMessageDto); - when(sendMessagePort.send(coordinateMessageDto)).thenReturn(true); - doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); - - underTest.sendResponsesForSystem(systemName); - - verify(executorService).submit(runnableArgumentCaptor.capture()); - - // Verify runnable - runnableArgumentCaptor.getAllValues().forEach(Runnable::run); - verify(sendMessagePort).send(coordinateMessageDto); - verify(deleteSystemEliteIdRequestPort).delete(systemName, module); + try (MockedStatic systemEliteIdResponseMockedStatic = mockStatic(SystemEliteIdResponse.class)) { + String systemName = "systemName"; + Module module = mock(Module.class); + when(module.getName()).thenReturn("module"); + SystemEliteIdRequest request1 = mock(SystemEliteIdRequest.class); + when(request1.requestingModule()).thenReturn(module); + when(loadSystemEliteIdRequestBySystemNamePort.loadByIdentifier(systemName)).thenReturn(List.of(request1)); + ArgumentCaptor runnableArgumentCaptor = ArgumentCaptor.forClass(Runnable.class); + System mockSystem = mock(System.class); + when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); + SystemEliteIdResponse mockSystemEliteIdResponse = mock(SystemEliteIdResponse.class); + systemEliteIdResponseMockedStatic.when(() -> SystemEliteIdResponse.from(mockSystem)).thenReturn(mockSystemEliteIdResponse); + when(objectMapper.writeValueAsString(mockSystemEliteIdResponse)).thenReturn("JSON_STRING"); + Message message = new Message("module_systemEliteIdResponse", "JSON_STRING"); + when(sendMessagePort.send(message)).thenReturn(true); + doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); + + underTest.sendResponsesForSystem(systemName); + + verify(executorService).submit(runnableArgumentCaptor.capture()); + + // Verify runnable + runnableArgumentCaptor.getAllValues().forEach(Runnable::run); + verify(deleteSystemEliteIdRequestPort).delete(systemName, module); + } } @SneakyThrows @@ -135,12 +127,9 @@ void onEvent_shouldNotDeleteRequestWhenSendFails() { System mockSystem = mock(System.class); when(loadSystemPort.load(systemName)).thenReturn(Optional.of(mockSystem)); SystemEliteIdResponse mockSystemEliteIdResponse = mock(SystemEliteIdResponse.class); - when(systemEliteIdResponseMapper.map(mockSystem)).thenReturn(mockSystemEliteIdResponse); when(objectMapper.writeValueAsString(mockSystemEliteIdResponse)).thenReturn("JSON_STRING"); - Message coordinateKafkaMessage = new Message("module_systemEliteIdResponse", "JSON_STRING"); - MessageDto coordinateMessageDto = mock(MessageDto.class); - when(messageMapper.map(coordinateKafkaMessage)).thenReturn(coordinateMessageDto); - when(sendMessagePort.send(coordinateMessageDto)).thenReturn(false); + Message message = new Message("module_systemEliteIdResponse", "JSON_STRING"); + when(sendMessagePort.send(message)).thenReturn(false); doAnswer(invocation -> ((RetryCallback) invocation.getArgument(0)).doWithRetry(null)).when(retryTemplate).execute(any()); underTest.sendResponsesForSystem(systemName); @@ -149,7 +138,6 @@ void onEvent_shouldNotDeleteRequestWhenSendFails() { // Verify runnable runnableArgumentCaptor.getAllValues().forEach(Runnable::run); - verify(sendMessagePort).send(coordinateMessageDto); verify(deleteSystemEliteIdRequestPort, never()).delete(systemName, module); } } diff --git a/readme.md b/readme.md index 181a5df4..a91af1d3 100644 --- a/readme.md +++ b/readme.md @@ -55,7 +55,6 @@ src │ │ └── application │ │ ├── domain │ │ │ └── exception -│ │ ├── dto │ │ ├── port │ │ │ └── incomming │ │ │ └── outgoing diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/config/MessageProcessorConfig.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/config/MessageProcessorConfig.java index 081ee8f2..1f2ed7db 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/config/MessageProcessorConfig.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/config/MessageProcessorConfig.java @@ -3,11 +3,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import io.edpn.backend.messageprocessorlib.application.dto.eddn.CommodityMessage; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationRequireOdysseyResponse; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.trade.adapter.kafka.dto.mapper.KafkaMessageMapper; import io.edpn.backend.trade.adapter.kafka.processor.CommodityV3MessageProcessor; import io.edpn.backend.trade.adapter.kafka.processor.StationArrivalDistanceResponseMessageProcessor; @@ -16,6 +11,11 @@ import io.edpn.backend.trade.adapter.kafka.processor.SystemCoordinatesResponseMessageProcessor; import io.edpn.backend.trade.adapter.kafka.processor.SystemEliteIdResponseMessageProcessor; import io.edpn.backend.trade.adapter.kafka.sender.KafkaMessageSender; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationArrivalDistanceResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationMaxLandingPadSizeResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationRequireOdysseyResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemCoordinatesResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.CreateTopicPort; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessor.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessor.java index b5dde40f..5ed7cd54 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessor.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessor.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationArrivalDistanceResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeResponseMessageProcessor.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeResponseMessageProcessor.java index 9528d58c..8dbd9ef5 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeResponseMessageProcessor.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeResponseMessageProcessor.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationMaxLandingPadSizeResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationPlanetaryResponseMessageProcessor.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationPlanetaryResponseMessageProcessor.java index a832b5f2..293d9418 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationPlanetaryResponseMessageProcessor.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationPlanetaryResponseMessageProcessor.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationPlanetaryResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationPlanetaryResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import lombok.RequiredArgsConstructor; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationRequireOdysseyResponseMessageProcessor.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationRequireOdysseyResponseMessageProcessor.java index 79baae2a..88af35f8 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationRequireOdysseyResponseMessageProcessor.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/StationRequireOdysseyResponseMessageProcessor.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationRequireOdysseyResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationRequireOdysseyResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinatesResponseMessageProcessor.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinatesResponseMessageProcessor.java index 9285650e..3df3917a 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinatesResponseMessageProcessor.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinatesResponseMessageProcessor.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemCoordinatesResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdResponseMessageProcessor.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdResponseMessageProcessor.java index 1c133ce4..18bd94e0 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdResponseMessageProcessor.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdResponseMessageProcessor.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationArrivalDistanceRequestRepository.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationArrivalDistanceRequestRepository.java index 2c873ea1..69b6c884 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationArrivalDistanceRequestRepository.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationArrivalDistanceRequestRepository.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationArrivalDistanceRequestRepository; import io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest.CreateStationArrivalDistanceRequestPort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationLandingPadSizeRequestRepository.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationLandingPadSizeRequestRepository.java index dbeba495..b487f2d6 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationLandingPadSizeRequestRepository.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationLandingPadSizeRequestRepository.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationLandingPadSizeRequestRepository; import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.CreateStationLandingPadSizeRequestPort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationPlanetaryRequestRepository.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationPlanetaryRequestRepository.java index 9909bb29..e0842d2f 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationPlanetaryRequestRepository.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationPlanetaryRequestRepository.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationPlanetaryRequestRepository; import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.CreateStationPlanetaryRequestPort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationRequireOdysseyRequestRepository.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationRequireOdysseyRequestRepository.java index c7dd3b5e..f9be8916 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationRequireOdysseyRequestRepository.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/StationRequireOdysseyRequestRepository.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; import io.edpn.backend.trade.adapter.persistence.repository.MybatisStationRequireOdysseyRequestRepository; import io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest.CreateStationRequireOdysseyRequestPort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemCoordinateRequestRepository.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemCoordinateRequestRepository.java index f66ff1fb..33b3f739 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemCoordinateRequestRepository.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemCoordinateRequestRepository.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisSystemDataRequestEntityMapper; import io.edpn.backend.trade.adapter.persistence.repository.MybatisSystemCoordinateRequestRepository; import io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest.CreateSystemCoordinateRequestPort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemEliteIdRequestRepository.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemEliteIdRequestRepository.java index b377fd03..e7431d4d 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemEliteIdRequestRepository.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/SystemEliteIdRequestRepository.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisSystemDataRequestEntityMapper; import io.edpn.backend.trade.adapter.persistence.repository.MybatisSystemEliteIdRequestRepository; import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.CreateSystemEliteIdRequestPort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapper.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapper.java index b94899d6..93cf251e 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapper.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapper.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.adapter.persistence.entity.mapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.MybatisStationDataRequestEntity; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; public class MybatisStationDataRequestEntityMapper { public StationDataRequest map(MybatisStationDataRequestEntity mybatisStationDataRequestEntity) { diff --git a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapper.java b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapper.java index 76d18ab6..83826e53 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapper.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapper.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.entity.mapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.MybatisSystemDataRequestEntity; public class MybatisSystemDataRequestEntityMapper { diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java new file mode 100644 index 00000000..78f10d37 --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationArrivalDistanceResponse.java @@ -0,0 +1,10 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +public record StationArrivalDistanceResponse( + String stationName, + + String systemName, + + double arrivalDistance +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationArrivalDistanceResponse { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationDataRequest.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationDataRequest.java new file mode 100644 index 00000000..e9aee379 --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationDataRequest.java @@ -0,0 +1,10 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +import io.edpn.backend.util.Module; + +public record StationDataRequest( + Module requestingModule, + String stationName, + String systemName +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationDataRequest { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java new file mode 100644 index 00000000..2c6a3223 --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationMaxLandingPadSizeResponse.java @@ -0,0 +1,10 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +public record StationMaxLandingPadSizeResponse( + String stationName, + + String systemName, + + String maxLandingPadSize +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationMaxLandingPadSizeResponse { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationPlanetaryResponse.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationPlanetaryResponse.java new file mode 100644 index 00000000..738b7044 --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationPlanetaryResponse.java @@ -0,0 +1,8 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +public record StationPlanetaryResponse( + String stationName, + String systemName, + boolean planetary +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationPlanetaryResponse { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationRequireOdysseyResponse.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationRequireOdysseyResponse.java new file mode 100644 index 00000000..d4ea488e --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/StationRequireOdysseyResponse.java @@ -0,0 +1,8 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +public record StationRequireOdysseyResponse( + String stationName, + String systemName, + boolean requireOdyssey +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.StationRequireOdysseyResponse { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemCoordinatesResponse.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemCoordinatesResponse.java new file mode 100644 index 00000000..996188f5 --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemCoordinatesResponse.java @@ -0,0 +1,9 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +public record SystemCoordinatesResponse( + String systemName, + double xCoordinate, + double yCoordinate, + double zCoordinate +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.SystemCoordinatesResponse { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemDataRequest.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemDataRequest.java new file mode 100644 index 00000000..ccdc4077 --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemDataRequest.java @@ -0,0 +1,9 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +import io.edpn.backend.util.Module; + +public record SystemDataRequest( + Module requestingModule, + String systemName +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.SystemDataRequest { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemEliteIdResponse.java b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemEliteIdResponse.java new file mode 100644 index 00000000..a375069a --- /dev/null +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/domain/intermodulecommunication/SystemEliteIdResponse.java @@ -0,0 +1,8 @@ +package io.edpn.backend.trade.application.domain.intermodulecommunication; + +public record SystemEliteIdResponse( + + String systemName, + long eliteId +) implements io.edpn.backend.messageprocessorlib.application.dto.edpn.intermodulecommunication.SystemEliteIdResponse { +} diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPort.java b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPort.java index e16326e4..0877243c 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPort.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPort.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.application.port.outgoing.stationarrivaldistancerequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import java.util.List; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPort.java b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPort.java index fe95ba06..25206f55 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPort.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPort.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import java.util.List; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPort.java b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPort.java index d755b666..e1c819e8 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPort.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPort.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import java.util.List; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPort.java b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPort.java index 5f3773ac..ad31f4de 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPort.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPort.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.application.port.outgoing.stationrequireodysseyrequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import java.util.List; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPort.java b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPort.java index f7091db8..1c1e0216 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPort.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPort.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.application.port.outgoing.systemcoordinaterequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import java.util.List; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemeliteidrequest/LoadAllSystemEliteIdRequestsPort.java b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemeliteidrequest/LoadAllSystemEliteIdRequestsPort.java index dfac0a95..a7cb0892 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemeliteidrequest/LoadAllSystemEliteIdRequestsPort.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/port/outgoing/systemeliteidrequest/LoadAllSystemEliteIdRequestsPort.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import java.util.List; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationArrivalDistanceInterModuleCommunicationService.java b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationArrivalDistanceInterModuleCommunicationService.java index fde6e8df..fb2bd6d5 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationArrivalDistanceInterModuleCommunicationService.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationArrivalDistanceInterModuleCommunicationService.java @@ -2,12 +2,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationArrivalDistanceResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.incomming.kafka.RequestDataUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationLandingPadSizeInterModuleCommunicationService.java b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationLandingPadSizeInterModuleCommunicationService.java index 9b4527ea..2831c9c5 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationLandingPadSizeInterModuleCommunicationService.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationLandingPadSizeInterModuleCommunicationService.java @@ -2,13 +2,13 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.LandingPadSize; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationMaxLandingPadSizeResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.incomming.kafka.RequestDataUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationPlanetaryInterModuleCommunicationService.java b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationPlanetaryInterModuleCommunicationService.java index b7c9523a..8b4810e8 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationPlanetaryInterModuleCommunicationService.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationPlanetaryInterModuleCommunicationService.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationPlanetaryResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationPlanetaryResponse; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationRequireOdysseyInterModuleCommunicationService.java b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationRequireOdysseyInterModuleCommunicationService.java index bc4ca4bb..cc72c1bf 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationRequireOdysseyInterModuleCommunicationService.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/service/StationRequireOdysseyInterModuleCommunicationService.java @@ -2,12 +2,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationRequireOdysseyResponse; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationRequireOdysseyResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.incomming.kafka.RequestDataUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemCoordinateInterModuleCommunicationService.java b/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemCoordinateInterModuleCommunicationService.java index aba3fac7..3c43741d 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemCoordinateInterModuleCommunicationService.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemCoordinateInterModuleCommunicationService.java @@ -2,12 +2,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; import io.edpn.backend.trade.application.domain.Coordinate; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindSystemFilter; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemCoordinatesResponse; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.incomming.kafka.RequestDataUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemEliteIdInterModuleCommunicationService.java b/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemEliteIdInterModuleCommunicationService.java index 53424bde..8e051fb9 100644 --- a/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemEliteIdInterModuleCommunicationService.java +++ b/trade-module/src/main/java/io/edpn/backend/trade/application/service/SystemEliteIdInterModuleCommunicationService.java @@ -2,11 +2,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindSystemFilter; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.incomming.kafka.RequestDataUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/main/java/module-info.java b/trade-module/src/main/java/module-info.java index cbb08038..9ce7a8d6 100644 --- a/trade-module/src/main/java/module-info.java +++ b/trade-module/src/main/java/module-info.java @@ -36,4 +36,5 @@ exports io.edpn.backend.trade.adapter.web.dto.filter; exports io.edpn.backend.trade.adapter.web.dto.object.mapper; exports io.edpn.backend.trade.adapter.web.dto.filter.mapper; + exports io.edpn.backend.trade.application.domain.intermodulecommunication; } diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessorTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessorTest.java index bb6bc7db..d8727deb 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessorTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationArrivalDistanceResponseMessageProcessorTest.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationArrivalDistanceResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeMessageProcessorTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeMessageProcessorTest.java index 5afda0a6..5d58d6a2 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeMessageProcessorTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/StationMaxLandingPadSizeMessageProcessorTest.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationMaxLandingPadSizeResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,32 +20,32 @@ @ExtendWith(MockitoExtension.class) class StationMaxLandingPadSizeMessageProcessorTest { - + @Mock private ReceiveKafkaMessageUseCase receiveKafkaMessageUseCase; - + @Mock private ObjectMapper objectMapper; - + private MessageProcessor underTest; - + @BeforeEach void setup() { underTest = new StationMaxLandingPadSizeResponseMessageProcessor(receiveKafkaMessageUseCase, objectMapper); } - + @Test void listen_shouldInvokeUseCaseWithCorrectStationMaxLandingPadSizeResponse() throws JsonProcessingException { JsonNode jsonNode = mock(JsonNode.class); StationMaxLandingPadSizeResponse stationMaxLandingPadSizeResponse = new StationMaxLandingPadSizeResponse(null, null, null); - + Mockito.when(objectMapper.treeToValue(jsonNode, StationMaxLandingPadSizeResponse.class)).thenReturn(stationMaxLandingPadSizeResponse); - + underTest.listen(jsonNode); - + verify(receiveKafkaMessageUseCase, times(1)).receive(any(StationMaxLandingPadSizeResponse.class)); - - + + } - + } \ No newline at end of file diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinateResponseMessageProcessorTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinateResponseMessageProcessorTest.java index 4b3ea6b0..8c04cd7c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinateResponseMessageProcessorTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemCoordinateResponseMessageProcessorTest.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemCoordinatesResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdMessageProcessorTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdMessageProcessorTest.java index 60a992a4..699bc961 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdMessageProcessorTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/processor/SystemEliteIdMessageProcessorTest.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.messageprocessorlib.infrastructure.kafka.processor.MessageProcessor; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/MessageSenderTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/KafkaMessageSenderTest.java similarity index 98% rename from trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/MessageSenderTest.java rename to trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/KafkaMessageSenderTest.java index 6dcf7b90..bb86e0fa 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/MessageSenderTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/kafka/sender/KafkaMessageSenderTest.java @@ -22,13 +22,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class MessageSenderTest { +class KafkaMessageSenderTest { @Mock private CreateTopicPort createTopicPort; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapperTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapperTest.java index 10857967..7730785c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapperTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisStationDataRequestEntityMapperTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.entity.mapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.MybatisStationDataRequestEntity; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapperTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapperTest.java index 32c3dfe0..fecd29e7 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapperTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/entity/mapper/MybatisSystemDataRequestEntityMapperTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.entity.mapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.adapter.persistence.entity.MybatisSystemDataRequestEntity; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPortTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPortTest.java index 73c04071..48d4c329 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPortTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationarrivaldistancerequest/LoadAllStationArrivalDistanceRequestsPortTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.stationarrivaldistancerequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.StationArrivalDistanceRequestRepository; import io.edpn.backend.trade.adapter.persistence.entity.MybatisStationDataRequestEntity; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPortTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPortTest.java index 763aef54..deb88f43 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPortTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationlandingpadsizerequest/LoadAllStationLandingPadSizeRequestsPortTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.stationlandingpadsizerequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.StationLandingPadSizeRequestRepository; import io.edpn.backend.trade.adapter.persistence.entity.MybatisStationDataRequestEntity; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPortTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPortTest.java index aa235897..429be2a6 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPortTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationplanetaryrequest/LoadAllStationPlanetaryRequestsPortTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.stationplanetaryrequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.StationPlanetaryRequestRepository; import io.edpn.backend.trade.adapter.persistence.entity.MybatisStationDataRequestEntity; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPortTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPortTest.java index 951cfcfe..d9c3858c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPortTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/stationrequireodysseyrequest/LoadAllStationRequireOdysseyRequestsPortTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.stationrequireodysseyrequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.adapter.persistence.StationRequireOdysseyRequestRepository; import io.edpn.backend.trade.adapter.persistence.entity.MybatisStationDataRequestEntity; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisStationDataRequestEntityMapper; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPortTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPortTest.java index f1522a81..3ef4c92e 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPortTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemcoordinaterequest/LoadAllSystemCoordinateRequestsPortTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.systemcoordinaterequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.adapter.persistence.SystemCoordinateRequestRepository; import io.edpn.backend.trade.adapter.persistence.entity.MybatisSystemDataRequestEntity; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisSystemDataRequestEntityMapper; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemeliteidrequest/LoadAllSystemEliteIdRequestsPortTest.java b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemeliteidrequest/LoadAllSystemEliteIdRequestsPortTest.java index 6ed26d07..c836bb2d 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemeliteidrequest/LoadAllSystemEliteIdRequestsPortTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/adapter/persistence/systemeliteidrequest/LoadAllSystemEliteIdRequestsPortTest.java @@ -1,6 +1,6 @@ package io.edpn.backend.trade.adapter.persistence.systemeliteidrequest; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.adapter.persistence.SystemEliteIdRequestRepository; import io.edpn.backend.trade.adapter.persistence.entity.MybatisSystemDataRequestEntity; import io.edpn.backend.trade.adapter.persistence.entity.mapper.MybatisSystemDataRequestEntityMapper; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationArrivalDistanceRequestsUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationArrivalDistanceRequestsUseCaseTest.java index 0c3d5d5c..e209fd5c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationArrivalDistanceRequestsUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationArrivalDistanceRequestsUseCaseTest.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationLandingPadSizeRequestsUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationLandingPadSizeRequestsUseCaseTest.java index ca53892b..ea60f134 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationLandingPadSizeRequestsUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationLandingPadSizeRequestsUseCaseTest.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationPlanetaryRequestsUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationPlanetaryRequestsUseCaseTest.java index 7d60ca0c..63a8e4ff 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationPlanetaryRequestsUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationPlanetaryRequestsUseCaseTest.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationRequireOdysseyRequestsUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationRequireOdysseyRequestsUseCaseTest.java index cd43e625..0f56381f 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationRequireOdysseyRequestsUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteStationRequireOdysseyRequestsUseCaseTest.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindStationFilter; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemCoordinateRequestsUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemCoordinateRequestsUseCaseTest.java index 3631ff01..55d3af7b 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemCoordinateRequestsUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemCoordinateRequestsUseCaseTest.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindSystemFilter; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemEliteIdRequestsUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemEliteIdRequestsUseCaseTest.java index ca8f7c7d..f46d3093 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemEliteIdRequestsUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/CleanUpObsoleteSystemEliteIdRequestsUseCaseTest.java @@ -1,7 +1,7 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindSystemFilter; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationArrivalDistanceResponseUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationArrivalDistanceResponseUseCaseTest.java index 22170f93..e3fa2e82 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationArrivalDistanceResponseUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationArrivalDistanceResponseUseCaseTest.java @@ -1,9 +1,9 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationArrivalDistanceResponse; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationArrivalDistanceResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; import io.edpn.backend.trade.application.port.outgoing.station.CreateOrLoadStationPort; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationMaxLandingPadSizeResponseUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationMaxLandingPadSizeResponseUseCaseTest.java index 5724d615..5ea96a47 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationMaxLandingPadSizeResponseUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationMaxLandingPadSizeResponseUseCaseTest.java @@ -1,10 +1,10 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationMaxLandingPadSizeResponse; import io.edpn.backend.trade.application.domain.LandingPadSize; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationMaxLandingPadSizeResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; import io.edpn.backend.trade.application.port.outgoing.station.CreateOrLoadStationPort; @@ -16,7 +16,6 @@ import io.edpn.backend.trade.application.port.outgoing.stationlandingpadsizerequest.LoadAllStationLandingPadSizeRequestsPort; import io.edpn.backend.trade.application.port.outgoing.system.CreateOrLoadSystemPort; import io.edpn.backend.util.IdGenerator; -import java.util.concurrent.Executor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,6 +23,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.retry.support.RetryTemplate; +import java.util.concurrent.Executor; + import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationPlanetaryResponseUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationPlanetaryResponseUseCaseTest.java index c73241df..34d24059 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationPlanetaryResponseUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationPlanetaryResponseUseCaseTest.java @@ -1,9 +1,9 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationPlanetaryResponse; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationPlanetaryResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; import io.edpn.backend.trade.application.port.outgoing.station.CreateOrLoadStationPort; @@ -15,7 +15,6 @@ import io.edpn.backend.trade.application.port.outgoing.stationplanetaryrequest.LoadAllStationPlanetaryRequestsPort; import io.edpn.backend.trade.application.port.outgoing.system.CreateOrLoadSystemPort; import io.edpn.backend.util.IdGenerator; -import java.util.concurrent.Executor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -23,6 +22,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.retry.support.RetryTemplate; +import java.util.concurrent.Executor; + import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationRequireOdysseyResponseUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationRequireOdysseyResponseUseCaseTest.java index 52f0d40a..8e62e89a 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationRequireOdysseyResponseUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveStationRequireOdysseyResponseUseCaseTest.java @@ -1,9 +1,9 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationRequireOdysseyResponse; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationRequireOdysseyResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; import io.edpn.backend.trade.application.port.outgoing.station.CreateOrLoadStationPort; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemCoordinatesResponseUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemCoordinatesResponseUseCaseTest.java index 314f5ff6..71d114ee 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemCoordinatesResponseUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemCoordinatesResponseUseCaseTest.java @@ -1,9 +1,9 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemCoordinatesResponse; import io.edpn.backend.trade.application.domain.Coordinate; import io.edpn.backend.trade.application.domain.System; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemCoordinatesResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; import io.edpn.backend.trade.application.port.outgoing.system.CreateOrLoadSystemPort; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemEliteIdResponseUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemEliteIdResponseUseCaseTest.java index f299b40d..ed82ee48 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemEliteIdResponseUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/ReceiveSystemEliteIdResponseUseCaseTest.java @@ -1,8 +1,8 @@ package io.edpn.backend.trade.application.service; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemEliteIdResponse; import io.edpn.backend.trade.application.domain.System; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemEliteIdResponse; import io.edpn.backend.trade.application.port.incomming.kafka.ReceiveKafkaMessageUseCase; import io.edpn.backend.trade.application.port.outgoing.kafka.SendKafkaMessagePort; import io.edpn.backend.trade.application.port.outgoing.system.CreateOrLoadSystemPort; @@ -13,7 +13,6 @@ import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.ExistsSystemEliteIdRequestPort; import io.edpn.backend.trade.application.port.outgoing.systemeliteidrequest.LoadAllSystemEliteIdRequestsPort; import io.edpn.backend.util.IdGenerator; -import java.util.concurrent.Executor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -21,6 +20,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.retry.support.RetryTemplate; +import java.util.concurrent.Executor; + import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationArrivalDistanceUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationArrivalDistanceUseCaseTest.java index 0da4368e..a6a79581 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationArrivalDistanceUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationArrivalDistanceUseCaseTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationLandingPadSizeUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationLandingPadSizeUseCaseTest.java index 02915a27..cf3d2ae7 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationLandingPadSizeUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationLandingPadSizeUseCaseTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationPlanetaryUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationPlanetaryUseCaseTest.java index 75e0d9d6..f1fa1f9e 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationPlanetaryUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationPlanetaryUseCaseTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationRequireOdysseyUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationRequireOdysseyUseCaseTest.java index d8a380b6..08dde50c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationRequireOdysseyUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingStationRequireOdysseyUseCaseTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemCoordinatesUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemCoordinatesUseCaseTest.java index fb0df864..ea6e0ce0 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemCoordinatesUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemCoordinatesUseCaseTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindSystemFilter; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemEliteIdUseCaseTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemEliteIdUseCaseTest.java index bab17ac3..3c07e982 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemEliteIdUseCaseTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestMissingSystemEliteIdUseCaseTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.domain.filter.FindSystemFilter; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationArrivalDistanceServiceTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationArrivalDistanceServiceTest.java index 854fb5a5..9963da28 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationArrivalDistanceServiceTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationArrivalDistanceServiceTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationLandingPadSizeServiceTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationLandingPadSizeServiceTest.java index cc8e3795..0913a43a 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationLandingPadSizeServiceTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationLandingPadSizeServiceTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.LandingPadSize; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationPlanetaryServiceTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationPlanetaryServiceTest.java index d94de4f5..3954a2b6 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationPlanetaryServiceTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationPlanetaryServiceTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationRequireOdysseyServiceTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationRequireOdysseyServiceTest.java index 646feb86..5c3ba46c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationRequireOdysseyServiceTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestStationRequireOdysseyServiceTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.StationDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.StationDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.Station; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemCoordinatesServiceTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemCoordinatesServiceTest.java index 4a53cdb6..2970dd78 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemCoordinatesServiceTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemCoordinatesServiceTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.domain.Coordinate; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.System; diff --git a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemEliteIdServiceTest.java b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemEliteIdServiceTest.java index 30e9a33a..3853585c 100644 --- a/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemEliteIdServiceTest.java +++ b/trade-module/src/test/java/io/edpn/backend/trade/application/service/RequestSystemEliteIdServiceTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.edpn.backend.messageprocessorlib.application.dto.eddn.data.SystemDataRequest; +import io.edpn.backend.trade.application.domain.intermodulecommunication.SystemDataRequest; import io.edpn.backend.trade.application.domain.Message; import io.edpn.backend.trade.application.domain.System; import io.edpn.backend.trade.application.port.incomming.kafka.RequestDataUseCase;