diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/model/PendingAddressWrite.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/model/PendingAddressWrite.kt index c3e243e69..9ea33c36c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/model/PendingAddressWrite.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/model/PendingAddressWrite.kt @@ -24,9 +24,9 @@ import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb /** * A logistic address with a staged, not-yet-persisted write (create or update) and the resulting change state. Produced - * by [org.eclipse.tractusx.bpdm.pool.service.operation.AddressCreateService]'s `stageCreate` / - * [org.eclipse.tractusx.bpdm.pool.service.operation.AddressUpdateService]'s `stageUpdate` and consumed by - * [org.eclipse.tractusx.bpdm.pool.service.operation.AddressWriteCommitService]'s `commit`, which is the single + * by [org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressCreateService]'s `stageCreate` / + * [org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressUpdateService]'s `stageUpdate` and consumed by + * [org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressWriteCommitService]'s `commit`, which is the single * place an address is saved and changelogged. It is handed to callers so they can wire the (still-unsaved) address into * a cyclic parent — legal entity or site — before it is persisted. */ diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressRelationUpsertService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressRelationUpsertService.kt index 2a2be1c89..9b47b15f7 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressRelationUpsertService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressRelationUpsertService.kt @@ -29,7 +29,7 @@ import org.eclipse.tractusx.bpdm.pool.exception.BpdmValidationException import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord import org.eclipse.tractusx.bpdm.pool.repository.AddressRelationEventTriggerRepository import org.eclipse.tractusx.bpdm.pool.repository.AddressRelationRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressService.kt index e40cde058..a00448475 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AddressService.kt @@ -22,22 +22,14 @@ package org.eclipse.tractusx.bpdm.pool.service import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.repository.LogisticAddressRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressAssociationFetchService import org.springframework.stereotype.Service @Service class AddressService( - private val logisticAddressRepository: LogisticAddressRepository, - private val addressAssociationFetchService: AddressAssociationFetchService + private val logisticAddressRepository: LogisticAddressRepository ) { private val logger = KotlinLogging.logger { } - fun fetchLogisticAddressDependencies(addresses: Set): Set { - addressAssociationFetchService.fetch(addresses) - - return addresses - } - fun findAddressByBpn(bpn: String): LogisticAddressDb? { logger.debug { "Executing findAddressByBpn() with parameters $bpn" } return logisticAddressRepository.findByBpn(bpn) diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AlternativeHeadquarterRelationUpsertService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AlternativeHeadquarterRelationUpsertService.kt index ae889bfa5..d9022bd41 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AlternativeHeadquarterRelationUpsertService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/AlternativeHeadquarterRelationUpsertService.kt @@ -28,7 +28,7 @@ import org.eclipse.tractusx.bpdm.pool.entity.TriggerEventType import org.eclipse.tractusx.bpdm.pool.exception.BpdmValidationException import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRelationEventTriggerRepository import org.eclipse.tractusx.bpdm.pool.repository.RelationRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.UltimateOwnerRecalculationService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.UltimateOwnerRecalculationService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerFetchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerFetchService.kt index 09fd68ae7..4b29f3300 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerFetchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerFetchService.kt @@ -24,7 +24,7 @@ import org.eclipse.tractusx.bpdm.pool.api.model.response.LegalEntityWithLegalAdd import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityResponseMapper import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityAssociationFetchService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityAssociationFetchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/HeadquarterSyncService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/HeadquarterSyncService.kt index 7285d7b33..47873db0c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/HeadquarterSyncService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/HeadquarterSyncService.kt @@ -24,14 +24,14 @@ import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.AddressRelationType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService import org.eclipse.tractusx.bpdm.pool.entity.AddressRelationDb import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.entity.RelationValidityPeriodDb import org.eclipse.tractusx.bpdm.pool.repository.AddressRelationRepository import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.ScriptVariantCoverageService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.ScriptVariantCoverageService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/LegalEntityRelationTriggerExecutionService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/LegalEntityRelationTriggerExecutionService.kt index 9b9afcba2..5dc99c141 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/LegalEntityRelationTriggerExecutionService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/LegalEntityRelationTriggerExecutionService.kt @@ -22,7 +22,7 @@ package org.eclipse.tractusx.bpdm.pool.service import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.entity.TriggerEventType import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRelationEventTriggerRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.UltimateOwnerRecalculationService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.UltimateOwnerRecalculationService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ManagedRelationUpsertService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ManagedRelationUpsertService.kt index 00799c367..e4cb22fab 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ManagedRelationUpsertService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ManagedRelationUpsertService.kt @@ -28,7 +28,7 @@ import org.eclipse.tractusx.bpdm.pool.entity.RelationValidityPeriodDb import org.eclipse.tractusx.bpdm.pool.exception.BpdmValidationException import org.eclipse.tractusx.bpdm.pool.model.parsed.DataSpaceParticipantUpdateParsed import org.eclipse.tractusx.bpdm.pool.repository.RelationRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.DataSpaceParticipantUpdateService +import org.eclipse.tractusx.bpdm.pool.service.operation.participation.DataSpaceParticipantUpdateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/OwnedByRelationUpsertService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/OwnedByRelationUpsertService.kt index 35ded5d53..10316466c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/OwnedByRelationUpsertService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/OwnedByRelationUpsertService.kt @@ -28,8 +28,8 @@ import org.eclipse.tractusx.bpdm.pool.entity.TriggerEventType import org.eclipse.tractusx.bpdm.pool.exception.BpdmValidationException import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRelationEventTriggerRepository import org.eclipse.tractusx.bpdm.pool.repository.RelationRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.UltimateOwnerRecalculationService -import org.eclipse.tractusx.bpdm.pool.service.parser.UltimateOwnerUniquenessValidator +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.UltimateOwnerRecalculationService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.UltimateOwnerUniquenessValidator import org.springframework.stereotype.Service import java.time.LocalDate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/RelationUpsertService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/RelationUpsertService.kt index e24655a3a..2968580d9 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/RelationUpsertService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/RelationUpsertService.kt @@ -23,7 +23,7 @@ import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType import org.eclipse.tractusx.bpdm.pool.api.model.LegalEntityRelationType import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult import org.eclipse.tractusx.bpdm.pool.dto.UpsertType import org.eclipse.tractusx.bpdm.pool.entity.* diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SharingMemberConfidenceService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SharingMemberConfidenceService.kt index 7a75507f3..c05f954b6 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SharingMemberConfidenceService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SharingMemberConfidenceService.kt @@ -22,7 +22,7 @@ package org.eclipse.tractusx.bpdm.pool.service import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.entity.SharingMemberRecordDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SiteRelationUpsertService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SiteRelationUpsertService.kt index 598e1a922..293f86021 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SiteRelationUpsertService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/SiteRelationUpsertService.kt @@ -32,7 +32,7 @@ import org.eclipse.tractusx.bpdm.pool.entity.SiteRelationDb import org.eclipse.tractusx.bpdm.pool.exception.BpdmValidationException import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord import org.eclipse.tractusx.bpdm.pool.repository.SiteRelationRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskScriptVariantCoverageValidator.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskScriptVariantCoverageValidator.kt index 649276dee..563d89460 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskScriptVariantCoverageValidator.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskScriptVariantCoverageValidator.kt @@ -22,7 +22,7 @@ package org.eclipse.tractusx.bpdm.pool.service import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.model.error.ScriptVariantCoverageParseError import org.eclipse.tractusx.bpdm.pool.repository.LogisticAddressRepository -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressPartnerScriptCodeReader +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressPartnerScriptCodeReader import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator import org.eclipse.tractusx.orchestrator.api.model.BpnReference import org.eclipse.tractusx.orchestrator.api.model.BusinessPartner diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskStepBuildService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskStepBuildService.kt index aa9a303da..e625d0f5c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskStepBuildService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskStepBuildService.kt @@ -40,8 +40,24 @@ import org.eclipse.tractusx.bpdm.pool.model.request.AddressUpdateRequest import org.eclipse.tractusx.bpdm.pool.repository.BpnRequestIdentifierRepository import org.eclipse.tractusx.bpdm.pool.repository.LogisticAddressRepository import org.eclipse.tractusx.bpdm.pool.repository.SiteRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.* -import org.eclipse.tractusx.bpdm.pool.service.parser.* +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressPayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressUpdateService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityPayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteCreateWithReferencedAddressAsMainService +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SitePayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressSiteAssignmentParser +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.address.TypedParentAddressCreateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityCreateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateOnAddressParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateWithLegalAddressAsMainParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateWithReferencedAddressAsMainParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteUpdateParser import org.eclipse.tractusx.orchestrator.api.model.* import org.springframework.stereotype.Service diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressCreateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressCreateApplicationV6Service.kt index 6a389cd25..52bbaf65c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressCreateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressCreateApplicationV6Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AddressParseErrorMa import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AddressResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.UntypedParentAddressCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.UntypedParentAddressCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressGetApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressGetApplicationV6Service.kt index 0b81e8c90..2967a17d1 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressGetApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressGetApplicationV6Service.kt @@ -23,8 +23,8 @@ import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException import org.eclipse.tractusx.bpdm.pool.api.v6.model.LogisticAddressVerboseDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AddressResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.request.AddressGetRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressGetService -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressGetParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressGetService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressGetParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressSearchApplicationV6Service.kt index 60fee802a..5a90364bd 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressSearchApplicationV6Service.kt @@ -29,9 +29,9 @@ import org.eclipse.tractusx.bpdm.pool.api.v6.model.request.AddressSearchRequestV import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.AddressSearchRequestMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AddressResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressSearchParser -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityAddressSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressSearchParser +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityAddressSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressUpdateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressUpdateApplicationV6Service.kt index f002674d7..dc4991da3 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressUpdateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AddressUpdateApplicationV6Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AddressParseErrorMa import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AddressResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressPayloadUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressPayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AdministrativeAreaSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AdministrativeAreaSearchApplicationV6Service.kt index a0d198fe6..332a56399 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AdministrativeAreaSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/AdministrativeAreaSearchApplicationV6Service.kt @@ -25,7 +25,7 @@ import org.eclipse.tractusx.bpdm.common.service.toPageDto import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.v6.model.CountrySubdivisionDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.AdministrativeAreaResponseMapperV6 -import org.eclipse.tractusx.bpdm.pool.service.operation.AdministrativeAreaSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.AdministrativeAreaSearchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/BpnSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/BpnSearchApplicationV6Service.kt index 38e774d56..61bd4bb0c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/BpnSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/BpnSearchApplicationV6Service.kt @@ -27,10 +27,10 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.BpnSearchRequestMapp import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.BpnSearchResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.BpnSearchParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.BpnIdentifierSearchService -import org.eclipse.tractusx.bpdm.pool.service.operation.BpnRequestIdentifierSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.BpnIdentifierSearchParser -import org.eclipse.tractusx.bpdm.pool.service.parser.BpnRequestIdentifierSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnIdentifierSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnRequestIdentifierSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnIdentifierSearchParser +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnRequestIdentifierSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/ChangelogSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/ChangelogSearchApplicationV6Service.kt index 86c2b0357..02ad81c0e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/ChangelogSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/ChangelogSearchApplicationV6Service.kt @@ -29,7 +29,7 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.ChangelogSearchReque import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.ChangelogResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.ChangelogParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogSearchService import org.eclipse.tractusx.bpdm.pool.service.parser.ChangelogSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipSearchApplicationV6Service.kt index ed20f4e7d..63f140627 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipSearchApplicationV6Service.kt @@ -27,8 +27,8 @@ import org.eclipse.tractusx.bpdm.pool.api.v6.model.CxMembershipDtoV6 import org.eclipse.tractusx.bpdm.pool.api.v6.model.request.CxMembershipSearchRequestV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.CxMembershipRequestMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.CxMembershipResponseMapperV6 -import org.eclipse.tractusx.bpdm.pool.service.operation.DataSpaceParticipantSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.DataSpaceParticipantSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.participation.DataSpaceParticipantSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.participation.DataSpaceParticipantSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipUpdateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipUpdateApplicationV6Service.kt index 15fed119f..67b9b3973 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipUpdateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/CxMembershipUpdateApplicationV6Service.kt @@ -24,8 +24,8 @@ import org.eclipse.tractusx.bpdm.pool.api.v6.model.request.CxMembershipUpdateReq import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.CxMembershipRequestMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.DataSpaceParticipantParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.parseAndExecuteAllOrNone -import org.eclipse.tractusx.bpdm.pool.service.operation.DataSpaceParticipantUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.DataSpaceParticipantUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.participation.DataSpaceParticipantUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.participation.DataSpaceParticipantUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/FieldQualityRuleSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/FieldQualityRuleSearchApplicationV6Service.kt index a792590a0..4526829fa 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/FieldQualityRuleSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/FieldQualityRuleSearchApplicationV6Service.kt @@ -23,8 +23,8 @@ import com.neovisionaries.i18n.CountryCode import org.eclipse.tractusx.bpdm.pool.api.v6.model.response.FieldQualityRuleDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.FieldQualityRuleResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.request.FieldQualityRuleSearchRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.FieldQualityRuleSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.FieldQualityRuleSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.FieldQualityRuleSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.FieldQualityRuleSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeCreateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeCreateApplicationV6Service.kt index c505100a3..0dc496906 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeCreateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeCreateApplicationV6Service.kt @@ -24,8 +24,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.IdentifierTypeReques import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.IdentifierTypeResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.IdentifierTypeParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.IdentifierTypeCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.IdentifierTypeCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.IdentifierTypeCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.IdentifierTypeCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeSearchApplicationV6Service.kt index cc988fc80..99142c573 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/IdentifierTypeSearchApplicationV6Service.kt @@ -28,8 +28,8 @@ import org.eclipse.tractusx.bpdm.pool.api.v6.model.IdentifierBusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.v6.model.IdentifierTypeDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.IdentifierTypeRequestMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.IdentifierTypeResponseMapperV6 -import org.eclipse.tractusx.bpdm.pool.service.operation.IdentifierTypeSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.IdentifierTypeSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.IdentifierTypeSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.IdentifierTypeSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityCreateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityCreateApplicationV6Service.kt index 5f4b61d7f..3dfbc60df 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityCreateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityCreateApplicationV6Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalEntityParseErr import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalEntityResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityGetApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityGetApplicationV6Service.kt index 460ae0976..9a281aec9 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityGetApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityGetApplicationV6Service.kt @@ -23,8 +23,8 @@ import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException import org.eclipse.tractusx.bpdm.pool.api.v6.model.response.LegalEntityWithLegalAddressVerboseDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalEntityResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.request.LegalEntityGetRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityGetService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityGetParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityGetService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityGetParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntitySearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntitySearchApplicationV6Service.kt index fb61d9be9..66f58acaa 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntitySearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntitySearchApplicationV6Service.kt @@ -27,8 +27,8 @@ import org.eclipse.tractusx.bpdm.pool.api.v6.model.request.LegalEntitySearchRequ import org.eclipse.tractusx.bpdm.pool.api.v6.model.response.LegalEntityWithLegalAddressVerboseDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.LegalEntitySearchRequestMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalEntityResponseMapperV6 -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntitySearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntitySearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntitySearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntitySearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityUpdateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityUpdateApplicationV6Service.kt index 73fddc9fa..ad8d6d370 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityUpdateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalEntityUpdateApplicationV6Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalEntityParseErr import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalEntityResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityPayloadUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityPayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormCreateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormCreateApplicationV6Service.kt index b43fc7273..8f2ee2a20 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormCreateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormCreateApplicationV6Service.kt @@ -25,8 +25,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.LegalFormRequestMapp import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalFormParseErrorMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalFormResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalFormCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalFormCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.LegalFormCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.LegalFormCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormSearchApplicationV6Service.kt index a8ca297a0..b5d0f4c96 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/LegalFormSearchApplicationV6Service.kt @@ -25,7 +25,7 @@ import org.eclipse.tractusx.bpdm.common.service.toPageDto import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.v6.model.LegalFormDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.LegalFormResponseMapperV6 -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalFormSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.LegalFormSearchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteCreateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteCreateApplicationV6Service.kt index b72ad1def..a4b91db75 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteCreateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteCreateApplicationV6Service.kt @@ -32,10 +32,10 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.SiteResponseMapperV import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteCreateService -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteCreateWithReferencedAddressAsMainService -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteCreateParser -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteCreateWithLegalAddressAsMainParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteCreateWithReferencedAddressAsMainService +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateWithLegalAddressAsMainParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteGetApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteGetApplicationV6Service.kt index 8666598c4..ceb99a6e0 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteGetApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteGetApplicationV6Service.kt @@ -23,8 +23,8 @@ import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException import org.eclipse.tractusx.bpdm.pool.api.v6.model.response.SiteWithMainAddressVerboseDtoV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.SiteResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.request.SiteGetRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteGetService -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteGetParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteGetService +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteGetParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteSearchApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteSearchApplicationV6Service.kt index bd668edc5..658ac868a 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteSearchApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteSearchApplicationV6Service.kt @@ -30,9 +30,9 @@ import org.eclipse.tractusx.bpdm.pool.api.v6.model.response.SiteWithMainAddressV import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.inbound.SiteSearchRequestMapperV6 import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.SiteResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntitySiteSearchParser -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntitySiteSearchParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteUpdateApplicationV6Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteUpdateApplicationV6Service.kt index bd58952c7..e0fa120b0 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteUpdateApplicationV6Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v6/SiteUpdateApplicationV6Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.SiteParseErrorMappe import org.eclipse.tractusx.bpdm.pool.mapper.poolv6.outbound.SiteResponseMapperV6 import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.SitePayloadUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SitePayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressCreateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressCreateApplicationV7Service.kt index 7318b8440..e75df3f2e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressCreateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressCreateApplicationV7Service.kt @@ -31,8 +31,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.AddressResponseMapp import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute import org.eclipse.tractusx.bpdm.pool.model.request.AddressCreateUntypedParentRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.UntypedParentAddressCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.UntypedParentAddressCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressGetApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressGetApplicationV7Service.kt index aa483c108..d224fc9b3 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressGetApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressGetApplicationV7Service.kt @@ -23,8 +23,8 @@ import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException import org.eclipse.tractusx.bpdm.pool.api.model.LogisticAddressVerboseDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.AddressResponseMapper import org.eclipse.tractusx.bpdm.pool.model.request.AddressGetRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressGetService -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressGetParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressGetService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressGetParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressSearchApplicationV7Service.kt index 1dd5618ed..170551648 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressSearchApplicationV7Service.kt @@ -29,9 +29,9 @@ import org.eclipse.tractusx.bpdm.pool.api.model.LogisticAddressVerboseDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.AddressSearchRequestMapper import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.AddressResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressSearchParser -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityAddressSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressSearchParser +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityAddressSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.AddressSearchRequest as AddressSearchRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressUpdateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressUpdateApplicationV7Service.kt index 7f1a3f7e7..64e1e5499 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressUpdateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AddressUpdateApplicationV7Service.kt @@ -31,8 +31,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.AddressResponseMapp import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute import org.eclipse.tractusx.bpdm.pool.model.request.AddressUpdateRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.AddressPayloadUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.AddressUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressPayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AdministrativeAreaSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AdministrativeAreaSearchApplicationV7Service.kt index 0cc585c12..a1bc42ada 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AdministrativeAreaSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/AdministrativeAreaSearchApplicationV7Service.kt @@ -25,7 +25,7 @@ import org.eclipse.tractusx.bpdm.common.service.toPageDto import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.model.CountrySubdivisionDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.AdministrativeAreaResponseMapper -import org.eclipse.tractusx.bpdm.pool.service.operation.AdministrativeAreaSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.AdministrativeAreaSearchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/BpnSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/BpnSearchApplicationV7Service.kt index a3d695104..c1bb4a5a2 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/BpnSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/BpnSearchApplicationV7Service.kt @@ -26,10 +26,10 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.BpnSearchRequestMapp import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.BpnSearchResponseMapper import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.BpnSearchParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.BpnIdentifierSearchService -import org.eclipse.tractusx.bpdm.pool.service.operation.BpnRequestIdentifierSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.BpnIdentifierSearchParser -import org.eclipse.tractusx.bpdm.pool.service.parser.BpnRequestIdentifierSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnIdentifierSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnRequestIdentifierSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnIdentifierSearchParser +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnRequestIdentifierSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.BpnRequestIdentifierSearchRequest as BpnRequestIdentifierSearchRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ChangelogSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ChangelogSearchApplicationV7Service.kt index 2e3c9f6b5..47c30815c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ChangelogSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ChangelogSearchApplicationV7Service.kt @@ -28,7 +28,7 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.ChangelogSearchReque import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.ChangelogResponseMapper import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.ChangelogParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.ChangelogSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogSearchService import org.eclipse.tractusx.bpdm.pool.service.parser.ChangelogSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantSearchApplicationV7Service.kt index 4d7e2f27a..cb052284f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantSearchApplicationV7Service.kt @@ -26,8 +26,8 @@ import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.model.DataSpaceParticipantDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.DataSpaceParticipantSearchRequestMapper import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.DataSpaceParticipantResponseMapper -import org.eclipse.tractusx.bpdm.pool.service.operation.DataSpaceParticipantSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.DataSpaceParticipantSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.participation.DataSpaceParticipantSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.participation.DataSpaceParticipantSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.DataSpaceParticipantSearchRequest as DataSpaceParticipantSearchRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantUpdateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantUpdateApplicationV7Service.kt index e75f7c925..8f9fa0471 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantUpdateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/DataSpaceParticipantUpdateApplicationV7Service.kt @@ -23,8 +23,8 @@ import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.DataSpaceParticipantUpdateRequestMapper import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.DataSpaceParticipantParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.parseAndExecuteAllOrNone -import org.eclipse.tractusx.bpdm.pool.service.operation.DataSpaceParticipantUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.DataSpaceParticipantUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.participation.DataSpaceParticipantUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.participation.DataSpaceParticipantUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.DataSpaceParticipantUpdateRequest as DataSpaceParticipantUpdateRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/FieldQualityRuleSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/FieldQualityRuleSearchApplicationV7Service.kt index d433fe057..8b897d503 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/FieldQualityRuleSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/FieldQualityRuleSearchApplicationV7Service.kt @@ -23,8 +23,8 @@ import com.neovisionaries.i18n.CountryCode import org.eclipse.tractusx.bpdm.pool.api.model.FieldQualityRuleDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.FieldQualityRuleResponseMapper import org.eclipse.tractusx.bpdm.pool.model.request.FieldQualityRuleSearchRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.FieldQualityRuleSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.FieldQualityRuleSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.FieldQualityRuleSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.FieldQualityRuleSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeCreateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeCreateApplicationV7Service.kt index c26dbe908..4e828a2be 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeCreateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeCreateApplicationV7Service.kt @@ -24,8 +24,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.IdentifierTypeReques import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.IdentifierTypeResponseMapper import org.eclipse.tractusx.bpdm.pool.mapper.shared.outbound.IdentifierTypeParseErrorMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.IdentifierTypeCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.IdentifierTypeCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.IdentifierTypeCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.IdentifierTypeCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeSearchApplicationV7Service.kt index 3479800de..52cea4643 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/IdentifierTypeSearchApplicationV7Service.kt @@ -28,8 +28,8 @@ import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierBusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierTypeDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.IdentifierTypeRequestMapper import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.IdentifierTypeResponseMapper -import org.eclipse.tractusx.bpdm.pool.service.operation.IdentifierTypeSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.IdentifierTypeSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.IdentifierTypeSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.IdentifierTypeSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityCreateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityCreateApplicationV7Service.kt index a256e70c4..e8c7eaa3e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityCreateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityCreateApplicationV7Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityParseErr import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityGetApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityGetApplicationV7Service.kt index 9574a76a6..542c258f3 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityGetApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityGetApplicationV7Service.kt @@ -23,8 +23,8 @@ import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException import org.eclipse.tractusx.bpdm.pool.api.model.response.LegalEntityWithLegalAddressVerboseDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityResponseMapper import org.eclipse.tractusx.bpdm.pool.model.request.LegalEntityGetRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityGetService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityGetParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityGetService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityGetParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntitySearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntitySearchApplicationV7Service.kt index ac67bd341..53e40dffc 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntitySearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntitySearchApplicationV7Service.kt @@ -26,8 +26,8 @@ import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.model.response.LegalEntityWithLegalAddressVerboseDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.LegalEntitySearchRequestMapper import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityResponseMapper -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntitySearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntitySearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntitySearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntitySearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.LegalEntitySearchRequest as LegalEntitySearchRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityUpdateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityUpdateApplicationV7Service.kt index 5bcf872fe..ff11aea59 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityUpdateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalEntityUpdateApplicationV7Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityParseErr import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalEntityResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalEntityPayloadUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntityUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityPayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormCreateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormCreateApplicationV7Service.kt index 44623b5d8..64ab1361c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormCreateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormCreateApplicationV7Service.kt @@ -24,8 +24,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.LegalFormRequestMapp import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalFormParseErrorMapper import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalFormResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalFormCreateService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalFormCreateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.LegalFormCreateService +import org.eclipse.tractusx.bpdm.pool.service.parser.metadata.LegalFormCreateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.LegalFormRequest as LegalFormRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormSearchApplicationV7Service.kt index 276403eba..8bec65581 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/LegalFormSearchApplicationV7Service.kt @@ -25,7 +25,7 @@ import org.eclipse.tractusx.bpdm.common.service.toPageDto import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.model.LegalFormDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.LegalFormResponseMapper -import org.eclipse.tractusx.bpdm.pool.service.operation.LegalFormSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.LegalFormSearchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ReasonCodeSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ReasonCodeSearchApplicationV7Service.kt index 07a719b96..3f4495a50 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ReasonCodeSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ReasonCodeSearchApplicationV7Service.kt @@ -24,7 +24,7 @@ import org.eclipse.tractusx.bpdm.common.dto.PaginationRequest import org.eclipse.tractusx.bpdm.common.service.toPageDto import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.model.ReasonCodeDto -import org.eclipse.tractusx.bpdm.pool.service.operation.ReasonCodeSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.ReasonCodeSearchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ScriptCodeSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ScriptCodeSearchApplicationV7Service.kt index 43baa4086..9d2211bbc 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ScriptCodeSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/ScriptCodeSearchApplicationV7Service.kt @@ -24,7 +24,7 @@ import org.eclipse.tractusx.bpdm.common.dto.PaginationRequest import org.eclipse.tractusx.bpdm.common.service.toPageDto import org.eclipse.tractusx.bpdm.common.service.toPageRequest import org.eclipse.tractusx.bpdm.pool.api.model.ScriptCodeDto -import org.eclipse.tractusx.bpdm.pool.service.operation.ScriptCodeSearchService +import org.eclipse.tractusx.bpdm.pool.service.operation.metadata.ScriptCodeSearchService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteCreateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteCreateApplicationV7Service.kt index ab4ae97d9..987db940f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteCreateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteCreateApplicationV7Service.kt @@ -31,10 +31,10 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.SiteParseErrorMappe import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.SiteResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteCreateService -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteCreateWithReferencedAddressAsMainService -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteCreateParser -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteCreateWithLegalAddressAsMainParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteCreateWithReferencedAddressAsMainService +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteCreateWithLegalAddressAsMainParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteGetApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteGetApplicationV7Service.kt index b0cfba766..7f6980c47 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteGetApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteGetApplicationV7Service.kt @@ -23,8 +23,8 @@ import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException import org.eclipse.tractusx.bpdm.pool.api.model.response.SiteWithMainAddressVerboseDto import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.SiteResponseMapper import org.eclipse.tractusx.bpdm.pool.model.request.SiteGetRequest -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteGetService -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteGetParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteGetService +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteGetParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteSearchApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteSearchApplicationV7Service.kt index 747969a63..33642cb47 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteSearchApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteSearchApplicationV7Service.kt @@ -29,9 +29,9 @@ import org.eclipse.tractusx.bpdm.pool.api.model.response.SiteWithMainAddressVerb import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.inbound.SiteSearchRequestMapper import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.SiteResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult -import org.eclipse.tractusx.bpdm.pool.service.operation.SiteSearchService -import org.eclipse.tractusx.bpdm.pool.service.parser.LegalEntitySiteSearchParser -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteSearchParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SiteSearchService +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntitySiteSearchParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.eclipse.tractusx.bpdm.pool.api.model.request.SiteSearchRequest as SiteSearchRequestDto diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteUpdateApplicationV7Service.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteUpdateApplicationV7Service.kt index 34094ce41..3dbdbf147 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteUpdateApplicationV7Service.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/application/v7/SiteUpdateApplicationV7Service.kt @@ -30,8 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.SiteParseErrorMappe import org.eclipse.tractusx.bpdm.pool.mapper.poolv7.outbound.SiteResponseMapper import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.parseAndExecute -import org.eclipse.tractusx.bpdm.pool.service.operation.SitePayloadUpdateService -import org.eclipse.tractusx.bpdm.pool.service.parser.SiteUpdateParser +import org.eclipse.tractusx.bpdm.pool.service.operation.site.SitePayloadUpdateService +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteUpdateParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressAssociationFetchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressAssociationFetchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressAssociationFetchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressAssociationFetchService.kt index 19c8c0681..69dd6597c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressAssociationFetchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressAssociationFetchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.repository.LogisticAddressRepository diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressCreateService.kt similarity index 95% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressCreateService.kt index 6262371e2..8cc562970 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressCreateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult import org.eclipse.tractusx.bpdm.pool.dto.UpsertType @@ -25,6 +25,7 @@ import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.mapper.entity.AddressEntityMapper import org.eclipse.tractusx.bpdm.pool.model.PendingAddressWrite import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressCreateParsed +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnIssueService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressGetService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressGetService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressGetService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressGetService.kt index e0856db37..11fe9f55f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressGetService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressGetService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressGetParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressPayloadUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressPayloadUpdateService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressPayloadUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressPayloadUpdateService.kt index a3a7c0129..a3bad3bfa 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressPayloadUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressPayloadUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressSearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressSearchService.kt index 5fb18c601..e3e18e5f6 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressSearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressUpdateService.kt similarity index 99% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressUpdateService.kt index 039ca7ee8..f9083d2b8 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.common.util.replace import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressWriteCommitService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressWriteCommitService.kt similarity index 94% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressWriteCommitService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressWriteCommitService.kt index acefab2e0..fae0d2831 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AddressWriteCommitService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/address/AddressWriteCommitService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.address import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType @@ -27,6 +27,7 @@ import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord import org.eclipse.tractusx.bpdm.pool.model.PendingAddressWrite import org.eclipse.tractusx.bpdm.pool.repository.LogisticAddressRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnIdentifierSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnIdentifierSearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnIdentifierSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnIdentifierSearchService.kt index 792e5a1f4..b67e6c7db 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnIdentifierSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnIdentifierSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.bpn import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierBusinessPartnerType import org.eclipse.tractusx.bpdm.pool.model.BpnIdentifierMatch diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnIssueService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnIssueService.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnIssueService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnIssueService.kt index d55b54e45..2f6dddc4b 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnIssueService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnIssueService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.bpn import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.config.BpnConfigProperties @@ -28,6 +28,7 @@ import org.eclipse.tractusx.bpdm.pool.repository.ConfigurationEntryRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import kotlin.math.pow +import kotlin.text.iterator /** * The single authority for issuing BPNs: advances the stored counter of the requested business partner kind and turns diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnRequestIdentifierSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnRequestIdentifierSearchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnRequestIdentifierSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnRequestIdentifierSearchService.kt index 6aa927a70..1e96c7d4c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/BpnRequestIdentifierSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/bpn/BpnRequestIdentifierSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.bpn import org.eclipse.tractusx.bpdm.pool.entity.BpnRequestIdentifierMappingDb import org.eclipse.tractusx.bpdm.pool.model.parsed.BpnRequestIdentifierSearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogCreateService.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogCreateService.kt index 69def4501..09959c04b 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogCreateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.changelog import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.entity.PartnerChangelogEntryDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogEmissionPolicy.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogEmissionPolicy.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogEmissionPolicy.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogEmissionPolicy.kt index f984fce74..a61e8e08e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogEmissionPolicy.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogEmissionPolicy.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.changelog import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogSearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogSearchService.kt index 810c523fc..81e5af6c5 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ChangelogSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/changelog/ChangelogSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.changelog import org.eclipse.tractusx.bpdm.pool.entity.PartnerChangelogEntryDb import org.eclipse.tractusx.bpdm.pool.model.parsed.ChangelogSearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityAssociationFetchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityAssociationFetchService.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityAssociationFetchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityAssociationFetchService.kt index 10adadec1..b78eddd6f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityAssociationFetchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityAssociationFetchService.kt @@ -17,11 +17,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityIdentifierRepository import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressAssociationFetchService import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityCreateService.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityCreateService.kt index eb7babc7c..70c2655a0 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityCreateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType @@ -28,6 +28,9 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressCreateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityCreateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityHeaderParsed import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnIssueService +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressCreateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.Instant diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityGetService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityGetService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityGetService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityGetService.kt index 7e06c3c3a..5ed9ed4b4 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityGetService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityGetService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierBusinessPartnerType import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityPayloadUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityPayloadUpdateService.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityPayloadUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityPayloadUpdateService.kt index f1ad9c32e..c57e5f4f2 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityPayloadUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityPayloadUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntitySearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntitySearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntitySearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntitySearchService.kt index 35c4147af..e26d47b5d 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntitySearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntitySearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntitySearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityUpdateService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityUpdateService.kt index a49673f9d..e35d4157f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalEntityUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/LegalEntityUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.common.util.replace @@ -29,6 +29,8 @@ import org.eclipse.tractusx.bpdm.pool.mapper.entity.LegalEntityEntityMapper import org.eclipse.tractusx.bpdm.pool.model.ChangelogRecord import org.eclipse.tractusx.bpdm.pool.model.update.* import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressUpdateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ScriptVariantCoverageService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/ScriptVariantCoverageService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ScriptVariantCoverageService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/ScriptVariantCoverageService.kt index a1b422196..9a78c024e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ScriptVariantCoverageService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/ScriptVariantCoverageService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb @@ -58,4 +58,4 @@ class ScriptVariantCoverageService( return true } -} +} \ No newline at end of file diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/UltimateOwnerRecalculationService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/UltimateOwnerRecalculationService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/UltimateOwnerRecalculationService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/UltimateOwnerRecalculationService.kt index 2562b638e..5830ac614 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/UltimateOwnerRecalculationService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/UltimateOwnerRecalculationService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.model.update.AddressContentUpdate diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/UltimateOwnerResolutionService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/UltimateOwnerResolutionService.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/UltimateOwnerResolutionService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/UltimateOwnerResolutionService.kt index 931fadcd9..e74950609 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/UltimateOwnerResolutionService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/legalentity/UltimateOwnerResolutionService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.legalentity import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.api.model.LegalEntityRelationType diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AdministrativeAreaSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/AdministrativeAreaSearchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AdministrativeAreaSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/AdministrativeAreaSearchService.kt index 59a1c3a1d..8f845d5d9 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/AdministrativeAreaSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/AdministrativeAreaSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import org.eclipse.tractusx.bpdm.pool.entity.RegionDb import org.eclipse.tractusx.bpdm.pool.repository.RegionRepository diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/FieldQualityRuleSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/FieldQualityRuleSearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/FieldQualityRuleSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/FieldQualityRuleSearchService.kt index fc4681860..28fd55c4a 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/FieldQualityRuleSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/FieldQualityRuleSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import org.eclipse.tractusx.bpdm.pool.api.model.QualityLevel import org.eclipse.tractusx.bpdm.pool.entity.FieldQualityRuleDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/IdentifierTypeCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/IdentifierTypeCreateService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/IdentifierTypeCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/IdentifierTypeCreateService.kt index fab1c6fc1..22e6b1673 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/IdentifierTypeCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/IdentifierTypeCreateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.entity.IdentifierTypeDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/IdentifierTypeSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/IdentifierTypeSearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/IdentifierTypeSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/IdentifierTypeSearchService.kt index 9a88188b0..932d4de4b 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/IdentifierTypeSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/IdentifierTypeSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import org.eclipse.tractusx.bpdm.pool.entity.IdentifierTypeDb import org.eclipse.tractusx.bpdm.pool.model.parsed.IdentifierTypeSearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalFormCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/LegalFormCreateService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalFormCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/LegalFormCreateService.kt index 0e4b51d8d..886421844 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalFormCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/LegalFormCreateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import mu.KotlinLogging import org.eclipse.tractusx.bpdm.pool.entity.LegalFormDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalFormSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/LegalFormSearchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalFormSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/LegalFormSearchService.kt index ae0768bc2..9cbaaf217 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/LegalFormSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/LegalFormSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import org.eclipse.tractusx.bpdm.pool.entity.LegalFormDb import org.eclipse.tractusx.bpdm.pool.repository.LegalFormRepository diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ReasonCodeSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/ReasonCodeSearchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ReasonCodeSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/ReasonCodeSearchService.kt index 87e699135..291513b23 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ReasonCodeSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/ReasonCodeSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import org.eclipse.tractusx.bpdm.pool.entity.ReasonCodeDb import org.eclipse.tractusx.bpdm.pool.repository.ReasonCodeRepository diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ScriptCodeSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/ScriptCodeSearchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ScriptCodeSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/ScriptCodeSearchService.kt index 872cc9069..71fe4fd60 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/ScriptCodeSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/metadata/ScriptCodeSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.metadata import org.eclipse.tractusx.bpdm.pool.entity.ScriptCodeDb import org.eclipse.tractusx.bpdm.pool.repository.ScriptCodeRepository diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/DataSpaceParticipantSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/participation/DataSpaceParticipantSearchService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/DataSpaceParticipantSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/participation/DataSpaceParticipantSearchService.kt index b1de19f7c..3fe5b6538 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/DataSpaceParticipantSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/participation/DataSpaceParticipantSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.participation import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.model.parsed.DataSpaceParticipantSearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/DataSpaceParticipantUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/participation/DataSpaceParticipantUpdateService.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/DataSpaceParticipantUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/participation/DataSpaceParticipantUpdateService.kt index 72a203097..2200f2ee7 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/DataSpaceParticipantUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/participation/DataSpaceParticipantUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.participation import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb @@ -26,6 +26,7 @@ import org.eclipse.tractusx.bpdm.pool.model.update.AddressContentUpdate import org.eclipse.tractusx.bpdm.pool.model.update.FieldUpdate import org.eclipse.tractusx.bpdm.pool.model.update.LegalEntityHeaderUpdate import org.eclipse.tractusx.bpdm.pool.model.update.LegalEntityUpdate +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.LegalEntityUpdateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteAssociationFetchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteAssociationFetchService.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteAssociationFetchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteAssociationFetchService.kt index 48e7412d9..d1cda4c19 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteAssociationFetchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteAssociationFetchService.kt @@ -17,10 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.repository.SiteRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressAssociationFetchService import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteCreateService.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteCreateService.kt index 4cd443563..512032348 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteCreateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType @@ -27,6 +27,8 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressCreateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteCreateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderCreateParsed import org.eclipse.tractusx.bpdm.pool.repository.SiteRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressCreateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteCreateWithReferencedAddressAsMainService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteCreateWithReferencedAddressAsMainService.kt similarity index 95% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteCreateWithReferencedAddressAsMainService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteCreateWithReferencedAddressAsMainService.kt index 7942fa382..1d8f63b02 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteCreateWithReferencedAddressAsMainService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteCreateWithReferencedAddressAsMainService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.api.model.ChangelogType @@ -30,6 +30,8 @@ import org.eclipse.tractusx.bpdm.pool.model.update.FieldUpdate import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteCreateWithReferencedAddressAsMainParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderCreateParsed import org.eclipse.tractusx.bpdm.pool.repository.SiteRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressUpdateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteGetService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteGetService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteGetService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteGetService.kt index 3a24c6227..7f4c5f10e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteGetService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteGetService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteGetParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteHeaderTransientCreateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteHeaderTransientCreateService.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteHeaderTransientCreateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteHeaderTransientCreateService.kt index 50eb05686..c1913223d 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteHeaderTransientCreateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteHeaderTransientCreateService.kt @@ -17,11 +17,12 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.mapper.entity.SiteEntityMapper import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderCreateParsed +import org.eclipse.tractusx.bpdm.pool.service.operation.bpn.BpnIssueService import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SitePayloadUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SitePayloadUpdateService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SitePayloadUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SitePayloadUpdateService.kt index 4bfb6bda6..cfb7c74ac 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SitePayloadUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SitePayloadUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.pool.dto.UpsertResult import org.eclipse.tractusx.bpdm.pool.entity.SiteDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteSearchService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteSearchService.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteSearchService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteSearchService.kt index 5b757e667..6d3897e01 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteSearchService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteSearchService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteSearchParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteUpdateService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteUpdateService.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteUpdateService.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteUpdateService.kt index c1e8ce677..fb7390e2c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/SiteUpdateService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/operation/site/SiteUpdateService.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.operation +package org.eclipse.tractusx.bpdm.pool.service.operation.site import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.common.util.replace @@ -34,6 +34,8 @@ import org.eclipse.tractusx.bpdm.pool.model.update.SiteHeaderUpdate import org.eclipse.tractusx.bpdm.pool.model.update.SiteUpdate import org.eclipse.tractusx.bpdm.pool.model.update.ifSet import org.eclipse.tractusx.bpdm.pool.repository.SiteRepository +import org.eclipse.tractusx.bpdm.pool.service.operation.changelog.ChangelogCreateService +import org.eclipse.tractusx.bpdm.pool.service.operation.address.AddressUpdateService import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/ChangelogSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/ChangelogSearchParser.kt index 6a7aab05d..f204789ce 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/ChangelogSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/ChangelogSearchParser.kt @@ -25,6 +25,7 @@ import org.eclipse.tractusx.bpdm.pool.model.error.ChangelogSearchParseError import org.eclipse.tractusx.bpdm.pool.model.error.SearchValuesTooMany import org.eclipse.tractusx.bpdm.pool.model.parsed.ChangelogSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.ChangelogSearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnFilterParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressBpnParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressBpnParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressBpnParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressBpnParser.kt index 85006649e..3ac553f7a 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressBpnParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressBpnParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -43,7 +43,7 @@ class AddressBpnParser( return addressBpns.map { bpn -> when (val address = addressesByBpn[bpn]) { - null -> ParseResult.Companion.ofSingleFailure(UnresolvableAddress(bpn)) + null -> ParseResult.ofSingleFailure(UnresolvableAddress(bpn)) else -> ParseResult.Success(address) } } diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressContentParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressContentParser.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressContentParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressContentParser.kt index be9b3bbc0..5cb1a04c5 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressContentParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressContentParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.combine diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressGetParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressGetParser.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressGetParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressGetParser.kt index ab8329822..235c980e1 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressGetParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressGetParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressGetParsed import org.eclipse.tractusx.bpdm.pool.model.request.AddressGetRequest diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressIdentifierDuplicateValidator.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressIdentifierDuplicateValidator.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressIdentifierDuplicateValidator.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressIdentifierDuplicateValidator.kt index 495f43244..1f6f872cf 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressIdentifierDuplicateValidator.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressIdentifierDuplicateValidator.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.common.util.findDuplicates import org.eclipse.tractusx.bpdm.pool.model.error.AddressConstraintParseError diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressParentResolutionParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressParentResolutionParser.kt similarity index 90% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressParentResolutionParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressParentResolutionParser.kt index 7622380d8..2eafe96d1 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressParentResolutionParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressParentResolutionParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -29,6 +29,7 @@ import org.eclipse.tractusx.bpdm.pool.model.request.AddressCreateTypedParentsReq import org.eclipse.tractusx.bpdm.pool.model.request.AddressCreateUntypedParentRequest import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository import org.eclipse.tractusx.bpdm.pool.repository.SiteRepository +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnTypeResolver import org.springframework.stereotype.Service /** @@ -62,12 +63,12 @@ class AddressParentResolutionParser( BusinessPartnerType.LEGAL_ENTITY -> if (parent in existingLegalEntityBpns) ParseResult.Success(AddressCreateTypedParentsRequest(legalEntityBpn = parent, siteBpn = null, content = request.content)) - else ParseResult.Companion.ofSingleFailure(UnresolvableLegalEntity(parent)) + else ParseResult.ofSingleFailure(UnresolvableLegalEntity(parent)) BusinessPartnerType.SITE -> sitesByBpn[parent]?.let { ParseResult.Success(AddressCreateTypedParentsRequest(legalEntityBpn = it.legalEntity.bpn, siteBpn = parent, content = request.content)) - } ?: ParseResult.Companion.ofSingleFailure(UnresolvableSite(parent)) - else -> ParseResult.Companion.ofSingleFailure(InvalidParentBpn(parent)) + } ?: ParseResult.ofSingleFailure(UnresolvableSite(parent)) + else -> ParseResult.ofSingleFailure(InvalidParentBpn(parent)) } } } diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressPartnerScriptCodeReader.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressPartnerScriptCodeReader.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressPartnerScriptCodeReader.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressPartnerScriptCodeReader.kt index c145293f9..023f500d1 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressPartnerScriptCodeReader.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressPartnerScriptCodeReader.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.entity.LogisticAddressDb import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressRequestParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressRequestParser.kt similarity index 99% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressRequestParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressRequestParser.kt index d1bac8f25..46fae952f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressRequestParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressRequestParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import com.neovisionaries.i18n.CountryCode import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierBusinessPartnerType diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressSearchParser.kt similarity index 94% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressSearchParser.kt index b7c199a77..1939fa5e5 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressSearchParser.kt @@ -17,10 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.AddressSearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnFilterParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressSiteAssignmentParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressSiteAssignmentParser.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressSiteAssignmentParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressSiteAssignmentParser.kt index e05fa5bb7..c6375048f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressSiteAssignmentParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressSiteAssignmentParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -26,6 +26,8 @@ import org.eclipse.tractusx.bpdm.pool.model.error.AddressSiteAssignmentParseErro import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressSiteAssignmentParsed import org.eclipse.tractusx.bpdm.pool.model.request.AddressSiteAssignmentRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteBpnParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteLegalEntityConsistencyValidator import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressUpdateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressUpdateParser.kt similarity index 91% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressUpdateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressUpdateParser.kt index 3270a228d..1be4fe8b9 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AddressUpdateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AddressUpdateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -27,6 +27,9 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressUpdateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.LogisticAddressParsed import org.eclipse.tractusx.bpdm.pool.model.request.AddressUpdateRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteBpnParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteLegalEntityConsistencyValidator import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AlternativeHeadquarterValidator.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AlternativeHeadquarterValidator.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AlternativeHeadquarterValidator.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AlternativeHeadquarterValidator.kt index b410a3f92..c5b822a60 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/AlternativeHeadquarterValidator.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/AlternativeHeadquarterValidator.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.api.model.LegalEntityRelationType import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb @@ -68,5 +68,4 @@ class AlternativeHeadquarterValidator( require(targets.size == requestedFlags.size) { "targets and requestedFlags must be positionally aligned" } return targets.zip(requestedFlags).map { (target, flag) -> validateFlagOnAlternative(target, flag) } } -} - +} \ No newline at end of file diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/TypedParentAddressCreateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/TypedParentAddressCreateParser.kt similarity index 90% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/TypedParentAddressCreateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/TypedParentAddressCreateParser.kt index 7f7e586d2..843056993 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/TypedParentAddressCreateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/TypedParentAddressCreateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -26,6 +26,9 @@ import org.eclipse.tractusx.bpdm.pool.model.error.AddressCreateParseError import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressCreateParsed import org.eclipse.tractusx.bpdm.pool.model.request.AddressCreateTypedParentsRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityBpnParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteBpnParser +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteLegalEntityConsistencyValidator import org.springframework.stereotype.Service /** @@ -57,4 +60,4 @@ class TypedParentAddressCreateParser( AddressCreateParsed(legalEntity, site, content) } } -} +} \ No newline at end of file diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/UntypedParentAddressCreateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/UntypedParentAddressCreateParser.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/UntypedParentAddressCreateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/UntypedParentAddressCreateParser.kt index 1cee6f002..39478ae5c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/UntypedParentAddressCreateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/address/UntypedParentAddressCreateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.address import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.chainParseResults @@ -42,4 +42,4 @@ class UntypedParentAddressCreateParser( */ fun parse(requests: List): List> = chainParseResults(addressParentResolutionParser.parse(requests)) { typed -> typedParentAddressCreateParser.parse(typed) } -} +} \ No newline at end of file diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnFilterParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnFilterParser.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnFilterParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnFilterParser.kt index cba20c98b..84187d1af 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnFilterParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnFilterParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.bpn import org.springframework.stereotype.Service diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnIdentifierSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnIdentifierSearchParser.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnIdentifierSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnIdentifierSearchParser.kt index 30ddf572c..47940716c 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnIdentifierSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnIdentifierSearchParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.bpn import org.eclipse.tractusx.bpdm.pool.config.ControllerConfigProperties import org.eclipse.tractusx.bpdm.pool.model.ParseResult diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnRequestIdentifierSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnRequestIdentifierSearchParser.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnRequestIdentifierSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnRequestIdentifierSearchParser.kt index 66b28edc2..1837fce19 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnRequestIdentifierSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnRequestIdentifierSearchParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.bpn import org.eclipse.tractusx.bpdm.pool.config.ControllerConfigProperties import org.eclipse.tractusx.bpdm.pool.model.ParseResult diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnTypeResolver.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnTypeResolver.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnTypeResolver.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnTypeResolver.kt index 7f3ae561e..f1176327b 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/BpnTypeResolver.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/bpn/BpnTypeResolver.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.bpn import org.eclipse.tractusx.bpdm.common.dto.BusinessPartnerType import org.eclipse.tractusx.bpdm.pool.config.BpnConfigProperties diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityAddressSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityAddressSearchParser.kt similarity index 94% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityAddressSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityAddressSearchParser.kt index 77e6710dc..8048e3165 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityAddressSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityAddressSearchParser.kt @@ -17,12 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.error.UnresolvableLegalEntity import org.eclipse.tractusx.bpdm.pool.model.parsed.AddressSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.AddressSearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityBpnParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityBpnParser.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityBpnParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityBpnParser.kt index 3dc56044f..5f933136e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityBpnParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityBpnParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -43,7 +43,7 @@ class LegalEntityBpnParser( return legalEntityBpns.map { bpn -> when (val legalEntity = legalEntitiesByBpn[bpn]) { - null -> ParseResult.Companion.ofSingleFailure(UnresolvableLegalEntity(bpn)) + null -> ParseResult.ofSingleFailure(UnresolvableLegalEntity(bpn)) else -> ParseResult.Success(legalEntity) } } diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityCreateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityCreateParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityCreateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityCreateParser.kt index bd6dbca45..03641f057 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityCreateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityCreateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -29,6 +29,8 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityCreateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityHeaderParsed import org.eclipse.tractusx.bpdm.pool.model.request.LegalEntityCreateRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressContentParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityGetParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityGetParser.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityGetParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityGetParser.kt index b7a340d56..244dfec87 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityGetParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityGetParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.config.BpnConfigProperties import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityGetParsed diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityHeaderParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityHeaderParser.kt similarity index 99% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityHeaderParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityHeaderParser.kt index 8aa4fc32a..1b37d4ba4 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityHeaderParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityHeaderParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierBusinessPartnerType import org.eclipse.tractusx.bpdm.pool.entity.LegalFormDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityIdentifierDuplicateValidator.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityIdentifierDuplicateValidator.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityIdentifierDuplicateValidator.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityIdentifierDuplicateValidator.kt index da78e1697..bc0a63cae 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityIdentifierDuplicateValidator.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityIdentifierDuplicateValidator.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.common.util.findDuplicates import org.eclipse.tractusx.bpdm.pool.model.error.LegalEntityContentParseError diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntitySearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntitySearchParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntitySearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntitySearchParser.kt index 5e83e596d..bc9b5c3fe 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntitySearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntitySearchParser.kt @@ -17,10 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntitySearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.LegalEntitySearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnFilterParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntitySiteSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntitySiteSearchParser.kt similarity index 94% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntitySiteSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntitySiteSearchParser.kt index 9ccd7faf8..405dba9e9 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntitySiteSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntitySiteSearchParser.kt @@ -17,12 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.error.UnresolvableLegalEntity import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteSearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.site.SiteSearchParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityUpdateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityUpdateParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityUpdateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityUpdateParser.kt index 208f32f8d..c3fe7ab4f 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalEntityUpdateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/LegalEntityUpdateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -27,6 +27,10 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityContentParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.LegalEntityUpdateParsed import org.eclipse.tractusx.bpdm.pool.model.request.LegalEntityUpdateRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressContentParser +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressPartnerScriptCodeReader +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AlternativeHeadquarterValidator import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/UltimateOwnerUniquenessValidator.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/UltimateOwnerUniquenessValidator.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/UltimateOwnerUniquenessValidator.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/UltimateOwnerUniquenessValidator.kt index dbc06461a..09e3c9468 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/UltimateOwnerUniquenessValidator.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/legalentity/UltimateOwnerUniquenessValidator.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.legalentity import org.eclipse.tractusx.bpdm.pool.api.model.LegalEntityRelationType import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb @@ -102,4 +102,4 @@ class UltimateOwnerUniquenessValidator( return collected.values.toList() } -} +} \ No newline at end of file diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/FieldQualityRuleSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/FieldQualityRuleSearchParser.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/FieldQualityRuleSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/FieldQualityRuleSearchParser.kt index d5aa1b71f..3c13144c6 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/FieldQualityRuleSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/FieldQualityRuleSearchParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.metadata import org.eclipse.tractusx.bpdm.pool.model.parsed.FieldQualityRuleSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.FieldQualityRuleSearchRequest diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/IdentifierTypeCreateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/IdentifierTypeCreateParser.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/IdentifierTypeCreateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/IdentifierTypeCreateParser.kt index c88f9dc3f..15b9f4831 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/IdentifierTypeCreateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/IdentifierTypeCreateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.metadata import org.eclipse.tractusx.bpdm.pool.api.model.IdentifierTypeCategory import org.eclipse.tractusx.bpdm.pool.model.ParseResult diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/IdentifierTypeSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/IdentifierTypeSearchParser.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/IdentifierTypeSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/IdentifierTypeSearchParser.kt index d404e8e8f..b749374df 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/IdentifierTypeSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/IdentifierTypeSearchParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.metadata import org.eclipse.tractusx.bpdm.pool.model.parsed.IdentifierTypeSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.IdentifierTypeSearchRequest diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalFormCreateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/LegalFormCreateParser.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalFormCreateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/LegalFormCreateParser.kt index b634ddac7..3fe845026 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/LegalFormCreateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/metadata/LegalFormCreateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.metadata import org.eclipse.tractusx.bpdm.pool.entity.RegionDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/DataSpaceParticipantSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/participation/DataSpaceParticipantSearchParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/DataSpaceParticipantSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/participation/DataSpaceParticipantSearchParser.kt index 5b368df31..c48f912e9 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/DataSpaceParticipantSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/participation/DataSpaceParticipantSearchParser.kt @@ -17,10 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.participation import org.eclipse.tractusx.bpdm.pool.model.parsed.DataSpaceParticipantSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.DataSpaceParticipantSearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnFilterParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/DataSpaceParticipantUpdateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/participation/DataSpaceParticipantUpdateParser.kt similarity index 94% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/DataSpaceParticipantUpdateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/participation/DataSpaceParticipantUpdateParser.kt index 8d414b837..b9e50bfc1 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/DataSpaceParticipantUpdateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/participation/DataSpaceParticipantUpdateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.participation import org.eclipse.tractusx.bpdm.common.util.findDuplicates import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -26,6 +26,7 @@ import org.eclipse.tractusx.bpdm.pool.model.error.DataSpaceParticipantUpdatePars import org.eclipse.tractusx.bpdm.pool.model.error.DataSpaceParticipantUpdateParseError.DuplicateParticipantEntry import org.eclipse.tractusx.bpdm.pool.model.parsed.DataSpaceParticipantUpdateParsed import org.eclipse.tractusx.bpdm.pool.model.request.DataSpaceParticipantUpdateRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityBpnParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteBpnParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteBpnParser.kt similarity index 95% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteBpnParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteBpnParser.kt index ec0ce1592..b28c4f164 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteBpnParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteBpnParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.entity.SiteDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult @@ -60,7 +60,7 @@ class SiteBpnParser( private fun resolveResult(bpn: String, sitesByBpn: Map): ParseResult = when (val site = sitesByBpn[bpn]) { - null -> ParseResult.Companion.ofSingleFailure(UnresolvableSite(bpn)) + null -> ParseResult.ofSingleFailure(UnresolvableSite(bpn)) else -> ParseResult.Success(site) } } \ No newline at end of file diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateOnAddressParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateOnAddressParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateOnAddressParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateOnAddressParser.kt index b5d8c15d7..33da24ba8 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateOnAddressParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateOnAddressParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -27,6 +27,8 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteCreateWithReferencedAddre import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteCreateOnAddressRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressBpnParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateParser.kt similarity index 91% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateParser.kt index 1689a1ee4..657384158 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -28,6 +28,9 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteCreateParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteCreateRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressContentParser +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityBpnParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateWithLegalAddressAsMainParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateWithLegalAddressAsMainParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateWithLegalAddressAsMainParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateWithLegalAddressAsMainParser.kt index 26a9447d0..e8b1e37f7 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateWithLegalAddressAsMainParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateWithLegalAddressAsMainParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -27,6 +27,8 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteCreateWithReferencedAddre import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteCreateWithLegalAddressAsMainRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.legalentity.LegalEntityBpnParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateWithReferencedAddressAsMainParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateWithReferencedAddressAsMainParser.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateWithReferencedAddressAsMainParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateWithReferencedAddressAsMainParser.kt index a565f9c56..855f48f4e 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteCreateWithReferencedAddressAsMainParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteCreateWithReferencedAddressAsMainParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -27,6 +27,9 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteCreateWithReferencedAddre import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteHeaderParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteCreateWithReferencedAddressAsMainRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressBpnParser +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressContentParser import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteGetParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteGetParser.kt similarity index 96% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteGetParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteGetParser.kt index e3516c36e..f9c5f2bd5 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteGetParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteGetParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteGetParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteGetRequest diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteHeaderParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteHeaderParser.kt similarity index 98% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteHeaderParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteHeaderParser.kt index 9de0d5689..73716b609 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteHeaderParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteHeaderParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.entity.ScriptCodeDb import org.eclipse.tractusx.bpdm.pool.model.ParseResult diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteLegalEntityConsistencyValidator.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteLegalEntityConsistencyValidator.kt similarity index 97% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteLegalEntityConsistencyValidator.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteLegalEntityConsistencyValidator.kt index 11e5e40c9..ad48b28b2 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteLegalEntityConsistencyValidator.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteLegalEntityConsistencyValidator.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.entity.LegalEntityDb import org.eclipse.tractusx.bpdm.pool.entity.SiteDb diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteSearchParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteSearchParser.kt similarity index 93% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteSearchParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteSearchParser.kt index 7cecf0584..33b86faac 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteSearchParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteSearchParser.kt @@ -17,10 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteSearchParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteSearchRequest +import org.eclipse.tractusx.bpdm.pool.service.parser.bpn.BpnFilterParser import org.springframework.stereotype.Service /** diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteUpdateParser.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteUpdateParser.kt similarity index 92% rename from bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteUpdateParser.kt rename to bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteUpdateParser.kt index 0914a8f22..1001d8524 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/SiteUpdateParser.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/parser/site/SiteUpdateParser.kt @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ******************************************************************************/ -package org.eclipse.tractusx.bpdm.pool.service.parser +package org.eclipse.tractusx.bpdm.pool.service.parser.site import org.eclipse.tractusx.bpdm.pool.model.ParseResult import org.eclipse.tractusx.bpdm.pool.model.PartnerScriptCodes @@ -27,6 +27,9 @@ import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteContentParsed import org.eclipse.tractusx.bpdm.pool.model.parsed.SiteUpdateParsed import org.eclipse.tractusx.bpdm.pool.model.request.SiteUpdateRequest import org.eclipse.tractusx.bpdm.pool.model.zipParseResults +import org.eclipse.tractusx.bpdm.pool.service.parser.ScriptVariantCoverageValidator +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressContentParser +import org.eclipse.tractusx.bpdm.pool.service.parser.address.AddressPartnerScriptCodeReader import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskResolutionServiceTest.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskResolutionServiceTest.kt index da56070de..37d63542a 100644 --- a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskResolutionServiceTest.kt +++ b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/service/TaskResolutionServiceTest.kt @@ -32,8 +32,8 @@ import org.eclipse.tractusx.bpdm.pool.repository.LegalEntityRepository import org.eclipse.tractusx.bpdm.pool.repository.PartnerChangelogEntryRepository import org.eclipse.tractusx.bpdm.pool.repository.RelationRepository import org.eclipse.tractusx.bpdm.pool.service.TaskStepBuildService.CleaningError -import org.eclipse.tractusx.bpdm.pool.service.operation.UltimateOwnerRecalculationService -import org.eclipse.tractusx.bpdm.pool.service.operation.UltimateOwnerResolutionService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.UltimateOwnerRecalculationService +import org.eclipse.tractusx.bpdm.pool.service.operation.legalentity.UltimateOwnerResolutionService import org.eclipse.tractusx.bpdm.test.containers.OrchestratorMockConfiguration import org.eclipse.tractusx.bpdm.test.containers.PostgreSQLContextInitializer import org.eclipse.tractusx.bpdm.test.testdata.orchestrator.* @@ -1488,9 +1488,9 @@ class TaskResolutionServiceTest @Autowired constructor( val persistedEntity = legalEntityRepository.findByBpnIgnoreCase(createdBpnl) assertThat(persistedEntity).isNotNull() assertThat(persistedEntity!!.ownershipUltimate).isFalse() - assertThat(persistedEntity!!.ultimateOwnerBpnl).isNull() + assertThat(persistedEntity.ultimateOwnerBpnl).isNull() - persistedEntity!!.ultimateOwnerBpnl = targetBpnl + persistedEntity.ultimateOwnerBpnl = targetBpnl legalEntityRepository.save(persistedEntity) val updatedEntity = legalEntityRepository.findByBpnIgnoreCase(createdBpnl)