From 2357266e5e6004fda4b1cd03fe539155ba30ae18 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 5 Dec 2023 13:55:36 +0100 Subject: [PATCH] OZG-4589 cleanup renaming --- .../de/ozgcloud/processor/processor/ProcessorService.java | 6 +++--- src/main/java/de/ozgcloud/processor/result/Action.java | 2 +- .../processor/result/ProcessorTechnicalException.java | 2 +- src/main/java/de/ozgcloud/processor/result/Severity.java | 2 +- .../java/de/ozgcloud/processor/vorgang/FileMetaData.java | 2 +- .../ozgcloud/processor/vorgang/ProcessorVorgangMapper.java | 2 +- src/main/java/de/ozgcloud/processor/vorgang/VorgangId.java | 2 +- .../ozgcloud/processor/vorgang/FileMetaDataTestFactory.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java index c421d13..ce2eccf 100644 --- a/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java +++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java @@ -13,7 +13,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.WebClient; -import de.itvsh.kop.common.errorhandling.TechnicalException; +import de.ozgcloud.common.errorhandling.TechnicalException; import de.ozgcloud.processor.processor.ProcessorProperties.Form; import de.ozgcloud.processor.processor.ProcessorProperties.Processor; import de.ozgcloud.processor.result.ProcessorTechnicalException; @@ -45,11 +45,11 @@ public class ProcessorService { return forms.stream().filter(form -> StringUtils.equals(form.getFormEngineName(), vorgang.getFormEngineName())) .anyMatch(form -> StringUtils.equals(form.getFormId(), vorgang.getFormId())); } - + public Stream<Mono<ProcessorResult>> processVorgang(Vorgang vorgang, Collection<String> processorNames) { return getProcessors(processorNames).map(processor -> callProcessor(processor, vorgang)); } - + Stream<Processor> getProcessors(Collection<String> processorNames) { return properties.getProcessors().stream().filter(processor -> processorNames.contains(processor.getName())); } diff --git a/src/main/java/de/ozgcloud/processor/result/Action.java b/src/main/java/de/ozgcloud/processor/result/Action.java index a6c266f..443b814 100644 --- a/src/main/java/de/ozgcloud/processor/result/Action.java +++ b/src/main/java/de/ozgcloud/processor/result/Action.java @@ -2,7 +2,7 @@ package de.ozgcloud.processor.result; import com.fasterxml.jackson.annotation.JsonCreator; -import de.itvsh.kop.common.errorhandling.TechnicalException; +import de.ozgcloud.common.errorhandling.TechnicalException; public enum Action { diff --git a/src/main/java/de/ozgcloud/processor/result/ProcessorTechnicalException.java b/src/main/java/de/ozgcloud/processor/result/ProcessorTechnicalException.java index 9a79b73..5503fac 100644 --- a/src/main/java/de/ozgcloud/processor/result/ProcessorTechnicalException.java +++ b/src/main/java/de/ozgcloud/processor/result/ProcessorTechnicalException.java @@ -1,6 +1,6 @@ package de.ozgcloud.processor.result; -import de.itvsh.kop.common.errorhandling.TechnicalException; +import de.ozgcloud.common.errorhandling.TechnicalException; import lombok.Getter; @Getter diff --git a/src/main/java/de/ozgcloud/processor/result/Severity.java b/src/main/java/de/ozgcloud/processor/result/Severity.java index 8a2ef8b..882a8f7 100644 --- a/src/main/java/de/ozgcloud/processor/result/Severity.java +++ b/src/main/java/de/ozgcloud/processor/result/Severity.java @@ -2,7 +2,7 @@ package de.ozgcloud.processor.result; import com.fasterxml.jackson.annotation.JsonCreator; -import de.itvsh.kop.common.errorhandling.TechnicalException; +import de.ozgcloud.common.errorhandling.TechnicalException; public enum Severity { INFO, WARN, ERROR, UNKNOWN; diff --git a/src/main/java/de/ozgcloud/processor/vorgang/FileMetaData.java b/src/main/java/de/ozgcloud/processor/vorgang/FileMetaData.java index 69d3f30..a75e21b 100644 --- a/src/main/java/de/ozgcloud/processor/vorgang/FileMetaData.java +++ b/src/main/java/de/ozgcloud/processor/vorgang/FileMetaData.java @@ -1,6 +1,6 @@ package de.ozgcloud.processor.vorgang; -import de.itvsh.kop.common.binaryfile.FileId; +import de.ozgcloud.common.binaryfile.FileId; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/de/ozgcloud/processor/vorgang/ProcessorVorgangMapper.java b/src/main/java/de/ozgcloud/processor/vorgang/ProcessorVorgangMapper.java index bcd31d5..5c7c912 100644 --- a/src/main/java/de/ozgcloud/processor/vorgang/ProcessorVorgangMapper.java +++ b/src/main/java/de/ozgcloud/processor/vorgang/ProcessorVorgangMapper.java @@ -8,7 +8,6 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; -import de.itvsh.kop.common.binaryfile.FileId; import de.ozgcloud.apilib.file.OzgCloudFileGroup; import de.ozgcloud.apilib.file.OzgCloudFileId; import de.ozgcloud.apilib.vorgang.OzgCloudAntragsteller; @@ -19,6 +18,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudFormField; import de.ozgcloud.apilib.vorgang.OzgCloudSubForm; import de.ozgcloud.apilib.vorgang.OzgCloudVorgang; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId; +import de.ozgcloud.common.binaryfile.FileId; @Mapper public interface ProcessorVorgangMapper { diff --git a/src/main/java/de/ozgcloud/processor/vorgang/VorgangId.java b/src/main/java/de/ozgcloud/processor/vorgang/VorgangId.java index c4cc506..df86f03 100644 --- a/src/main/java/de/ozgcloud/processor/vorgang/VorgangId.java +++ b/src/main/java/de/ozgcloud/processor/vorgang/VorgangId.java @@ -1,6 +1,6 @@ package de.ozgcloud.processor.vorgang; -import de.itvsh.kop.common.datatype.StringBasedValue; +import de.ozgcloud.common.datatype.StringBasedValue; public class VorgangId extends StringBasedValue { diff --git a/src/test/java/de/ozgcloud/processor/vorgang/FileMetaDataTestFactory.java b/src/test/java/de/ozgcloud/processor/vorgang/FileMetaDataTestFactory.java index 7e4926a..884cb14 100644 --- a/src/test/java/de/ozgcloud/processor/vorgang/FileMetaDataTestFactory.java +++ b/src/test/java/de/ozgcloud/processor/vorgang/FileMetaDataTestFactory.java @@ -2,7 +2,7 @@ package de.ozgcloud.processor.vorgang; import static de.ozgcloud.apilib.file.OzgCloudFileTestFactory.*; -import de.itvsh.kop.common.binaryfile.FileId; +import de.ozgcloud.common.binaryfile.FileId; public class FileMetaDataTestFactory { -- GitLab