diff --git a/src/main/java/com/snp/batch/jobs/common/batch/config/FlagCodeImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/common/config/FlagCodeImportJobConfig.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/common/batch/config/FlagCodeImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/common/config/FlagCodeImportJobConfig.java index f30fcc9..87faea3 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/config/FlagCodeImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/config/FlagCodeImportJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.common.batch.config; +package com.snp.batch.jobs.batch.common.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.common.batch.dto.FlagCodeDto; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; -import com.snp.batch.jobs.common.batch.processor.FlagCodeDataProcessor; -import com.snp.batch.jobs.common.batch.reader.FlagCodeDataReader; -import com.snp.batch.jobs.common.batch.repository.FlagCodeRepository; -import com.snp.batch.jobs.common.batch.writer.FlagCodeDataWriter; -import com.snp.batch.jobs.facility.batch.reader.PortDataReader; +import com.snp.batch.jobs.batch.common.dto.FlagCodeDto; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.processor.FlagCodeDataProcessor; +import com.snp.batch.jobs.batch.common.reader.FlagCodeDataReader; +import com.snp.batch.jobs.batch.common.repository.FlagCodeRepository; +import com.snp.batch.jobs.batch.common.writer.FlagCodeDataWriter; +import com.snp.batch.jobs.batch.facility.reader.PortDataReader; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/config/Stat5CodeImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/common/config/Stat5CodeImportJobConfig.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/common/batch/config/Stat5CodeImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/common/config/Stat5CodeImportJobConfig.java index b27b652..24daba1 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/config/Stat5CodeImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/config/Stat5CodeImportJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.common.batch.config; +package com.snp.batch.jobs.batch.common.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeDto; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; -import com.snp.batch.jobs.common.batch.processor.Stat5CodeDataProcessor; -import com.snp.batch.jobs.common.batch.reader.Stat5CodeDataReader; -import com.snp.batch.jobs.common.batch.repository.Stat5CodeRepository; -import com.snp.batch.jobs.common.batch.writer.Stat5CodeDataWriter; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeDto; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.processor.Stat5CodeDataProcessor; +import com.snp.batch.jobs.batch.common.reader.Stat5CodeDataReader; +import com.snp.batch.jobs.batch.common.repository.Stat5CodeRepository; +import com.snp.batch.jobs.batch.common.writer.Stat5CodeDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeApiResponse.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeApiResponse.java index 3e3a51f..11ecc8f 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeDto.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeDto.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeDto.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeDto.java index c763da7..f8469bb 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeApiResponse.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeApiResponse.java index f8f60e1..9cb25d2 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeDto.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeDto.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeDto.java index c50fc10..e851e4b 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/entity/FlagCodeEntity.java b/src/main/java/com/snp/batch/jobs/batch/common/entity/FlagCodeEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/common/batch/entity/FlagCodeEntity.java rename to src/main/java/com/snp/batch/jobs/batch/common/entity/FlagCodeEntity.java index 995d108..e08384e 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/entity/FlagCodeEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/entity/FlagCodeEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.entity; +package com.snp.batch.jobs.batch.common.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/entity/Stat5CodeEntity.java b/src/main/java/com/snp/batch/jobs/batch/common/entity/Stat5CodeEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/common/batch/entity/Stat5CodeEntity.java rename to src/main/java/com/snp/batch/jobs/batch/common/entity/Stat5CodeEntity.java index b5e2d76..e527b4d 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/entity/Stat5CodeEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/entity/Stat5CodeEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.entity; +package com.snp.batch.jobs.batch.common.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/processor/FlagCodeDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/common/processor/FlagCodeDataProcessor.java similarity index 86% rename from src/main/java/com/snp/batch/jobs/common/batch/processor/FlagCodeDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/common/processor/FlagCodeDataProcessor.java index a5f95b1..1d3d21e 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/processor/FlagCodeDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/processor/FlagCodeDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.processor; +package com.snp.batch.jobs.batch.common.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.common.batch.dto.FlagCodeDto; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.dto.FlagCodeDto; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/processor/Stat5CodeDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/common/processor/Stat5CodeDataProcessor.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/common/batch/processor/Stat5CodeDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/common/processor/Stat5CodeDataProcessor.java index 27fa993..4f58b96 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/processor/Stat5CodeDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/processor/Stat5CodeDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.processor; +package com.snp.batch.jobs.batch.common.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeDto; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeDto; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/reader/FlagCodeDataReader.java b/src/main/java/com/snp/batch/jobs/batch/common/reader/FlagCodeDataReader.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/common/batch/reader/FlagCodeDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/common/reader/FlagCodeDataReader.java index 544851e..087f08a 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/reader/FlagCodeDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/reader/FlagCodeDataReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.reader; +package com.snp.batch.jobs.batch.common.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.common.batch.dto.FlagCodeApiResponse; -import com.snp.batch.jobs.common.batch.dto.FlagCodeDto; +import com.snp.batch.jobs.batch.common.dto.FlagCodeApiResponse; +import com.snp.batch.jobs.batch.common.dto.FlagCodeDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/reader/Stat5CodeDataReader.java b/src/main/java/com/snp/batch/jobs/batch/common/reader/Stat5CodeDataReader.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/common/batch/reader/Stat5CodeDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/common/reader/Stat5CodeDataReader.java index e887aa0..06cd146 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/reader/Stat5CodeDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/reader/Stat5CodeDataReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.reader; +package com.snp.batch.jobs.batch.common.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeApiResponse; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeDto; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeApiResponse; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepository.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepository.java similarity index 51% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepository.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepository.java index 304bb8b..46ced31 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepositoryImpl.java index 3a78ad8..82d3081 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepository.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepository.java similarity index 51% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepository.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepository.java index 10edd49..ccfb173 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepositoryImpl.java index bd52cd5..06b1bbe 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/writer/FlagCodeDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/common/writer/FlagCodeDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/common/batch/writer/FlagCodeDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/common/writer/FlagCodeDataWriter.java index 5c5b82e..6cd64a0 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/writer/FlagCodeDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/writer/FlagCodeDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.writer; +package com.snp.batch.jobs.batch.common.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; -import com.snp.batch.jobs.common.batch.repository.FlagCodeRepository; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.repository.FlagCodeRepository; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/writer/Stat5CodeDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/common/writer/Stat5CodeDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/common/batch/writer/Stat5CodeDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/common/writer/Stat5CodeDataWriter.java index 9f8267e..c78bc95 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/writer/Stat5CodeDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/writer/Stat5CodeDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.writer; +package com.snp.batch.jobs.batch.common.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; -import com.snp.batch.jobs.common.batch.repository.Stat5CodeRepository; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.repository.Stat5CodeRepository; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/config/CompanyComplianceImportRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/compliance/config/CompanyComplianceImportRangeJobConfig.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/compliance/batch/config/CompanyComplianceImportRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/config/CompanyComplianceImportRangeJobConfig.java index a4ce742..74e45e1 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/config/CompanyComplianceImportRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/config/CompanyComplianceImportRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.compliance.batch.config; +package com.snp.batch.jobs.batch.compliance.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.compliance.batch.dto.CompanyComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; -import com.snp.batch.jobs.compliance.batch.processor.CompanyComplianceDataProcessor; -import com.snp.batch.jobs.compliance.batch.reader.CompanyComplianceDataRangeReader; -import com.snp.batch.jobs.compliance.batch.writer.CompanyComplianceDataWriter; +import com.snp.batch.jobs.batch.compliance.dto.CompanyComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.processor.CompanyComplianceDataProcessor; +import com.snp.batch.jobs.batch.compliance.reader.CompanyComplianceDataRangeReader; +import com.snp.batch.jobs.batch.compliance.writer.CompanyComplianceDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/config/ComplianceImportRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/compliance/config/ComplianceImportRangeJobConfig.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/compliance/batch/config/ComplianceImportRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/config/ComplianceImportRangeJobConfig.java index fa496d2..463c767 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/config/ComplianceImportRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/config/ComplianceImportRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.compliance.batch.config; +package com.snp.batch.jobs.batch.compliance.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.compliance.batch.dto.ComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; -import com.snp.batch.jobs.compliance.batch.processor.ComplianceDataProcessor; -import com.snp.batch.jobs.compliance.batch.reader.ComplianceDataRangeReader; -import com.snp.batch.jobs.compliance.batch.writer.ComplianceDataWriter; +import com.snp.batch.jobs.batch.compliance.dto.ComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.processor.ComplianceDataProcessor; +import com.snp.batch.jobs.batch.compliance.reader.ComplianceDataRangeReader; +import com.snp.batch.jobs.batch.compliance.writer.ComplianceDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/CompanyComplianceDto.java b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/CompanyComplianceDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/dto/CompanyComplianceDto.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/dto/CompanyComplianceDto.java index ecbc837..1d47c00 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/CompanyComplianceDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/CompanyComplianceDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.dto; +package com.snp.batch.jobs.batch.compliance.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/ComplianceDto.java b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/ComplianceDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/compliance/batch/dto/ComplianceDto.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/dto/ComplianceDto.java index 4b7d032..683145b 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/ComplianceDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/ComplianceDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.dto; +package com.snp.batch.jobs.batch.compliance.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/CompanyComplianceEntity.java b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/CompanyComplianceEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/compliance/batch/entity/CompanyComplianceEntity.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/entity/CompanyComplianceEntity.java index 1ea272c..6515242 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/CompanyComplianceEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/CompanyComplianceEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.entity; +package com.snp.batch.jobs.batch.compliance.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/ComplianceEntity.java b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/ComplianceEntity.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/compliance/batch/entity/ComplianceEntity.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/entity/ComplianceEntity.java index e363042..c49ac02 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/ComplianceEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/ComplianceEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.entity; +package com.snp.batch.jobs.batch.compliance.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/CompanyComplianceDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/CompanyComplianceDataProcessor.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/compliance/batch/processor/CompanyComplianceDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/processor/CompanyComplianceDataProcessor.java index 211ba1c..7ce2d3b 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/CompanyComplianceDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/CompanyComplianceDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.processor; +package com.snp.batch.jobs.batch.compliance.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.compliance.batch.dto.CompanyComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.dto.CompanyComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/ComplianceDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/ComplianceDataProcessor.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/compliance/batch/processor/ComplianceDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/processor/ComplianceDataProcessor.java index 7145776..a33c7f3 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/ComplianceDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/ComplianceDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.processor; +package com.snp.batch.jobs.batch.compliance.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.compliance.batch.dto.ComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.dto.ComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/CompanyComplianceDataRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/CompanyComplianceDataRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/reader/CompanyComplianceDataRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/reader/CompanyComplianceDataRangeReader.java index 6170041..5e76273 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/CompanyComplianceDataRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/CompanyComplianceDataRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.reader; +package com.snp.batch.jobs.batch.compliance.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.compliance.batch.dto.CompanyComplianceDto; +import com.snp.batch.jobs.batch.compliance.dto.CompanyComplianceDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/ComplianceDataRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/ComplianceDataRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/reader/ComplianceDataRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/reader/ComplianceDataRangeReader.java index 6c5c185..ee41d5a 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/ComplianceDataRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/ComplianceDataRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.reader; +package com.snp.batch.jobs.batch.compliance.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.compliance.batch.dto.ComplianceDto; +import com.snp.batch.jobs.batch.compliance.dto.ComplianceDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepository.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepository.java similarity index 66% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepository.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepository.java index 6277eec..073ccb9 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepositoryImpl.java index 08ded44..05dddb8 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepository.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepository.java similarity index 62% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepository.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepository.java index b34e42c..94e193d 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepositoryImpl.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepositoryImpl.java index 3a4b365..346ff68 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/CompanyComplianceDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/CompanyComplianceDataWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/compliance/batch/writer/CompanyComplianceDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/writer/CompanyComplianceDataWriter.java index 1f75813..0048638 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/CompanyComplianceDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/CompanyComplianceDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.writer; +package com.snp.batch.jobs.batch.compliance.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; -import com.snp.batch.jobs.compliance.batch.repository.CompanyComplianceRepository; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.repository.CompanyComplianceRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/ComplianceDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/ComplianceDataWriter.java similarity index 80% rename from src/main/java/com/snp/batch/jobs/compliance/batch/writer/ComplianceDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/writer/ComplianceDataWriter.java index e102db3..ef842e3 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/ComplianceDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/ComplianceDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.writer; +package com.snp.batch.jobs.batch.compliance.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; -import com.snp.batch.jobs.compliance.batch.repository.ComplianceRepository; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.repository.ComplianceRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/config/EventImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/event/config/EventImportJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/event/batch/config/EventImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/event/config/EventImportJobConfig.java index d7dd1c8..9f93445 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/config/EventImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/config/EventImportJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.event.batch.config; +package com.snp.batch.jobs.batch.event.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.event.batch.dto.EventDetailDto; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.processor.EventDataProcessor; -import com.snp.batch.jobs.event.batch.reader.EventDataReader; -import com.snp.batch.jobs.event.batch.writer.EventDataWriter; +import com.snp.batch.jobs.batch.event.dto.EventDetailDto; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.processor.EventDataProcessor; +import com.snp.batch.jobs.batch.event.reader.EventDataReader; +import com.snp.batch.jobs.batch.event.writer.EventDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/CargoDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/CargoDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/CargoDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/CargoDto.java index 8a91382..0d57792 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/CargoDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/CargoDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.event.batch.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.CargoEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailDto.java index 38a2fd6..93b90df 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailResponse.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailResponse.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailResponse.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailResponse.java index fe67261..36fbd8a 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventDto.java index 00d2e07..06a46ac 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventPeriod.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventPeriod.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventPeriod.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventPeriod.java index 05e4703..79e6b75 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventPeriod.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventPeriod.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventResponse.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventResponse.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventResponse.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventResponse.java index 7c9118c..d701253 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/HumanCasualtyDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/HumanCasualtyDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/HumanCasualtyDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/HumanCasualtyDto.java index 09ed21c..543db48 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/HumanCasualtyDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/HumanCasualtyDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/RelationshipDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/RelationshipDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/RelationshipDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/RelationshipDto.java index 1d1beae..45b57fa 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/RelationshipDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/RelationshipDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/CargoEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/CargoEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/CargoEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/CargoEntity.java index 8e2e95d..ad3799e 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/CargoEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/CargoEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventDetailEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventDetailEntity.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/EventDetailEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/EventDetailEntity.java index 58b4bda..f159f9c 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventDetailEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/EventEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/EventEntity.java index 6a55161..813ae9d 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/HumanCasualtyEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/HumanCasualtyEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/HumanCasualtyEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/HumanCasualtyEntity.java index d52bd9e..c511a08 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/HumanCasualtyEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/HumanCasualtyEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/RelationshipEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/RelationshipEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/RelationshipEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/RelationshipEntity.java index e3c5ea7..014fa26 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/RelationshipEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/RelationshipEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/processor/EventDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/event/processor/EventDataProcessor.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/event/batch/processor/EventDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/event/processor/EventDataProcessor.java index 899a04b..f8876c5 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/processor/EventDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/processor/EventDataProcessor.java @@ -1,15 +1,15 @@ -package com.snp.batch.jobs.event.batch.processor; +package com.snp.batch.jobs.batch.event.processor; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.event.batch.dto.CargoDto; -import com.snp.batch.jobs.event.batch.dto.EventDetailDto; -import com.snp.batch.jobs.event.batch.dto.HumanCasualtyDto; -import com.snp.batch.jobs.event.batch.dto.RelationshipDto; -import com.snp.batch.jobs.event.batch.entity.CargoEntity; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; +import com.snp.batch.jobs.batch.event.dto.CargoDto; +import com.snp.batch.jobs.batch.event.dto.EventDetailDto; +import com.snp.batch.jobs.batch.event.dto.HumanCasualtyDto; +import com.snp.batch.jobs.batch.event.dto.RelationshipDto; +import com.snp.batch.jobs.batch.event.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java b/src/main/java/com/snp/batch/jobs/batch/event/reader/EventDataReader.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/event/reader/EventDataReader.java index 602c2b5..ca96c57 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/reader/EventDataReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.reader; +package com.snp.batch.jobs.batch.event.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.event.batch.dto.*; +import com.snp.batch.jobs.batch.event.dto.*; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java new file mode 100644 index 0000000..7cf97e0 --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java @@ -0,0 +1,15 @@ +package com.snp.batch.jobs.batch.event.repository; + +import com.snp.batch.jobs.batch.event.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; + +import java.util.List; + +public interface EventRepository { + void saveEventAll(List items); + void saveCargoAll(List items); + void saveHumanCasualtyAll(List items); + void saveRelationshipAll(List items); +} diff --git a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepositoryImpl.java index abee759..e595e48 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.event.batch.repository; +package com.snp.batch.jobs.batch.event.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.event.batch.entity.CargoEntity; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; +import com.snp.batch.jobs.batch.event.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventSql.java b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventSql.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/event/batch/repository/EventSql.java rename to src/main/java/com/snp/batch/jobs/batch/event/repository/EventSql.java index 8e25561..b7bcec4 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventSql.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventSql.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.repository; +package com.snp.batch.jobs.batch.event.repository; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/writer/EventDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/event/writer/EventDataWriter.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/event/batch/writer/EventDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/event/writer/EventDataWriter.java index 7185f9c..dafa951 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/writer/EventDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/writer/EventDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.event.batch.writer; +package com.snp.batch.jobs.batch.event.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.repository.EventRepository; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.repository.EventRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/config/PortImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/facility/config/PortImportJobConfig.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/facility/batch/config/PortImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/facility/config/PortImportJobConfig.java index cf404e1..b5aa0dc 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/config/PortImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/config/PortImportJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.facility.batch.config; +package com.snp.batch.jobs.batch.facility.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.facility.batch.dto.PortDto; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; -import com.snp.batch.jobs.facility.batch.processor.PortDataProcessor; -import com.snp.batch.jobs.facility.batch.reader.PortDataReader; -import com.snp.batch.jobs.facility.batch.writer.PortDataWriter; +import com.snp.batch.jobs.batch.facility.dto.PortDto; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.processor.PortDataProcessor; +import com.snp.batch.jobs.batch.facility.reader.PortDataReader; +import com.snp.batch.jobs.batch.facility.writer.PortDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortDto.java b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/facility/batch/dto/PortDto.java rename to src/main/java/com/snp/batch/jobs/batch/facility/dto/PortDto.java index f324028..8789e29 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.facility.batch.dto; +package com.snp.batch.jobs.batch.facility.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortResponse.java b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortResponse.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/facility/batch/dto/PortResponse.java rename to src/main/java/com/snp/batch/jobs/batch/facility/dto/PortResponse.java index 99918db..4a85a4c 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.facility.batch.dto; +package com.snp.batch.jobs.batch.facility.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/entity/PortEntity.java b/src/main/java/com/snp/batch/jobs/batch/facility/entity/PortEntity.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/facility/batch/entity/PortEntity.java rename to src/main/java/com/snp/batch/jobs/batch/facility/entity/PortEntity.java index b4b7875..49e08be 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/entity/PortEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/entity/PortEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.facility.batch.entity; +package com.snp.batch.jobs.batch.facility.entity; import com.snp.batch.common.batch.entity.BaseEntity; import jakarta.persistence.Embedded; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/processor/PortDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/facility/processor/PortDataProcessor.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/facility/batch/processor/PortDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/facility/processor/PortDataProcessor.java index 391c264..9f5fcac 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/processor/PortDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/processor/PortDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.facility.batch.processor; +package com.snp.batch.jobs.batch.facility.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.facility.batch.dto.PortDto; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.dto.PortDto; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/reader/PortDataReader.java b/src/main/java/com/snp/batch/jobs/batch/facility/reader/PortDataReader.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/facility/batch/reader/PortDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/facility/reader/PortDataReader.java index 26cf8f9..aaff25a 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/reader/PortDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/reader/PortDataReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.facility.batch.reader; +package com.snp.batch.jobs.batch.facility.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.facility.batch.dto.PortDto; +import com.snp.batch.jobs.batch.facility.dto.PortDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java new file mode 100644 index 0000000..7e7223f --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java @@ -0,0 +1,9 @@ +package com.snp.batch.jobs.batch.facility.repository; + +import com.snp.batch.jobs.batch.facility.entity.PortEntity; + +import java.util.List; + +public interface FacilityRepository { + void savePortAll(List items); +} diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepositoryImpl.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepositoryImpl.java index b06eeab..105803b 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.facility.batch.repository; +package com.snp.batch.jobs.batch.facility.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/writer/PortDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/facility/writer/PortDataWriter.java similarity index 79% rename from src/main/java/com/snp/batch/jobs/facility/batch/writer/PortDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/facility/writer/PortDataWriter.java index 2ddafcd..7e2984d 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/writer/PortDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/writer/PortDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.facility.batch.writer; +package com.snp.batch.jobs.batch.facility.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; -import com.snp.batch.jobs.facility.batch.repository.FacilityRepository; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.repository.FacilityRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/config/ImoMetaImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/imometa/config/ImoMetaImportJobConfig.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/imometa/batch/config/ImoMetaImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/config/ImoMetaImportJobConfig.java index bb17920..edf7387 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/config/ImoMetaImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/config/ImoMetaImportJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.imometa.batch.config; +package com.snp.batch.jobs.batch.imometa.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.global.model.BatchApiLog; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaDto; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaResponse; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; -import com.snp.batch.jobs.imometa.batch.reader.ImoMetaDataReader; -import com.snp.batch.jobs.imometa.batch.repository.ImoMetaRepository; -import com.snp.batch.jobs.imometa.batch.writer.ImoMetaDataWriter; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaDto; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaResponse; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.reader.ImoMetaDataReader; +import com.snp.batch.jobs.batch.imometa.repository.ImoMetaRepository; +import com.snp.batch.jobs.batch.imometa.writer.ImoMetaDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaDto.java b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaDto.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaDto.java index 68ddae6..9f43b94 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.imometa.batch.dto; +package com.snp.batch.jobs.batch.imometa.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaResponse.java b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaResponse.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaResponse.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaResponse.java index 57245b1..d653d23 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.imometa.batch.dto; +package com.snp.batch.jobs.batch.imometa.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/entity/ImoMetaEntity.java b/src/main/java/com/snp/batch/jobs/batch/imometa/entity/ImoMetaEntity.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/imometa/batch/entity/ImoMetaEntity.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/entity/ImoMetaEntity.java index b77dc9a..f7fdb65 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/entity/ImoMetaEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/entity/ImoMetaEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.imometa.batch.entity; +package com.snp.batch.jobs.batch.imometa.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/reader/ImoMetaDataReader.java b/src/main/java/com/snp/batch/jobs/batch/imometa/reader/ImoMetaDataReader.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/imometa/batch/reader/ImoMetaDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/reader/ImoMetaDataReader.java index 3703c03..31d50cf 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/reader/ImoMetaDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/reader/ImoMetaDataReader.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.imometa.batch.reader; +package com.snp.batch.jobs.batch.imometa.reader; import com.snp.batch.common.batch.reader.BaseApiReader; import com.snp.batch.global.model.BatchApiLog; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaDto; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaResponse; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaDto; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaResponse; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepository.java b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepository.java similarity index 58% rename from src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepository.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepository.java index ee6edef..6f39731 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.imometa.batch.repository; +package com.snp.batch.jobs.batch.imometa.repository; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepositoryImpl.java index 9857ebd..826c507 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.imometa.batch.repository; +package com.snp.batch.jobs.batch.imometa.repository; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/writer/ImoMetaDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/imometa/writer/ImoMetaDataWriter.java similarity index 77% rename from src/main/java/com/snp/batch/jobs/imometa/batch/writer/ImoMetaDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/writer/ImoMetaDataWriter.java index 2ebc1be..9d5de26 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/writer/ImoMetaDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/writer/ImoMetaDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.imometa.batch.writer; +package com.snp.batch.jobs.batch.imometa.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; -import com.snp.batch.jobs.imometa.batch.repository.ImoMetaRepository; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.repository.ImoMetaRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/AnchorageCallsRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/AnchorageCallsRangeJobConfig.java index 55f5605..246d1e6 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/AnchorageCallsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -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.reader.AnchorageCallsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.AnchorageCallsWriter; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.AnchorageCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.AnchorageCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.AnchorageCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/BerthCallsRangJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/BerthCallsRangJobConfig.java index e2c99cc..eb30f20 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/BerthCallsRangJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.movement.batch.entity.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 com.snp.batch.jobs.batch.movement.dto.BerthCallsDto; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.BerthCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.BerthCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.BerthCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/CurrentlyAtRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/CurrentlyAtRangeJobConfig.java index 5bb8621..226ccd6 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/CurrentlyAtRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -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.reader.CurrentlyAtRangeReader; -import com.snp.batch.jobs.movement.batch.writer.CurrentlyAtWriter; +import com.snp.batch.jobs.batch.movement.dto.CurrentlyAtDto; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.processor.CurrentlyAtProcessor; +import com.snp.batch.jobs.batch.movement.reader.CurrentlyAtRangeReader; +import com.snp.batch.jobs.batch.movement.writer.CurrentlyAtWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/DestinationsRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/DestinationsRangeJobConfig.java index 9aa35ea..9e74c79 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/DestinationsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -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.reader.DestinationRangeReader; -import com.snp.batch.jobs.movement.batch.writer.DestinationWriter; +import com.snp.batch.jobs.batch.movement.dto.DestinationDto; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.processor.DestinationProcessor; +import com.snp.batch.jobs.batch.movement.reader.DestinationRangeReader; +import com.snp.batch.jobs.batch.movement.writer.DestinationWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/ShipPortCallsRangeJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/ShipPortCallsRangeJobConfig.java index 92ce464..7758b53 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/ShipPortCallsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -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 com.snp.batch.jobs.batch.movement.dto.PortCallsDto; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.PortCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.PortCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.PortCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/StsOperationRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/StsOperationRangeJobConfig.java index 8b35c2a..93c388f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/StsOperationRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -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 com.snp.batch.jobs.batch.movement.dto.StsOperationDto; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.processor.StsOperationProcessor; +import com.snp.batch.jobs.batch.movement.reader.StsOperationRangeReader; +import com.snp.batch.jobs.batch.movement.writer.StsOperationWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/TerminalCallsRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/TerminalCallsRangeJobConfig.java index 59f006a..bbc2f8a 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/TerminalCallsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; -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.TerminalCallsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.TerminalCallsWriter; +import com.snp.batch.jobs.batch.movement.dto.TerminalCallsDto; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.TerminalCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.TerminalCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.TerminalCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/TransitsRangeJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/TransitsRangeJobConfig.java index de521cd..b8b2a14 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/TransitsRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -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.TransitsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.TransitsWriter; +import com.snp.batch.jobs.batch.movement.dto.TransitsDto; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.processor.TransitsProcessor; +import com.snp.batch.jobs.batch.movement.reader.TransitsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.TransitsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsDto.java index 0d4e885..f345154 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsPositionDto.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsPositionDto.java index 419eb7d..856e271 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsDto.java index d133f60..e02a726 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsPositionDto.java index 365cce3..73087d7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtDto.java index 7cdc0a9..22d2728 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtPositionDto.java index 96e8b1b..633def4 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationDto.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationDto.java index ff5804e..b0aaa71 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationPositionDto.java index d9f5d28..33380b4 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsDto.java index f67a702..d8134dc 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsPositionDto.java index fa1e531..ecb13d8 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/ShipMovementApiResponse.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/ShipMovementApiResponse.java index f1464ef..c12d407 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/ShipMovementApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationDto.java index 4318ec3..4b1c9c4 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationPositionDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationPositionDto.java index 4410970..d6bbf9c 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsDto.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsDto.java index 12281e6..6c5cbfe 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsPositionDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsPositionDto.java index 1179f09..33b857d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TransitsDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/TransitsDto.java index d3351b9..4e613f7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TransitsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/AnchorageCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/AnchorageCallsEntity.java index c21cbfd..8eee6dd 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/AnchorageCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/BerthCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/BerthCallsEntity.java index 5553e94..35749a7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/BerthCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/CurrentlyAtEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/CurrentlyAtEntity.java index 5b5c60a..7ba34cf 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/CurrentlyAtEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/DestinationEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/DestinationEntity.java index 3395baa..7ed8a3d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/DestinationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/PortCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/PortCallsEntity.java index 651265a..f2735a7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/PortCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/StsOperationEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/StsOperationEntity.java index 81df3cf..c645a27 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/StsOperationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TerminalCallsEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/TerminalCallsEntity.java index bb68aae..0211cb8 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TerminalCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TransitsEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/TransitsEntity.java index cddbad6..2d3ef25 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TransitsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/AnchorageCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/AnchorageCallsProcessor.java index bd560dd..4174813 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/AnchorageCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/BerthCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/BerthCallsProcessor.java index 0b2a52f..7225e2b 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/BerthCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.BerthCallsDto; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/CurrentlyAtProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/CurrentlyAtProcessor.java index f72b369..8cf0a11 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/CurrentlyAtProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.CurrentlyAtDto; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.dto.CurrentlyAtDto; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/DestinationProcessor.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/DestinationProcessor.java index b6e085c..763c167 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/DestinationProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.DestinationDto; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.dto.DestinationDto; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/PortCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/PortCallsProcessor.java index 52d518d..c767899 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/PortCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.PortCallsDto; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.PortCallsDto; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/StsOperationProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/StsOperationProcessor.java index 3f2fc9c..020f56d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/StsOperationProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.StsOperationDto; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.dto.StsOperationDto; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TerminalCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/TerminalCallsProcessor.java index 28bfa17..c8b686f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TerminalCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.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.movement.batch.dto.TerminalCallsDto; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.TerminalCallsDto; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TransitsProcessor.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/TransitsProcessor.java index 199b9f3..059bbe9 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TransitsProcessor.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.TransitsDto; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.dto.TransitsDto; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/AnchorageCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/AnchorageCallsRangeReader.java index bf0fd8d..82fc637 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/AnchorageCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/BerthCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/BerthCallsRangeReader.java index a742932..ecccd69 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/BerthCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.batch.movement.dto.BerthCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/CurrentlyAtRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/CurrentlyAtRangeReader.java index 0827855..bc28678 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/CurrentlyAtRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.batch.movement.dto.CurrentlyAtDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/DestinationRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/DestinationRangeReader.java index 2c43ec0..de8f560 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/DestinationRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.DestinationDto; +import com.snp.batch.jobs.batch.movement.dto.DestinationDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/PortCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/PortCallsRangeReader.java index aad0ebf..9b76f32 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/PortCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; +import com.snp.batch.jobs.batch.movement.dto.PortCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/StsOperationRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/StsOperationRangeReader.java index b3640bf..fd52d8b 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/StsOperationRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; +import com.snp.batch.jobs.batch.movement.dto.StsOperationDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TerminalCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/TerminalCallsRangeReader.java index 49e7704..c388b12 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TerminalCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; +import com.snp.batch.jobs.batch.movement.dto.TerminalCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TransitsRangeReader.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/TransitsRangeReader.java index b2475be..def5cce 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TransitsRangeReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.movement.batch.dto.TransitsDto; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.dto.TransitsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepository.java similarity index 62% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepository.java index 7101a51..4a7d613 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepositoryImpl.java index 631fe6a..8600f22 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepository.java similarity index 60% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepository.java index b501ac6..8914f3a 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepositoryImpl.java index d2db18c..0c3a39d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepository.java similarity index 60% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepository.java index 5f105c0..24489de 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepositoryImpl.java index 57851c5..b7702ff 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepository.java similarity index 60% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepository.java index 0bc014c..2b5d933 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepositoryImpl.java index e766a67..432831f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepository.java similarity index 50% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepository.java index 9a7ab22..5e98851 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepositoryImpl.java index 9ff1123..c1897d2 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepository.java similarity index 61% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepository.java index c9abd34..a152598 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import java.util.List; /** diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepositoryImpl.java index d023cd7..d549c3f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepository.java similarity index 61% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepository.java index 71ee017..c25a436 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepositoryImpl.java index 38b7f23..bd6f55c 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepository.java similarity index 59% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepository.java index 235f3ef..679e629 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepositoryImpl.java index f289162..24cc769 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/AnchorageCallsWriter.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/AnchorageCallsWriter.java index b3600ab..4c33f8f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/AnchorageCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.AnchorageCallsRepository; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.AnchorageCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/BerthCallsWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/BerthCallsWriter.java index 9efb091..9152be2 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/BerthCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.BerthCallsRepository; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.BerthCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/CurrentlyAtWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/CurrentlyAtWriter.java index fbd95fe..7a0b179 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/CurrentlyAtWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.CurrentlyAtRepository; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.repository.CurrentlyAtRepository; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/DestinationWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/DestinationWriter.java index a7bf3b5..fa00c12 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/DestinationWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.DestinationRepository; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.repository.DestinationRepository; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/PortCallsWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/PortCallsWriter.java index 8ec07cf..78d0b8b 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/PortCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; -import com.snp.batch.jobs.movement.batch.repository.PortCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.PortCallsRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/StsOperationWriter.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/StsOperationWriter.java index 3decdc1..2c6a8f6 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/StsOperationWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.StsOperationRepository; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.repository.StsOperationRepository; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TerminalCallsWriter.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/TerminalCallsWriter.java index 70c779b..4b8d62f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TerminalCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.TerminalCallsRepository; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.TerminalCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TransitsWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/TransitsWriter.java index bcf3f49..96b6910 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TransitsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.TransitsRepository; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.repository.TransitsRepository; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/config/PscInspectionJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/config/PscInspectionJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/config/PscInspectionJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/config/PscInspectionJobConfig.java index 83ea48f..ebc0e8b 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/config/PscInspectionJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/config/PscInspectionJobConfig.java @@ -1,14 +1,14 @@ -package com.snp.batch.jobs.pscInspection.batch.config; +package com.snp.batch.jobs.batch.pscInspection.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.facility.batch.processor.PortDataProcessor; -import com.snp.batch.jobs.pscInspection.batch.dto.PscInspectionDto; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; -import com.snp.batch.jobs.pscInspection.batch.processor.PscInspectionProcessor; -import com.snp.batch.jobs.pscInspection.batch.reader.PscApiReader; -import com.snp.batch.jobs.pscInspection.batch.writer.PscInspectionWriter; +import com.snp.batch.jobs.batch.facility.processor.PortDataProcessor; +import com.snp.batch.jobs.batch.pscInspection.dto.PscInspectionDto; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.processor.PscInspectionProcessor; +import com.snp.batch.jobs.batch.pscInspection.reader.PscApiReader; +import com.snp.batch.jobs.batch.pscInspection.writer.PscInspectionWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscAllCertificateDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscAllCertificateDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscAllCertificateDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscAllCertificateDto.java index 42540d6..1907919 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscAllCertificateDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscAllCertificateDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApiResponseDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApiResponseDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApiResponseDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApiResponseDto.java index 1d3af2a..5efb26d 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApiResponseDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApiResponseDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApsStatusDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApsStatusDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApsStatusDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApsStatusDto.java index 8e7f20f..357b497 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApsStatusDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApsStatusDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDataSetVersionDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDataSetVersionDto.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDataSetVersionDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDataSetVersionDto.java index 41fe574..5742f9f 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDataSetVersionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDataSetVersionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDefectDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDefectDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDefectDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDefectDto.java index 3557833..7069b95 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDefectDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDefectDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscInspectionDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscInspectionDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscInspectionDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscInspectionDto.java index 066a10e..2e810cd 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscInspectionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscInspectionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscAllCertificateEntity.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscAllCertificateEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscAllCertificateEntity.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscAllCertificateEntity.java index 7f7cd96..c6c8a6b 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscAllCertificateEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscAllCertificateEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.entity; +package com.snp.batch.jobs.batch.pscInspection.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscDefectEntity.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscDefectEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscDefectEntity.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscDefectEntity.java index 2eb74ba..7054b84 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscDefectEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscDefectEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.entity; +package com.snp.batch.jobs.batch.pscInspection.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscInspectionEntity.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscInspectionEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscInspectionEntity.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscInspectionEntity.java index bf54ad8..abaf8d3 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscInspectionEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscInspectionEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.entity; +package com.snp.batch.jobs.batch.pscInspection.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/processor/PscInspectionProcessor.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/processor/PscInspectionProcessor.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/processor/PscInspectionProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/processor/PscInspectionProcessor.java index f49f7c1..ac0c5b6 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/processor/PscInspectionProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/processor/PscInspectionProcessor.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.pscInspection.batch.processor; +package com.snp.batch.jobs.batch.pscInspection.processor; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.pscInspection.batch.dto.PscAllCertificateDto; -import com.snp.batch.jobs.pscInspection.batch.dto.PscDefectDto; -import com.snp.batch.jobs.pscInspection.batch.dto.PscInspectionDto; -import com.snp.batch.jobs.pscInspection.batch.entity.PscAllCertificateEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscDefectEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.dto.PscAllCertificateDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscDefectDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscInspectionDto; +import com.snp.batch.jobs.batch.pscInspection.entity.PscAllCertificateEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscDefectEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/reader/PscApiReader.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/reader/PscApiReader.java index 6d00c24..91a16d0 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/reader/PscApiReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.pscInspection.batch.reader; +package com.snp.batch.jobs.batch.pscInspection.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.pscInspection.batch.dto.PscApiResponseDto; -import com.snp.batch.jobs.pscInspection.batch.dto.PscInspectionDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscApiResponseDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscInspectionDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepository.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepository.java similarity index 56% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepository.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepository.java index 5d4586a..415f17e 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscAllCertificateEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscAllCertificateEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepositoryImpl.java index 9fb897f..780847e 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscAllCertificateEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscAllCertificateEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java new file mode 100644 index 0000000..c97eaeb --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java @@ -0,0 +1,10 @@ +package com.snp.batch.jobs.batch.pscInspection.repository; + +import com.snp.batch.jobs.batch.pscInspection.entity.PscDefectEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; + +import java.util.List; + +public interface PscDefectRepository { + void saveDefects(List defects); +} diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepositoryImpl.java index 59daa26..7664742 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscDefectEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscDefectEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepository.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepository.java similarity index 52% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepository.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepository.java index 201f6c7..16dc7af 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepositoryImpl.java index 19dd984..b649ae5 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/writer/PscInspectionWriter.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/writer/PscInspectionWriter.java similarity index 86% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/writer/PscInspectionWriter.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/writer/PscInspectionWriter.java index 6e2d5cb..2b442d7 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/writer/PscInspectionWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/writer/PscInspectionWriter.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.pscInspection.batch.writer; +package com.snp.batch.jobs.batch.pscInspection.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; -import com.snp.batch.jobs.pscInspection.batch.repository.PscAllCertificateRepository; -import com.snp.batch.jobs.pscInspection.batch.repository.PscDefectRepository; -import com.snp.batch.jobs.pscInspection.batch.repository.PscInspectionRepository; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.repository.PscAllCertificateRepository; +import com.snp.batch.jobs.batch.pscInspection.repository.PscDefectRepository; +import com.snp.batch.jobs.batch.pscInspection.repository.PscInspectionRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImoFetchTasklet.java b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImoFetchTasklet.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImoFetchTasklet.java rename to src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImoFetchTasklet.java index a81763c..94ee1eb 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImoFetchTasklet.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImoFetchTasklet.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.config; +package com.snp.batch.jobs.batch.risk.config; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.JobExecution; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImportJobConfig.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImportJobConfig.java index ad2e7f7..44768a5 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImportJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.risk.batch.config; +package com.snp.batch.jobs.batch.risk.config; import com.snp.batch.common.batch.config.BasePartitionedJobConfig; import com.snp.batch.common.batch.partition.StringListPartitioner; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.processor.RiskDataProcessor; -import com.snp.batch.jobs.risk.batch.reader.RiskDetailDataReader; -import com.snp.batch.jobs.risk.batch.writer.RiskDetailDataWriter; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.processor.RiskDataProcessor; +import com.snp.batch.jobs.batch.risk.reader.RiskDetailDataReader; +import com.snp.batch.jobs.batch.risk.writer.RiskDetailDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskImportRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskImportRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/risk/batch/config/RiskImportRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/risk/config/RiskImportRangeJobConfig.java index f68cc89..34de74e 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskImportRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskImportRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.risk.batch.config; +package com.snp.batch.jobs.batch.risk.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.processor.RiskDataProcessor; -import com.snp.batch.jobs.risk.batch.reader.RiskDataRangeReader; -import com.snp.batch.jobs.risk.batch.writer.RiskDetailDataWriter; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.processor.RiskDataProcessor; +import com.snp.batch.jobs.batch.risk.reader.RiskDataRangeReader; +import com.snp.batch.jobs.batch.risk.writer.RiskDetailDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskDto.java b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskDto.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskDto.java rename to src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskDto.java index 6797e1c..2580eed 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.dto; +package com.snp.batch.jobs.batch.risk.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskResponse.java b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskResponse.java similarity index 85% rename from src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskResponse.java rename to src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskResponse.java index 1ab23e9..697b8b4 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.dto; +package com.snp.batch.jobs.batch.risk.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/entity/RiskEntity.java b/src/main/java/com/snp/batch/jobs/batch/risk/entity/RiskEntity.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/risk/batch/entity/RiskEntity.java rename to src/main/java/com/snp/batch/jobs/batch/risk/entity/RiskEntity.java index e5ccc1c..4ca4822 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/entity/RiskEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/entity/RiskEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.entity; +package com.snp.batch.jobs.batch.risk.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/processor/RiskDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/risk/processor/RiskDataProcessor.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/risk/batch/processor/RiskDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/risk/processor/RiskDataProcessor.java index ca2a293..4f5415d 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/processor/RiskDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/processor/RiskDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.batch.processor; +package com.snp.batch.jobs.batch.risk.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDataRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDataRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDataRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDataRangeReader.java index cae2ee1..ed75282 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDataRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDataRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.risk.batch.reader; +package com.snp.batch.jobs.batch.risk.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDetailDataReader.java b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDetailDataReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDetailDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDetailDataReader.java index 2e8e19a..31efaae 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDetailDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDetailDataReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.risk.batch.reader; +package com.snp.batch.jobs.batch.risk.reader; import com.snp.batch.global.model.BatchApiLog; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.item.ItemReader; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepository.java b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepository.java similarity index 66% rename from src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepository.java rename to src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepository.java index 317e198..2cda84a 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.risk.batch.repository; +package com.snp.batch.jobs.batch.risk.repository; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepositoryImpl.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepositoryImpl.java index 472da66..72fc1fd 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.risk.batch.repository; +package com.snp.batch.jobs.batch.risk.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDataWriter.java index 658e468..64b01b5 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.batch.writer; +package com.snp.batch.jobs.batch.risk.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.repository.RiskRepository; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.repository.RiskRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDetailDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDetailDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDetailDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDetailDataWriter.java index fba0d13..293873f 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDetailDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDetailDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.batch.writer; +package com.snp.batch.jobs.batch.risk.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.repository.RiskRepository; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.repository.RiskRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailImoFetchTasklet.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailImoFetchTasklet.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailImoFetchTasklet.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailImoFetchTasklet.java index 713307d..84f250b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailImoFetchTasklet.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailImoFetchTasklet.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.shipdetail.batch.config; +package com.snp.batch.jobs.batch.shipdetail.config; import com.snp.batch.global.model.BatchApiLog; import com.snp.batch.global.repository.BatchFailedRecordRepository; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDto; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipUpdateApiResponse; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDto; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipUpdateApiResponse; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailPartitioner.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailPartitioner.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailPartitioner.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailPartitioner.java index 1cbaa3f..1b1f7bd 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailPartitioner.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailPartitioner.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.config; +package com.snp.batch.jobs.batch.shipdetail.config; import com.snp.batch.common.batch.partition.StringListPartitioner; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailUpdateJobConfig.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailUpdateJobConfig.java index 1b911ba..4e2298a 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailUpdateJobConfig.java @@ -1,14 +1,14 @@ -package com.snp.batch.jobs.shipdetail.batch.config; +package com.snp.batch.jobs.batch.shipdetail.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BasePartitionedJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; import com.snp.batch.global.repository.BatchFailedRecordRepository; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailDto; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipDetailEntity; -import com.snp.batch.jobs.shipdetail.batch.processor.ShipDetailDataProcessor; -import com.snp.batch.jobs.shipdetail.batch.reader.ShipDetailUpdateDataReader; -import com.snp.batch.jobs.shipdetail.batch.writer.ShipDetailDataWriter; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailDto; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipDetailEntity; +import com.snp.batch.jobs.batch.shipdetail.processor.ShipDetailDataProcessor; +import com.snp.batch.jobs.batch.shipdetail.reader.ShipDetailUpdateDataReader; +import com.snp.batch.jobs.batch.shipdetail.writer.ShipDetailDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import com.snp.batch.service.BatchFailedRecordService; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/AdditionalInformationDto.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/AdditionalInformationDto.java index ffb07d6..aea8f1d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/AdditionalInformationDto.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.AdditionalInformationEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.AdditionalInformationEntity; import lombok.*; @Getter diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/BareBoatCharterHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/BareBoatCharterHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/BareBoatCharterHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/BareBoatCharterHistoryDto.java index 10c2d1f..08031ea 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/BareBoatCharterHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/BareBoatCharterHistoryDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.BareBoatCharterHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.BareBoatCharterHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CallSignAndMmsiHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CallSignAndMmsiHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CallSignAndMmsiHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CallSignAndMmsiHistoryDto.java index 861dc46..2493f3d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CallSignAndMmsiHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CallSignAndMmsiHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CallSignAndMmsiHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CallSignAndMmsiHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ClassHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ClassHistoryDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ClassHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ClassHistoryDto.java index 73630e6..0b806c4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ClassHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ClassHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.ClassHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ClassHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyDetailDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyDetailDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyDetailDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyDetailDto.java index bfd9402..4d9cef3 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyDetailDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CompanyDetailEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CompanyDetailEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyVesselRelationshipDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyVesselRelationshipDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyVesselRelationshipDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyVesselRelationshipDto.java index 3dace6e..cfd5f10 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyVesselRelationshipDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyVesselRelationshipDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CompanyVesselRelationshipEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CompanyVesselRelationshipEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CrewListDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CrewListDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CrewListDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CrewListDto.java index 6a7ec75..ca185f1 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CrewListDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CrewListDto.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CrewListEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CrewListEntity; import lombok.*; @Data diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/DarkActivityConfirmedDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/DarkActivityConfirmedDto.java index b868ccc..888047c 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/DarkActivityConfirmedDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.DarkActivityConfirmedEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.DarkActivityConfirmedEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/FlagHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/FlagHistoryDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/FlagHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/FlagHistoryDto.java index e27f484..39fac3d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/FlagHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/FlagHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.FlagHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.FlagHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/GroupBeneficialOwnerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/GroupBeneficialOwnerHistoryDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/GroupBeneficialOwnerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/GroupBeneficialOwnerHistoryDto.java index 34a04fa..4f7e101 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/GroupBeneficialOwnerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/GroupBeneficialOwnerHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.GroupBeneficialOwnerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.GroupBeneficialOwnerHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/IceClassDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/IceClassDto.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/IceClassDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/IceClassDto.java index d639b52..55ec590 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/IceClassDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/IceClassDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.IceClassEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.IceClassEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/NameHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/NameHistoryDto.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/NameHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/NameHistoryDto.java index 1ee30f7..da1d2d0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/NameHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/NameHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.NameHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.NameHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OperatorHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OperatorHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OperatorHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OperatorHistoryDto.java index a3db024..106250f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OperatorHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OperatorHistoryDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.OperatorHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.OperatorHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OwnerHistoryDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OwnerHistoryDto.java index ceacd38..42d8f69 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OwnerHistoryDto.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.OwnerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.OwnerHistoryEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/PandIHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/PandIHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/PandIHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/PandIHistoryDto.java index d6e1567..9ea963b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/PandIHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/PandIHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.PandIHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.PandIHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SafetyManagementCertificateHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SafetyManagementCertificateHistoryDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SafetyManagementCertificateHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SafetyManagementCertificateHistoryDto.java index c993285..16df2cf 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SafetyManagementCertificateHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SafetyManagementCertificateHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SafetyManagementCertificateHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SafetyManagementCertificateHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailApiResponse.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailApiResponse.java index dda21df..3e0a019 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailComparisonData.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailComparisonData.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailComparisonData.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailComparisonData.java index 90c2ecb..1692036 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailComparisonData.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailComparisonData.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import lombok.Builder; import lombok.Getter; import java.util.Map; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailDto.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailDto.java index 3cee449..e6ed1a8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailUpdate.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailUpdate.java index 2c3f87e..a2d03f0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailUpdate.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDto.java index ba849b2..a2fde4e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipManagerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipManagerHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipManagerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipManagerHistoryDto.java index 4274828..7b93a7f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipManagerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipManagerHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipManagerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipManagerHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipResultDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipResultDto.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipResultDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipResultDto.java index 22d5faa..556e4ab 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipResultDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipResultDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipUpdateApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipUpdateApiResponse.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipUpdateApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipUpdateApiResponse.java index b4d70d3..03416b6 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipUpdateApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipUpdateApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SisterShipLinksDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SisterShipLinksDto.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SisterShipLinksDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SisterShipLinksDto.java index d18dcab..6c1931b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SisterShipLinksDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SisterShipLinksDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SisterShipLinksEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SisterShipLinksEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SpecialFeatureDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SpecialFeatureDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SpecialFeatureDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SpecialFeatureDto.java index 571a7d0..6dd33fc 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SpecialFeatureDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SpecialFeatureDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SpecialFeatureEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SpecialFeatureEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StatusHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StatusHistoryDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StatusHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StatusHistoryDto.java index f36c11c..d3a1c86 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StatusHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StatusHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.StatusHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.StatusHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StowageCommodityDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StowageCommodityDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StowageCommodityDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StowageCommodityDto.java index 2b7bf42..585f41b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StowageCommodityDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StowageCommodityDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.StowageCommodityEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.StowageCommodityEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryDto.java index 41937dc..aa2c5d2 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SurveyDatesHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SurveyDatesHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryUniqueDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryUniqueDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryUniqueDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryUniqueDto.java index d5ec0e5..afafda4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryUniqueDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryUniqueDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SurveyDatesHistoryUniqueEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SurveyDatesHistoryUniqueEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TechnicalManagerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/TechnicalManagerHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TechnicalManagerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/TechnicalManagerHistoryDto.java index 250e5a8..590ea5b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TechnicalManagerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/TechnicalManagerHistoryDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.TechnicalManagerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.TechnicalManagerHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ThrustersDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ThrustersDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ThrustersDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ThrustersDto.java index b6abce5..3ce623e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ThrustersDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ThrustersDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.ThrustersEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ThrustersEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/AdditionalInformationEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/AdditionalInformationEntity.java index 06107b2..de9a8ab 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/AdditionalInformationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/BareBoatCharterHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/BareBoatCharterHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/BareBoatCharterHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/BareBoatCharterHistoryEntity.java index 0bea631..26f934d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/BareBoatCharterHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/BareBoatCharterHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CallSignAndMmsiHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CallSignAndMmsiHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CallSignAndMmsiHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CallSignAndMmsiHistoryEntity.java index a8527d7..5ee60de 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CallSignAndMmsiHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CallSignAndMmsiHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ClassHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ClassHistoryEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ClassHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ClassHistoryEntity.java index ca8dfcf..24c5c87 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ClassHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ClassHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyDetailEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyDetailEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyDetailEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyDetailEntity.java index 98ecd3a..08c4206 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyDetailEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyVesselRelationshipEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyVesselRelationshipEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyVesselRelationshipEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyVesselRelationshipEntity.java index e799e31..9ffc9d8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyVesselRelationshipEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyVesselRelationshipEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CrewListEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CrewListEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CrewListEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CrewListEntity.java index 86841af..e77cbe0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CrewListEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CrewListEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/DarkActivityConfirmedEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/DarkActivityConfirmedEntity.java index f121368..b9ba5fd 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/DarkActivityConfirmedEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/FlagHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/FlagHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/FlagHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/FlagHistoryEntity.java index 4dc1b2e..6646582 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/FlagHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/FlagHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/GroupBeneficialOwnerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/GroupBeneficialOwnerHistoryEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/GroupBeneficialOwnerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/GroupBeneficialOwnerHistoryEntity.java index df62d89..b474dac 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/GroupBeneficialOwnerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/GroupBeneficialOwnerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/IceClassEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/IceClassEntity.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/IceClassEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/IceClassEntity.java index a019a9a..54b9ff8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/IceClassEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/IceClassEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/NameHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/NameHistoryEntity.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/NameHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/NameHistoryEntity.java index 2b974c6..000a664 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/NameHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/NameHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OperatorHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OperatorHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OperatorHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OperatorHistoryEntity.java index c5ddf83..826d738 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OperatorHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OperatorHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OwnerHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OwnerHistoryEntity.java index ccd1ff9..80a06e3 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OwnerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/PandIHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/PandIHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/PandIHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/PandIHistoryEntity.java index dfcc3d1..9c1af1c 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/PandIHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/PandIHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SafetyManagementCertificateHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SafetyManagementCertificateHistoryEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SafetyManagementCertificateHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SafetyManagementCertificateHistoryEntity.java index 8ec438f..790127d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SafetyManagementCertificateHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SafetyManagementCertificateHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipDetailEntity.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipDetailEntity.java index b0804db..617da18 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipDetailEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipHashEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipHashEntity.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipHashEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipHashEntity.java index 3308325..5043e35 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipHashEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipHashEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipManagerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipManagerHistoryEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipManagerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipManagerHistoryEntity.java index 4fb5cca..2757146 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipManagerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipManagerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SisterShipLinksEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SisterShipLinksEntity.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SisterShipLinksEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SisterShipLinksEntity.java index dd7a084..04a05e7 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SisterShipLinksEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SisterShipLinksEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SpecialFeatureEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SpecialFeatureEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SpecialFeatureEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SpecialFeatureEntity.java index da57585..d7badea 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SpecialFeatureEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SpecialFeatureEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StatusHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StatusHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StatusHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StatusHistoryEntity.java index 48deefb..56bf51b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StatusHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StatusHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StowageCommodityEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StowageCommodityEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StowageCommodityEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StowageCommodityEntity.java index 3934d95..bb44740 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StowageCommodityEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StowageCommodityEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryEntity.java index 254d128..3a067d4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryUniqueEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryUniqueEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryUniqueEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryUniqueEntity.java index 47f1ebc..b85bd9d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryUniqueEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryUniqueEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TechnicalManagerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/TechnicalManagerHistoryEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TechnicalManagerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/TechnicalManagerHistoryEntity.java index 996c761..9c9df56 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TechnicalManagerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/TechnicalManagerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ThrustersEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ThrustersEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ThrustersEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ThrustersEntity.java index 9067d73..4efc24e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ThrustersEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ThrustersEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/processor/ShipDetailDataProcessor.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/processor/ShipDetailDataProcessor.java index 7186342..600a64f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/processor/ShipDetailDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.processor; +package com.snp.batch.jobs.batch.shipdetail.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipdetail.batch.dto.*; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.dto.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailUpdateDataReader.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/reader/ShipDetailUpdateDataReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailUpdateDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/reader/ShipDetailUpdateDataReader.java index 1ccd51d..a4716e4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailUpdateDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/reader/ShipDetailUpdateDataReader.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipdetail.batch.reader; +package com.snp.batch.jobs.batch.shipdetail.reader; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailApiResponse; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailDto; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipResultDto; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailApiResponse; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailDto; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipResultDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import com.snp.batch.service.BatchFailedRecordService; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepository.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepository.java index 11e1ce6..ec03a52 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepositoryImpl.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepositoryImpl.java index e70f8fb..359ad6c 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailSql.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailSql.java index 89e5bb9..db92f51 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailSql.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; import lombok.Setter; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepository.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepository.java similarity index 50% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepository.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepository.java index cf12ff4..cd96098 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipHashEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipHashEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepositoryImpl.java index bac872b..10b682f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipHashEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipHashEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/writer/ShipDetailDataWriter.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/writer/ShipDetailDataWriter.java index dabc3d7..8a7fa22 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/writer/ShipDetailDataWriter.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipdetail.batch.writer; +package com.snp.batch.jobs.batch.shipdetail.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailUpdate; -import com.snp.batch.jobs.shipdetail.batch.entity.*; -import com.snp.batch.jobs.shipdetail.batch.repository.ShipDetailRepository; -import com.snp.batch.jobs.shipdetail.batch.repository.ShipHashRepository; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailUpdate; +import com.snp.batch.jobs.batch.shipdetail.entity.*; +import com.snp.batch.jobs.batch.shipdetail.repository.ShipDetailRepository; +import com.snp.batch.jobs.batch.shipdetail.repository.ShipHashRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java b/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java deleted file mode 100644 index da65ba6..0000000 --- a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.snp.batch.jobs.event.batch.repository; - -import com.snp.batch.jobs.event.batch.entity.CargoEntity; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; - -import java.util.List; - -public interface EventRepository { - void saveEventAll(List items); - void saveCargoAll(List items); - void saveHumanCasualtyAll(List items); - void saveRelationshipAll(List items); -} diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java b/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java deleted file mode 100644 index 358b068..0000000 --- a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.snp.batch.jobs.facility.batch.repository; - -import com.snp.batch.jobs.facility.batch.entity.PortEntity; - -import java.util.List; - -public interface FacilityRepository { - void savePortAll(List items); -} diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java deleted file mode 100644 index 35d9029..0000000 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; - -import com.snp.batch.jobs.pscInspection.batch.entity.PscDefectEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; - -import java.util.List; - -public interface PscDefectRepository { - void saveDefects(List defects); -} diff --git a/src/main/java/com/snp/batch/jobs/risk/web/controller/RiskController.java b/src/main/java/com/snp/batch/jobs/web/risk/controller/RiskController.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/risk/web/controller/RiskController.java rename to src/main/java/com/snp/batch/jobs/web/risk/controller/RiskController.java index 9113622..6ae954d 100644 --- a/src/main/java/com/snp/batch/jobs/risk/web/controller/RiskController.java +++ b/src/main/java/com/snp/batch/jobs/web/risk/controller/RiskController.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.web.controller; +package com.snp.batch.jobs.web.risk.controller; import com.snp.batch.common.web.ApiResponse; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.web.service.RiskBypassService; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.web.risk.service.RiskBypassService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/snp/batch/jobs/risk/web/service/RiskBypassService.java b/src/main/java/com/snp/batch/jobs/web/risk/service/RiskBypassService.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/risk/web/service/RiskBypassService.java rename to src/main/java/com/snp/batch/jobs/web/risk/service/RiskBypassService.java index 5162dc9..c0eae98 100644 --- a/src/main/java/com/snp/batch/jobs/risk/web/service/RiskBypassService.java +++ b/src/main/java/com/snp/batch/jobs/web/risk/service/RiskBypassService.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.risk.web.service; +package com.snp.batch.jobs.web.risk.service; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.ParameterizedTypeReference;