From 7360736cb0ec465acb0762ee76c72af3e485bf75 Mon Sep 17 00:00:00 2001 From: hyojin kim Date: Wed, 31 Dec 2025 10:53:31 +0900 Subject: [PATCH] :building_construction: Movement Batch Package Rearrange --- .../batch/config/AnchorageCallsJobConfig.java | 12 ++++++------ .../config/AnchorageCallsRangeJobConfig.java | 13 ++++++------- .../batch/config/BerthCallsJobConfig.java | 12 ++++++------ .../batch/config/BerthCallsRangJobConfig.java | 12 ++++++------ .../batch/config/CurrentlyAtJobConfig.java | 12 ++++++------ .../config/CurrentlyAtRangeJobConfig.java | 13 ++++++------- .../batch/config/DarkActivityJobConfig.java | 12 ++++++------ .../config/DarkActivityRangeJobConfig.java | 12 ++++++------ .../batch/config/DestinationsJobConfig.java | 12 ++++++------ .../config/DestinationsRangeJobConfig.java | 18 ++++++++---------- .../batch/config/ShipPortCallsJobConfig.java | 12 ++++++------ .../config/ShipPortCallsRangeJobConfig.java | 13 ++++++------- .../batch/config/StsOperationJobConfig.java | 12 ++++++------ .../config/StsOperationRangeJobConfig.java | 13 ++++++------- .../batch/config/TerminalCallsJobConfig.java | 12 ++++++------ .../config/TerminalCallsRangeJobConfig.java | 14 ++++++-------- .../batch/config/TransitsJobConfig.java | 12 ++++++------ .../batch/config/TransitsRangeJobConfig.java | 15 ++++++--------- .../batch/dto/AnchorageCallsDto.java | 4 +--- .../batch/dto/AnchorageCallsPositionDto.java | 2 +- .../batch/dto/BerthCallsDto.java | 2 +- .../batch/dto/BerthCallsPositionDto.java | 2 +- .../batch/dto/CurrentlyAtDto.java | 3 +-- .../batch/dto/CurrentlyAtPositionDto.java | 2 +- .../batch/dto/DarkActivityDto.java | 3 +-- .../batch/dto/DarkActivityPositionDto.java | 2 +- .../batch/dto/DestinationDto.java | 2 +- .../batch/dto/DestinationPositionDto.java | 2 +- .../batch/dto/PortCallsDto.java | 2 +- .../batch/dto/PortCallsPositionDto.java | 2 +- .../batch/dto/ShipMovementApiResponse.java | 2 +- .../batch/dto/StsOperationDto.java | 2 +- .../batch/dto/StsOperationPositionDto.java | 2 +- .../batch/dto/TerminalCallsDto.java | 2 +- .../batch/dto/TerminalCallsPositionDto.java | 2 +- .../batch/dto/TransitsDto.java | 2 +- .../batch/entiity/BerthCallsEntity.java | 2 +- .../batch/entity/AnchorageCallsEntity.java | 2 +- .../batch/entity/CurrentlyAtEntity.java | 2 +- .../batch/entity/DarkActivityEntity.java | 2 +- .../batch/entity/DestinationEntity.java | 2 +- .../batch/entity/PortCallsEntity.java | 2 +- .../batch/entity/StsOperationEntity.java | 2 +- .../batch/entity/TerminalCallsEntity.java | 2 +- .../batch/entity/TransitsEntity.java | 2 +- .../processor/AnchorageCallsProcessor.java | 6 +++--- .../batch/processor/BerthCallsProcessor.java | 6 +++--- .../batch/processor/CurrentlyAtProcessor.java | 6 +++--- .../batch/processor/DarkActivityProcessor.java | 6 +++--- .../batch/processor/DestinationProcessor.java | 6 +++--- .../batch/processor/PortCallsProcessor.java | 6 +++--- .../batch/processor/StsOperationProcessor.java | 6 +++--- .../processor/TerminalCallsProcessor.java | 6 +++--- .../batch/processor/TransitsProcessor.java | 6 +++--- .../reader/AnchorageCallsRangeReader.java | 4 ++-- .../batch/reader/AnchorageCallsReader.java | 4 ++-- .../batch/reader/BerthCallsRangeReader.java | 4 ++-- .../batch/reader/BerthCallsReader.java | 4 ++-- .../batch/reader/CurrentlyAtRangeReader.java | 4 ++-- .../batch/reader/CurrentlyAtReader.java | 4 ++-- .../batch/reader/DarkActivityRangeReader.java | 4 ++-- .../batch/reader/DarkActivityReader.java | 4 ++-- .../batch/reader/DestinationRangeReader.java | 4 ++-- .../batch/reader/DestinationReader.java | 5 ++--- .../batch/reader/PortCallsRangeReader.java | 4 ++-- .../batch/reader/PortCallsReader.java | 7 ++----- .../batch/reader/StsOperationRangeReader.java | 4 ++-- .../batch/reader/StsOperationReader.java | 4 ++-- .../batch/reader/TerminalCallsRangeReader.java | 8 ++------ .../batch/reader/TerminalCallsReader.java | 4 ++-- .../batch/reader/TransitsRangeReader.java | 4 ++-- .../batch/reader/TransitsReader.java | 5 ++--- .../repository/AnchorageCallsRepository.java | 4 ++-- .../AnchorageCallsRepositoryImpl.java | 4 ++-- .../batch/repository/BerthCallsRepository.java | 13 +++++++++++++ .../repository/BerthCallsRepositoryImpl.java | 6 ++---- .../repository/CurrentlyAtRepository.java | 4 ++-- .../repository/CurrentlyAtRepositoryImpl.java | 4 ++-- .../repository/DarkActivityRepository.java | 13 +++++++++++++ .../repository/DarkActivityRepositoryImpl.java | 6 ++---- .../repository/DestinationRepository.java | 13 +++++++++++++ .../repository/DestinationRepositoryImpl.java | 4 ++-- .../batch/repository/PortCallsRepository.java | 4 ++-- .../repository/PortCallsRepositoryImpl.java | 4 ++-- .../repository/StsOperationRepository.java | 4 ++-- .../repository/StsOperationRepositoryImpl.java | 7 ++----- .../repository/TerminalCallsRepository.java | 4 ++-- .../TerminalCallsRepositoryImpl.java | 7 ++----- .../batch/repository/TransitsRepository.java | 4 ++-- .../repository/TransitsRepositoryImpl.java | 4 ++-- .../batch/writer/AnchorageCallsWriter.java | 6 +++--- .../batch/writer/BerthCallsWriter.java | 6 +++--- .../batch/writer/CurrentlyAtWriter.java | 6 +++--- .../batch/writer/DarkActivityWriter.java | 8 +++----- .../batch/writer/DestinationWriter.java | 7 +++---- .../batch/writer/PortCallsWriter.java | 8 +++----- .../batch/writer/StsOperationWriter.java | 6 +++--- .../batch/writer/TerminalCallsWriter.java | 6 +++--- .../batch/writer/TransitsWriter.java | 6 +++--- .../batch/repository/BerthCallsRepository.java | 14 -------------- .../repository/DarkActivityRepository.java | 14 -------------- .../repository/DestinationRepository.java | 14 -------------- 102 files changed, 296 insertions(+), 338 deletions(-) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/config/AnchorageCallsJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/config/AnchorageCallsRangeJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/config/BerthCallsJobConfig.java (88%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/config/BerthCallsRangJobConfig.java (89%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/config/CurrentlyAtJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/config/CurrentlyAtRangeJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/config/DarkActivityJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/config/DarkActivityRangeJobConfig.java (89%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/config/DestinationsJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/config/DestinationsRangeJobConfig.java (83%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/config/ShipPortCallsJobConfig.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/config/ShipPortCallsRangeJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/config/StsOperationJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/config/StsOperationRangeJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/config/TerminalCallsJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/config/TerminalCallsRangeJobConfig.java (85%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/config/TransitsJobConfig.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/config/TransitsRangeJobConfig.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/dto/AnchorageCallsDto.java (87%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/dto/AnchorageCallsPositionDto.java (85%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/dto/BerthCallsDto.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/dto/BerthCallsPositionDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/dto/CurrentlyAtDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/dto/CurrentlyAtPositionDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/dto/DarkActivityDto.java (79%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/dto/DarkActivityPositionDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/dto/DestinationDto.java (88%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/dto/DestinationPositionDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/dto/PortCallsDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/dto/PortCallsPositionDto.java (85%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/dto/ShipMovementApiResponse.java (78%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/dto/StsOperationDto.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/dto/StsOperationPositionDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/dto/TerminalCallsDto.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/dto/TerminalCallsPositionDto.java (84%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/dto/TransitsDto.java (81%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/entiity/BerthCallsEntity.java (94%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/entity/AnchorageCallsEntity.java (94%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/entity/CurrentlyAtEntity.java (94%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/entity/DarkActivityEntity.java (92%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/entity/DestinationEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/entity/PortCallsEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/entity/StsOperationEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/entity/TerminalCallsEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/entity/TransitsEntity.java (88%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/processor/AnchorageCallsProcessor.java (90%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/processor/BerthCallsProcessor.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/processor/CurrentlyAtProcessor.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/processor/DarkActivityProcessor.java (90%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/processor/DestinationProcessor.java (90%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/processor/PortCallsProcessor.java (92%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/processor/StsOperationProcessor.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/processor/TerminalCallsProcessor.java (91%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/processor/TransitsProcessor.java (86%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/reader/AnchorageCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/reader/AnchorageCallsReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/reader/BerthCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/reader/BerthCallsReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/reader/CurrentlyAtRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/reader/CurrentlyAtReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/reader/DarkActivityRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/reader/DarkActivityReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/reader/DestinationRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/reader/DestinationReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/reader/PortCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/reader/PortCallsReader.java (95%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/reader/StsOperationRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/reader/StsOperationReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/reader/TerminalCallsRangeReader.java (94%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/reader/TerminalCallsReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/reader/TransitsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/reader/TransitsReader.java (97%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/repository/AnchorageCallsRepository.java (53%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/repository/AnchorageCallsRepositoryImpl.java (97%) create mode 100644 src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/repository/BerthCallsRepositoryImpl.java (95%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/repository/CurrentlyAtRepository.java (54%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/repository/CurrentlyAtRepositoryImpl.java (97%) create mode 100644 src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepository.java rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/repository/DarkActivityRepositoryImpl.java (95%) create mode 100644 src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/repository/DestinationRepositoryImpl.java (96%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/repository/PortCallsRepository.java (61%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/repository/PortCallsRepositoryImpl.java (98%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/repository/StsOperationRepository.java (53%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/repository/StsOperationRepositoryImpl.java (95%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/repository/TerminalCallsRepository.java (54%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/repository/TerminalCallsRepositoryImpl.java (95%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/repository/TransitsRepository.java (55%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/repository/TransitsRepositoryImpl.java (95%) rename src/main/java/com/snp/batch/jobs/{shipMovementAnchorageCalls => movement}/batch/writer/AnchorageCallsWriter.java (76%) rename src/main/java/com/snp/batch/jobs/{shipMovementBerthCalls => movement}/batch/writer/BerthCallsWriter.java (76%) rename src/main/java/com/snp/batch/jobs/{shipMovementCurrentlyAt => movement}/batch/writer/CurrentlyAtWriter.java (77%) rename src/main/java/com/snp/batch/jobs/{shipMovementDarkActivity => movement}/batch/writer/DarkActivityWriter.java (66%) rename src/main/java/com/snp/batch/jobs/{shipMovementDestination => movement}/batch/writer/DestinationWriter.java (71%) rename src/main/java/com/snp/batch/jobs/{shipMovementPortCalls => movement}/batch/writer/PortCallsWriter.java (67%) rename src/main/java/com/snp/batch/jobs/{shipMovementStsOperations => movement}/batch/writer/StsOperationWriter.java (76%) rename src/main/java/com/snp/batch/jobs/{shipMovementTerminalCalls => movement}/batch/writer/TerminalCallsWriter.java (76%) rename src/main/java/com/snp/batch/jobs/{shipMovementTransits => movement}/batch/writer/TransitsWriter.java (77%) delete mode 100644 src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepository.java delete mode 100644 src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepository.java delete mode 100644 src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepository.java diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/config/AnchorageCallsJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/config/AnchorageCallsJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsJobConfig.java index dcfd05b..5ee929c 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/config/AnchorageCallsJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.processor.AnchorageCallsProcessor; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.reader.AnchorageCallsReader; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.writer.AnchorageCallsWriter; +import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.AnchorageCallsProcessor; +import com.snp.batch.jobs.movement.batch.reader.AnchorageCallsReader; +import com.snp.batch.jobs.movement.batch.writer.AnchorageCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/config/AnchorageCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/config/AnchorageCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java index 764e26b..4872fd9 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/config/AnchorageCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.processor.AnchorageCallsProcessor; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.reader.AnchorageCallsRangeReader; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.writer.AnchorageCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; +import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.AnchorageCallsProcessor; +import com.snp.batch.jobs.movement.batch.writer.AnchorageCallsWriter; +import com.snp.batch.jobs.movement.batch.reader.AnchorageCallsRangeReader; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/config/BerthCallsJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsJobConfig.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/config/BerthCallsJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsJobConfig.java index 2b43ed5..f353157 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/config/BerthCallsJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.processor.BerthCallsProcessor; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.reader.BerthCallsReader; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.writer.BerthCallsWriter; +import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.BerthCallsProcessor; +import com.snp.batch.jobs.movement.batch.writer.BerthCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.movement.batch.reader.BerthCallsReader; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/config/BerthCallsRangJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/config/BerthCallsRangJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java index f76eaaf..2c660db 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/config/BerthCallsRangJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.processor.BerthCallsProcessor; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.reader.BerthCallsRangeReader; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.writer.BerthCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.BerthCallsProcessor; +import com.snp.batch.jobs.movement.batch.reader.BerthCallsRangeReader; +import com.snp.batch.jobs.movement.batch.writer.BerthCallsWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtJobConfig.java index e6a525d..4f5acb2 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor.CurrentlyAtProcessor; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader.CurrentlyAtReader; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer.CurrentlyAtWriter; +import com.snp.batch.jobs.movement.batch.processor.CurrentlyAtProcessor; +import com.snp.batch.jobs.movement.batch.reader.CurrentlyAtReader; +import com.snp.batch.jobs.movement.batch.writer.CurrentlyAtWriter; +import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java index ddb66d8..39c04f2 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java @@ -1,12 +1,11 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader.CurrentlyAtRangeReader; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader.CurrentlyAtReader; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor.CurrentlyAtProcessor; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer.CurrentlyAtWriter; +import com.snp.batch.jobs.movement.batch.reader.CurrentlyAtRangeReader; +import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.movement.batch.processor.CurrentlyAtProcessor; +import com.snp.batch.jobs.movement.batch.writer.CurrentlyAtWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/config/DarkActivityJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/DarkActivityJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/config/DarkActivityJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/DarkActivityJobConfig.java index a370b0b..98f7b48 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/config/DarkActivityJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/DarkActivityJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.dto.DarkActivityDto; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.entity.DarkActivityEntity; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.processor.DarkActivityProcessor; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.reader.DarkActivityReader; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.writer.DarkActivityWriter; +import com.snp.batch.jobs.movement.batch.processor.DarkActivityProcessor; +import com.snp.batch.jobs.movement.batch.reader.DarkActivityReader; +import com.snp.batch.jobs.movement.batch.writer.DarkActivityWriter; +import com.snp.batch.jobs.movement.batch.dto.DarkActivityDto; +import com.snp.batch.jobs.movement.batch.entity.DarkActivityEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/config/DarkActivityRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/DarkActivityRangeJobConfig.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/config/DarkActivityRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/DarkActivityRangeJobConfig.java index 1a7d521..bddd338 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/config/DarkActivityRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/DarkActivityRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.dto.DarkActivityDto; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.entity.DarkActivityEntity; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.processor.DarkActivityProcessor; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.reader.DarkActivityRangeReader; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.writer.DarkActivityWriter; +import com.snp.batch.jobs.movement.batch.dto.DarkActivityDto; +import com.snp.batch.jobs.movement.batch.entity.DarkActivityEntity; +import com.snp.batch.jobs.movement.batch.processor.DarkActivityProcessor; +import com.snp.batch.jobs.movement.batch.writer.DarkActivityWriter; +import com.snp.batch.jobs.movement.batch.reader.DarkActivityRangeReader; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/config/DestinationsJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/config/DestinationsJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsJobConfig.java index 807741e..92e7e30 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/config/DestinationsJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDestination.batch.dto.DestinationDto; -import com.snp.batch.jobs.shipMovementDestination.batch.entity.DestinationEntity; -import com.snp.batch.jobs.shipMovementDestination.batch.processor.DestinationProcessor; -import com.snp.batch.jobs.shipMovementDestination.batch.reader.DestinationReader; -import com.snp.batch.jobs.shipMovementDestination.batch.writer.DestinationWriter; +import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.movement.batch.processor.DestinationProcessor; +import com.snp.batch.jobs.movement.batch.reader.DestinationReader; +import com.snp.batch.jobs.movement.batch.writer.DestinationWriter; +import com.snp.batch.jobs.movement.batch.dto.DestinationDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/config/DestinationsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java similarity index 83% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/config/DestinationsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java index 724fbdb..56de7d7 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/config/DestinationsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java @@ -1,12 +1,11 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.reader.DarkActivityRangeReader; -import com.snp.batch.jobs.shipMovementDestination.batch.dto.DestinationDto; -import com.snp.batch.jobs.shipMovementDestination.batch.entity.DestinationEntity; -import com.snp.batch.jobs.shipMovementDestination.batch.processor.DestinationProcessor; -import com.snp.batch.jobs.shipMovementDestination.batch.reader.DestinationRangeReader; -import com.snp.batch.jobs.shipMovementDestination.batch.writer.DestinationWriter; +import com.snp.batch.jobs.movement.batch.dto.DestinationDto; +import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.movement.batch.processor.DestinationProcessor; +import com.snp.batch.jobs.movement.batch.writer.DestinationWriter; +import com.snp.batch.jobs.movement.batch.reader.DestinationRangeReader; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; @@ -19,7 +18,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.web.reactive.function.client.WebClient; @@ -46,8 +44,8 @@ import org.springframework.web.reactive.function.client.WebClient; @Configuration public class DestinationsRangeJobConfig extends BaseJobConfig { - private final DestinationProcessor DestinationProcessor; - private final DestinationWriter DestinationWriter; + private final com.snp.batch.jobs.movement.batch.processor.DestinationProcessor DestinationProcessor; + private final com.snp.batch.jobs.movement.batch.writer.DestinationWriter DestinationWriter; private final DestinationRangeReader destinationRangeReader; private final WebClient maritimeApiWebClient; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/config/ShipPortCallsJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsJobConfig.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/config/ShipPortCallsJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsJobConfig.java index 7971e39..fd10482 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/config/ShipPortCallsJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.PortCallsDto; -import com.snp.batch.jobs.shipMovementPortCalls.batch.entity.PortCallsEntity; -import com.snp.batch.jobs.shipMovementPortCalls.batch.processor.PortCallsProcessor; -import com.snp.batch.jobs.shipMovementPortCalls.batch.reader.PortCallsReader; -import com.snp.batch.jobs.shipMovementPortCalls.batch.writer.PortCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; +import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.PortCallsProcessor; +import com.snp.batch.jobs.movement.batch.reader.PortCallsReader; +import com.snp.batch.jobs.movement.batch.writer.PortCallsWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/config/ShipPortCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/config/ShipPortCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java index 702412e..1895259 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/config/ShipPortCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java @@ -1,13 +1,12 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.PortCallsDto; -import com.snp.batch.jobs.shipMovementPortCalls.batch.entity.PortCallsEntity; -import com.snp.batch.jobs.shipMovementPortCalls.batch.processor.PortCallsProcessor; -import com.snp.batch.jobs.shipMovementPortCalls.batch.reader.PortCallsRangeReader; -import com.snp.batch.jobs.shipMovementPortCalls.batch.reader.PortCallsReader; -import com.snp.batch.jobs.shipMovementPortCalls.batch.writer.PortCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; +import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.PortCallsProcessor; +import com.snp.batch.jobs.movement.batch.reader.PortCallsRangeReader; +import com.snp.batch.jobs.movement.batch.writer.PortCallsWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/config/StsOperationJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/config/StsOperationJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationJobConfig.java index d2a5cce..e2c961e 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/config/StsOperationJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementStsOperations.batch.dto.StsOperationDto; -import com.snp.batch.jobs.shipMovementStsOperations.batch.entity.StsOperationEntity; -import com.snp.batch.jobs.shipMovementStsOperations.batch.processor.StsOperationProcessor; -import com.snp.batch.jobs.shipMovementStsOperations.batch.reader.StsOperationReader; -import com.snp.batch.jobs.shipMovementStsOperations.batch.writer.StsOperationWriter; +import com.snp.batch.jobs.movement.batch.processor.StsOperationProcessor; +import com.snp.batch.jobs.movement.batch.reader.StsOperationReader; +import com.snp.batch.jobs.movement.batch.writer.StsOperationWriter; +import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; +import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/config/StsOperationRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/config/StsOperationRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java index d348e3b..fb8bb71 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/config/StsOperationRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java @@ -1,12 +1,11 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.reader.DarkActivityRangeReader; -import com.snp.batch.jobs.shipMovementStsOperations.batch.dto.StsOperationDto; -import com.snp.batch.jobs.shipMovementStsOperations.batch.entity.StsOperationEntity; -import com.snp.batch.jobs.shipMovementStsOperations.batch.processor.StsOperationProcessor; -import com.snp.batch.jobs.shipMovementStsOperations.batch.reader.StsOperationRangeReader; -import com.snp.batch.jobs.shipMovementStsOperations.batch.writer.StsOperationWriter; +import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; +import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.movement.batch.processor.StsOperationProcessor; +import com.snp.batch.jobs.movement.batch.reader.StsOperationRangeReader; +import com.snp.batch.jobs.movement.batch.writer.StsOperationWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/config/TerminalCallsJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/config/TerminalCallsJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsJobConfig.java index a221b25..228ce73 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/config/TerminalCallsJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto.TerminalCallsDto; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.processor.TerminalCallsProcessor; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.reader.TerminalCallsReader; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.writer.TerminalCallsWriter; +import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.TerminalCallsProcessor; +import com.snp.batch.jobs.movement.batch.reader.TerminalCallsReader; +import com.snp.batch.jobs.movement.batch.writer.TerminalCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/config/TerminalCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java similarity index 85% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/config/TerminalCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java index 72b068c..e47709d 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/config/TerminalCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java @@ -1,13 +1,11 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.reader.DarkActivityRangeReader; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto.TerminalCallsDto; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.processor.TerminalCallsProcessor; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.reader.TerminalCallsRangeReader; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.reader.TerminalCallsReader; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.writer.TerminalCallsWriter; +import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.movement.batch.processor.TerminalCallsProcessor; +import com.snp.batch.jobs.movement.batch.writer.TerminalCallsWriter; +import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; +import com.snp.batch.jobs.movement.batch.reader.TerminalCallsRangeReader; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/config/TransitsJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsJobConfig.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/config/TransitsJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsJobConfig.java index f6d65ba..18f027e 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/config/TransitsJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementTransits.batch.dto.TransitsDto; -import com.snp.batch.jobs.shipMovementTransits.batch.entity.TransitsEntity; -import com.snp.batch.jobs.shipMovementTransits.batch.processor.TransitsProcessor; -import com.snp.batch.jobs.shipMovementTransits.batch.reader.TransitsReader; -import com.snp.batch.jobs.shipMovementTransits.batch.writer.TransitsWriter; +import com.snp.batch.jobs.movement.batch.dto.TransitsDto; +import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.movement.batch.processor.TransitsProcessor; +import com.snp.batch.jobs.movement.batch.reader.TransitsReader; +import com.snp.batch.jobs.movement.batch.writer.TransitsWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/config/TransitsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/config/TransitsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java index b473b39..a5aacb4 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/config/TransitsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java @@ -1,13 +1,11 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.config; +package com.snp.batch.jobs.movement.batch.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.reader.DarkActivityRangeReader; -import com.snp.batch.jobs.shipMovementTransits.batch.dto.TransitsDto; -import com.snp.batch.jobs.shipMovementTransits.batch.entity.TransitsEntity; -import com.snp.batch.jobs.shipMovementTransits.batch.processor.TransitsProcessor; -import com.snp.batch.jobs.shipMovementTransits.batch.reader.TransitsRangeReader; -import com.snp.batch.jobs.shipMovementTransits.batch.reader.TransitsReader; -import com.snp.batch.jobs.shipMovementTransits.batch.writer.TransitsWriter; +import com.snp.batch.jobs.movement.batch.reader.TransitsRangeReader; +import com.snp.batch.jobs.movement.batch.dto.TransitsDto; +import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.movement.batch.processor.TransitsProcessor; +import com.snp.batch.jobs.movement.batch.writer.TransitsWriter; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; @@ -20,7 +18,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/dto/AnchorageCallsDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/dto/AnchorageCallsDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java index cd26678..0d4e885 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/dto/AnchorageCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java @@ -1,9 +1,7 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; -import java.time.LocalDateTime; - @Data public class AnchorageCallsDto { private String movementType; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/dto/AnchorageCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java similarity index 85% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/dto/AnchorageCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java index 23d3613..419eb7d 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/dto/AnchorageCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/dto/BerthCallsDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/dto/BerthCallsDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java index 9483216..d133f60 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/dto/BerthCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/dto/BerthCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/dto/BerthCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java index ffc652c..365cce3 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/dto/BerthCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java index 121cdca..7cdc0a9 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java @@ -1,6 +1,5 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.PortCallsPositionDto; import lombok.Data; @Data diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java index 0fed56a..96e8b1b 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/dto/DarkActivityDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DarkActivityDto.java similarity index 79% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/dto/DarkActivityDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/DarkActivityDto.java index 2c05582..02e5826 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/dto/DarkActivityDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DarkActivityDto.java @@ -1,6 +1,5 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsPositionDto; import lombok.Data; @Data diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/dto/DarkActivityPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DarkActivityPositionDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/dto/DarkActivityPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/DarkActivityPositionDto.java index d67d7db..866563c 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/dto/DarkActivityPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DarkActivityPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/dto/DestinationDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/dto/DestinationDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java index c150ee4..ff5804e 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/dto/DestinationDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/dto/DestinationPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/dto/DestinationPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java index f600d28..d9f5d28 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/dto/DestinationPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/PortCallsDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/PortCallsDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java index 272626d..f67a702 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/PortCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/PortCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java similarity index 85% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/PortCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java index a960e8c..fa1e531 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/PortCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/ShipMovementApiResponse.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/ShipMovementApiResponse.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java index f32b864..f1464ef 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/dto/ShipMovementApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/dto/StsOperationDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/dto/StsOperationDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java index 0a7fca7..4318ec3 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/dto/StsOperationDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/dto/StsOperationPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/dto/StsOperationPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java index 85496f0..4410970 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/dto/StsOperationPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/dto/TerminalCallsDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/dto/TerminalCallsDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java index d35a7d7..ed8d8a1 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/dto/TerminalCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/dto/TerminalCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/dto/TerminalCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java index 844f8bb..1179f09 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/dto/TerminalCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/dto/TransitsDto.java b/src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/dto/TransitsDto.java rename to src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java index 7dd2958..d3351b9 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/dto/TransitsDto.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.dto; +package com.snp.batch.jobs.movement.batch.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/entiity/BerthCallsEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entiity/BerthCallsEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/entiity/BerthCallsEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entiity/BerthCallsEntity.java index 4cc1b8f..4abbd2c 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/entiity/BerthCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entiity/BerthCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity; +package com.snp.batch.jobs.movement.batch.entiity; import com.fasterxml.jackson.databind.JsonNode; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/entity/AnchorageCallsEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/entity/AnchorageCallsEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java index 70aaad8..7487582 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/entity/AnchorageCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java index 90beda4..ffef239 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/entity/DarkActivityEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/DarkActivityEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/entity/DarkActivityEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/DarkActivityEntity.java index f05aea5..7d2fa6f 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/entity/DarkActivityEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/DarkActivityEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/entity/DestinationEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/entity/DestinationEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java index fa2a23a..f3523f6 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/entity/DestinationEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/entity/PortCallsEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/entity/PortCallsEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java index d519d63..268f652 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/entity/PortCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/entity/StsOperationEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/entity/StsOperationEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java index e47acf0..1902bca 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/entity/StsOperationEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/entity/TerminalCallsEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/entity/TerminalCallsEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java index a003375..2a76582 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/entity/TerminalCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/entity/TransitsEntity.java b/src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/entity/TransitsEntity.java rename to src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java index ddfe811..d2875c8 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/entity/TransitsEntity.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.entity; +package com.snp.batch.jobs.movement.batch.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/processor/AnchorageCallsProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/processor/AnchorageCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java index ee03a7e..5f47127 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/processor/AnchorageCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; +import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/processor/BerthCallsProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/processor/BerthCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java index d196256..f95aa5f 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/processor/BerthCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; +import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java index db905bd..3cd0396 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/processor/DarkActivityProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/DarkActivityProcessor.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/processor/DarkActivityProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/DarkActivityProcessor.java index e465f8a..a456b6c 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/processor/DarkActivityProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/DarkActivityProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.dto.DarkActivityDto; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.entity.DarkActivityEntity; +import com.snp.batch.jobs.movement.batch.dto.DarkActivityDto; +import com.snp.batch.jobs.movement.batch.entity.DarkActivityEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/processor/DestinationProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/processor/DestinationProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java index 8379fe5..3550fb5 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/processor/DestinationProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementDestination.batch.dto.DestinationDto; -import com.snp.batch.jobs.shipMovementDestination.batch.entity.DestinationEntity; +import com.snp.batch.jobs.movement.batch.dto.DestinationDto; +import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/processor/PortCallsProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/processor/PortCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java index 4df08aa..825c8fc 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/processor/PortCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.PortCallsDto; -import com.snp.batch.jobs.shipMovementPortCalls.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; +import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/processor/StsOperationProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/processor/StsOperationProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java index fdb73bd..7ecda55 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/processor/StsOperationProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementStsOperations.batch.dto.StsOperationDto; -import com.snp.batch.jobs.shipMovementStsOperations.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; +import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/processor/TerminalCallsProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/processor/TerminalCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java index 8438cc4..080dc4d 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/processor/TerminalCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto.TerminalCallsDto; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; +import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/processor/TransitsProcessor.java b/src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java similarity index 86% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/processor/TransitsProcessor.java rename to src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java index 8c7df92..813a15a 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/processor/TransitsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.processor; +package com.snp.batch.jobs.movement.batch.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipMovementTransits.batch.dto.TransitsDto; -import com.snp.batch.jobs.shipMovementTransits.batch.entity.TransitsEntity; +import com.snp.batch.jobs.movement.batch.dto.TransitsDto; +import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/reader/AnchorageCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/reader/AnchorageCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java index 66f9021..df73716 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/reader/AnchorageCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsDto; +import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/reader/AnchorageCallsReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/reader/AnchorageCallsReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsReader.java index 60957d2..187e3f7 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/reader/AnchorageCallsReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsDto; +import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/reader/BerthCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/reader/BerthCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java index 5ebfdf2..d02c47a 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/reader/BerthCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/reader/BerthCallsReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/reader/BerthCallsReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsReader.java index 3d7f5c7..c626bc2 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/reader/BerthCallsReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java index 1d7120e..baaf074 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtReader.java index 26d0552..668aa43 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/reader/DarkActivityRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DarkActivityRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/reader/DarkActivityRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/DarkActivityRangeReader.java index 2c72717..020f381 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/reader/DarkActivityRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DarkActivityRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.dto.DarkActivityDto; +import com.snp.batch.jobs.movement.batch.dto.DarkActivityDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/reader/DarkActivityReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DarkActivityReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/reader/DarkActivityReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/DarkActivityReader.java index 7587fad..af2cab9 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/reader/DarkActivityReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DarkActivityReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.dto.DarkActivityDto; +import com.snp.batch.jobs.movement.batch.dto.DarkActivityDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/reader/DestinationRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/reader/DestinationRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java index 7ce34c4..0a01368 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/reader/DestinationRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementDestination.batch.dto.DestinationDto; +import com.snp.batch.jobs.movement.batch.dto.DestinationDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/reader/DestinationReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/reader/DestinationReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationReader.java index a57adbe..3727b1c 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/reader/DestinationReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementDestination.batch.dto.DestinationDto; +import com.snp.batch.jobs.movement.batch.dto.DestinationDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; @@ -9,7 +9,6 @@ import org.springframework.web.reactive.function.client.WebClient; import java.util.Collections; import java.util.List; -import java.util.Map; /** * 선박 상세 정보 Reader (v2.0 - Chunk 기반) diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/reader/PortCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/reader/PortCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java index 196345f..a4f7fc1 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/reader/PortCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.PortCallsDto; +import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/reader/PortCallsReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsReader.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/reader/PortCallsReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsReader.java index 086a902..65b80fd 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/reader/PortCallsReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsReader.java @@ -1,13 +1,10 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.PortCallsDto; -import com.snp.batch.jobs.shipMovementPortCalls.batch.dto.ShipMovementApiResponse; +import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; -import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/reader/StsOperationRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/reader/StsOperationRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java index 0b2c56e..6fc067e 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/reader/StsOperationRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementStsOperations.batch.dto.StsOperationDto; +import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/reader/StsOperationReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/reader/StsOperationReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationReader.java index 5aff9b9..f844d3e 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/reader/StsOperationReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementStsOperations.batch.dto.StsOperationDto; +import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/reader/TerminalCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/reader/TerminalCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java index f5bff28..4ead4c9 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/reader/TerminalCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java @@ -1,19 +1,15 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.dto.DarkActivityDto; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto.TerminalCallsDto; +import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.reactive.function.client.WebClient; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Collections; import java.util.List; -import java.util.Map; /** * 선박 상세 정보 Reader (v2.0 - Chunk 기반) diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/reader/TerminalCallsReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/reader/TerminalCallsReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsReader.java index 62a9061..65cfe48 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/reader/TerminalCallsReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.dto.TerminalCallsDto; +import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/reader/TransitsRangeReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/reader/TransitsRangeReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java index 23abbb0..b4a0a86 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/reader/TransitsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementTransits.batch.dto.TransitsDto; +import com.snp.batch.jobs.movement.batch.dto.TransitsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/reader/TransitsReader.java b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/reader/TransitsReader.java rename to src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsReader.java index daf2b94..1923fee 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/reader/TransitsReader.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.reader; +package com.snp.batch.jobs.movement.batch.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipMovementTransits.batch.dto.TransitsDto; +import com.snp.batch.jobs.movement.batch.dto.TransitsDto; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.jdbc.core.JdbcTemplate; @@ -9,7 +9,6 @@ import org.springframework.web.reactive.function.client.WebClient; import java.util.Collections; import java.util.List; -import java.util.Map; /** * 선박 상세 정보 Reader (v2.0 - Chunk 기반) diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java similarity index 53% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepository.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java index 991f551..7101a51 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java index 0b8e741..4c79cf1 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java new file mode 100644 index 0000000..cdd96b8 --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java @@ -0,0 +1,13 @@ +package com.snp.batch.jobs.movement.batch.repository; + +import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity; + +import java.util.List; + +/** + * 선박 상세 정보 Repository 인터페이스 + */ + +public interface BerthCallsRepository { + void saveAll(List entities); +} diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java index 6cf0f61..d26c7c5 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java @@ -1,11 +1,9 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.repository.AnchorageCallsRepository; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; +import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java similarity index 54% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java index ae47b79..5f105c0 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java index 358731d..845075f 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepository.java new file mode 100644 index 0000000..d8fe068 --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepository.java @@ -0,0 +1,13 @@ +package com.snp.batch.jobs.movement.batch.repository; + +import com.snp.batch.jobs.movement.batch.entity.DarkActivityEntity; + +import java.util.List; + +/** + * 선박 상세 정보 Repository 인터페이스 + */ + +public interface DarkActivityRepository { + void saveAll(List entities); +} diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepositoryImpl.java index 12ceb9e..f255d60 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DarkActivityRepositoryImpl.java @@ -1,11 +1,9 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.repository.BerthCallsRepository; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.entity.DarkActivityEntity; +import com.snp.batch.jobs.movement.batch.entity.DarkActivityEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java new file mode 100644 index 0000000..0bc014c --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java @@ -0,0 +1,13 @@ +package com.snp.batch.jobs.movement.batch.repository; + +import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; + +import java.util.List; + +/** + * 선박 상세 정보 Repository 인터페이스 + */ + +public interface DestinationRepository { + void saveAll(List entities); +} diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java index 7147469..22f2773 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementDestination.batch.entity.DestinationEntity; +import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/repository/PortCallsRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java similarity index 61% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/repository/PortCallsRepository.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java index bb45152..bd65bb1 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/repository/PortCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.snp.batch.jobs.shipMovementPortCalls.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/repository/PortCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/repository/PortCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java index eb3f6e6..af04a13 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/repository/PortCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementPortCalls.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java similarity index 53% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepository.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java index a081c51..c9abd34 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepository.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.snp.batch.jobs.shipMovementStsOperations.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; import java.util.List; /** diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java index 8dabe87..df8e80e 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java @@ -1,17 +1,14 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementStsOperations.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Repository; import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Timestamp; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java similarity index 54% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepository.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java index 6b22b39..71ee017 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java index 2eb31f0..adbdb03 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java @@ -1,17 +1,14 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Repository; import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Timestamp; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitsRepository.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java similarity index 55% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitsRepository.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java index e134548..235f3ef 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitsRepository.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; -import com.snp.batch.jobs.shipMovementTransits.batch.entity.TransitsEntity; +import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java index 50f2802..05ad9fc 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.repository; +package com.snp.batch.jobs.movement.batch.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipMovementTransits.batch.entity.TransitsEntity; +import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/writer/AnchorageCallsWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java similarity index 76% rename from src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/writer/AnchorageCallsWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java index 1d3b826..b3600ab 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/writer/AnchorageCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementAnchorageCalls.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.repository.AnchorageCallsRepository; +import com.snp.batch.jobs.movement.batch.repository.AnchorageCallsRepository; +import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/writer/BerthCallsWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java similarity index 76% rename from src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/writer/BerthCallsWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java index 11984b1..a938e1f 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/writer/BerthCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.repository.BerthCallsRepository; +import com.snp.batch.jobs.movement.batch.repository.BerthCallsRepository; +import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java similarity index 77% rename from src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java index ceea6b6..fbd95fe 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity; -import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository.CurrentlyAtRepository; +import com.snp.batch.jobs.movement.batch.repository.CurrentlyAtRepository; +import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/writer/DarkActivityWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/DarkActivityWriter.java similarity index 66% rename from src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/writer/DarkActivityWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/DarkActivityWriter.java index 901876c..62d52b7 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/writer/DarkActivityWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/DarkActivityWriter.java @@ -1,10 +1,8 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.repository.BerthCallsRepository; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.entity.DarkActivityEntity; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.repository.DarkActivityRepository; +import com.snp.batch.jobs.movement.batch.repository.DarkActivityRepository; +import com.snp.batch.jobs.movement.batch.entity.DarkActivityEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/writer/DestinationWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java similarity index 71% rename from src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/writer/DestinationWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java index be05993..a7bf3b5 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/writer/DestinationWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java @@ -1,9 +1,8 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementDestination.batch.entity.DestinationEntity; -import com.snp.batch.jobs.shipMovementDestination.batch.repository.DestinationRepository; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.movement.batch.repository.DestinationRepository; +import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/writer/PortCallsWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java similarity index 67% rename from src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/writer/PortCallsWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java index 20fe890..8ec07cf 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementPortCalls/batch/writer/PortCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java @@ -1,10 +1,8 @@ -package com.snp.batch.jobs.shipMovementPortCalls.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementPortCalls.batch.entity.PortCallsEntity; -import com.snp.batch.jobs.shipMovementPortCalls.batch.repository.PortCallsRepository; -import com.snp.batch.jobs.shipdetail.batch.repository.ShipDetailRepository; -import com.snp.batch.jobs.shipdetail.batch.repository.ShipHashRepository; +import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.movement.batch.repository.PortCallsRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/writer/StsOperationWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java similarity index 76% rename from src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/writer/StsOperationWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java index 44c5536..3decdc1 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/writer/StsOperationWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementStsOperations.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementStsOperations.batch.entity.StsOperationEntity; -import com.snp.batch.jobs.shipMovementStsOperations.batch.repository.StsOperationRepository; +import com.snp.batch.jobs.movement.batch.repository.StsOperationRepository; +import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/writer/TerminalCallsWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java similarity index 76% rename from src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/writer/TerminalCallsWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java index c5d1a2a..70c779b 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/writer/TerminalCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementTerminalCalls.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.repository.TerminalCallsRepository; +import com.snp.batch.jobs.movement.batch.repository.TerminalCallsRepository; +import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/writer/TransitsWriter.java b/src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java similarity index 77% rename from src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/writer/TransitsWriter.java rename to src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java index 2e72d53..bcf3f49 100644 --- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/writer/TransitsWriter.java +++ b/src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipMovementTransits.batch.writer; +package com.snp.batch.jobs.movement.batch.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipMovementTransits.batch.entity.TransitsEntity; -import com.snp.batch.jobs.shipMovementTransits.batch.repository.TransitsRepository; +import com.snp.batch.jobs.movement.batch.repository.TransitsRepository; +import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepository.java b/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepository.java deleted file mode 100644 index df2d707..0000000 --- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.snp.batch.jobs.shipMovementBerthCalls.batch.repository; - -import com.snp.batch.jobs.shipMovementAnchorageCalls.batch.entity.AnchorageCallsEntity; -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; - -import java.util.List; - -/** - * 선박 상세 정보 Repository 인터페이스 - */ - -public interface BerthCallsRepository { - void saveAll(List entities); -} diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepository.java b/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepository.java deleted file mode 100644 index f18da07..0000000 --- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.snp.batch.jobs.shipMovementDarkActivity.batch.repository; - -import com.snp.batch.jobs.shipMovementBerthCalls.batch.entiity.BerthCallsEntity; -import com.snp.batch.jobs.shipMovementDarkActivity.batch.entity.DarkActivityEntity; - -import java.util.List; - -/** - * 선박 상세 정보 Repository 인터페이스 - */ - -public interface DarkActivityRepository { - void saveAll(List entities); -} diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepository.java b/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepository.java deleted file mode 100644 index 4613e37..0000000 --- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.snp.batch.jobs.shipMovementDestination.batch.repository; - -import com.snp.batch.jobs.shipMovementDestination.batch.entity.DestinationEntity; -import com.snp.batch.jobs.shipMovementTerminalCalls.batch.entity.TerminalCallsEntity; - -import java.util.List; - -/** - * 선박 상세 정보 Repository 인터페이스 - */ - -public interface DestinationRepository { - void saveAll(List entities); -}