From eca498a6b166d2649e586e4c047bada56f679cc9 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 22 Nov 2023 10:50:47 +0100
Subject: [PATCH] OZG-4607 use vorgang-manager interface instead of pluto
---
api-lib-core/pom.xml | 22 +++++++++++--------
.../common/command/grpc/CommandMapper.java | 6 ++---
.../grpc/GrpcOzgCloudCommandService.java | 4 ++--
.../command/grpc/OzgCloudCommandMapper.java | 4 ++--
.../file/grpc/GrpcOzgCloudFileService.java | 12 +++++-----
.../OzgCloudFileDownloadStreamObserver.java | 2 +-
.../apilib/file/grpc/OzgCloudFileMapper.java | 2 +-
.../grpc/GrpcOzgCloudVorgangService.java | 10 ++++-----
.../vorgang/grpc/OzgCloudEingangMapper.java | 8 +++----
.../vorgang/grpc/OzgCloudVorgangMapper.java | 2 +-
.../grpc/OzgCloudVorgangStubMapper.java | 2 +-
.../grpc/GrpcCommandResponseTestFactory.java | 2 +-
.../command/grpc/GrpcCommandTestFactory.java | 2 +-
.../GrpcCreateCommandRequestTestFactory.java | 6 ++---
.../grpc/GrpcOzgCloudCommandServiceTest.java | 5 ++---
.../GrpcFindFilesResponseTestFactory.java | 2 +-
.../grpc/GrpcOzgCloudFileServiceTest.java | 4 ++--
.../file/grpc/GrpcOzgFileTestFactory.java | 2 +-
.../grpc/GrpcAntragstellerTestFactory.java | 2 +-
.../grpc/GrpcEingangHeaderTestFactory.java | 2 +-
.../vorgang/grpc/GrpcEingangTestFactory.java | 8 +++----
...VorgangWithEingangResponseTestFactory.java | 2 +-
.../grpc/GrpcOzgCloudVorgangServiceTest.java | 10 ++++-----
.../grpc/GrpcServiceKontoTestFactory.java | 8 +++----
.../grpc/GrpcVorgangHeadTestFactory.java | 2 +-
.../grpc/GrpcVorgangHeaderTestFactory.java | 2 +-
.../GrpcVorgangWithEingangTestFactory.java | 2 +-
.../GrpcZustaendigeStelleTestFactory.java | 2 +-
.../OzgCloudClientAutoConfiguration.java | 18 +++++++--------
29 files changed, 79 insertions(+), 76 deletions(-)
diff --git a/api-lib-core/pom.xml b/api-lib-core/pom.xml
index d9dac23..576f470 100644
--- a/api-lib-core/pom.xml
+++ b/api-lib-core/pom.xml
@@ -11,12 +11,14 @@
<artifactId>api-lib-core</artifactId>
<properties>
- <lombok.version>1.18.26</lombok.version>
- <mapstruct.version>1.5.4.Final</mapstruct.version>
+ <lombok.version>1.18.30</lombok.version>
+ <mapstruct.version>1.5.5.Final</mapstruct.version>
<!-- plugins -->
- <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
- <jacoco.plugin.version>0.8.10</jacoco.plugin.version>
+ <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+ <maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
+ <jacoco.plugin.version>0.8.11</jacoco.plugin.version>
+
+ <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
</properties>
<dependencies>
@@ -32,12 +34,14 @@
</dependency>
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-interface</artifactId>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-interface</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-utils</artifactId>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-utils</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
<!--spring -->
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/CommandMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/CommandMapper.java
index f9d39db..83280f7 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/CommandMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/CommandMapper.java
@@ -5,15 +5,15 @@ import org.mapstruct.Mapping;
import org.mapstruct.Named;
import de.itvsh.kop.common.datatype.StringBasedValue;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
import de.ozgcloud.apilib.common.datatypes.GenericId;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
@Mapper(uses = { GrpcObjectMapper.class })
public interface CommandMapper {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java
index 4a3d26f..5b09405 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java
@@ -1,14 +1,14 @@
package de.ozgcloud.apilib.common.command.grpc;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.command.GrpcGetCommandRequest;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandMapper.java
index 3cb2b4e..d97671e 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandMapper.java
@@ -7,9 +7,9 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import de.itvsh.kop.common.datatype.StringBasedValue;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
@Mapper(uses = GrpcObjectMapper.class)
public interface OzgCloudCommandMapper {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java
index 008293d..b674f33 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java
@@ -12,18 +12,18 @@ import org.springframework.stereotype.Service;
import de.itvsh.kop.common.binaryfile.FileId;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFilesRequest;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.apilib.file.OzgCloudFileId;
import de.ozgcloud.apilib.file.OzgCloudFileService;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
import lombok.RequiredArgsConstructor;
import lombok.extern.java.Log;
import net.devh.boot.grpc.client.inject.GrpcClient;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileDownloadStreamObserver.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileDownloadStreamObserver.java
index 3a9826d..fb61d1d 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileDownloadStreamObserver.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileDownloadStreamObserver.java
@@ -5,7 +5,7 @@ import java.io.OutputStream;
import java.util.concurrent.CompletableFuture;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
import io.grpc.stub.StreamObserver;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileMapper.java
index 07c8706..f07e2d2 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileMapper.java
@@ -2,9 +2,9 @@ package de.ozgcloud.apilib.file.grpc;
import org.mapstruct.Mapper;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.apilib.file.OzgCloudFileId;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
@Mapper
public interface OzgCloudFileMapper {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
index 31df378..d9fbf53 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
@@ -2,11 +2,6 @@ package de.ozgcloud.apilib.vorgang.grpc;
import java.util.List;
-import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
-import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
@@ -14,6 +9,11 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
import de.ozgcloud.apilib.vorgang.Page;
+import de.ozgcloud.vorgang.vorgang.GrpcFilterBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest;
+import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
index f024d80..fb45e19 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
@@ -6,14 +6,14 @@ import java.util.stream.Stream;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
-import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
import de.ozgcloud.apilib.vorgang.OzgCloudEingang;
import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
import de.ozgcloud.apilib.vorgang.OzgCloudFormField;
import de.ozgcloud.apilib.vorgang.OzgCloudSubForm;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
@Mapper
public interface OzgCloudEingangMapper {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
index 3973f79..6c3b985 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
@@ -5,12 +5,12 @@ import java.util.Optional;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.vorgang.OzgCloudServiceKontoType;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStatus;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class })
public interface OzgCloudVorgangMapper {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangStubMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangStubMapper.java
index dbe1dff..8e46ef9 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangStubMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangStubMapper.java
@@ -3,9 +3,9 @@ package de.ozgcloud.apilib.vorgang.grpc;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
@Mapper(uses = OzgCloudVorgangIdMapper.class)
public interface OzgCloudVorgangStubMapper {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandResponseTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandResponseTestFactory.java
index 7effb0c..c7ac827 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandResponseTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandResponseTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.common.command.grpc;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
public class GrpcCommandResponseTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandTestFactory.java
index 9d9e01c..8f34549 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.common.command.grpc;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
public class GrpcCommandTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCreateCommandRequestTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCreateCommandRequestTestFactory.java
index b187ee7..40e627f 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCreateCommandRequestTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCreateCommandRequestTestFactory.java
@@ -2,10 +2,10 @@ package de.ozgcloud.apilib.common.command.grpc;
import static de.ozgcloud.apilib.common.command.grpc.OzgCloudCommandTestFactory.*;
-import de.itvsh.ozg.pluto.common.GrpcObject;
-import de.itvsh.ozg.pluto.common.GrpcProperty;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.vorgang.common.GrpcObject;
+import de.ozgcloud.vorgang.common.GrpcProperty;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
public class GrpcCreateCommandRequestTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java
index f032df3..2522f4d 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java
@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -13,10 +12,10 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
class GrpcOzgCloudCommandServiceTest {
@@ -127,7 +126,7 @@ class GrpcOzgCloudCommandServiceTest {
void shouldThrowException() {
var command = OzgCloudCommandTestFactory.createBuilder().status(OzgCloudCommandStatus.ERROR).build();
- assertThrows(TechnicalException.class, () -> service.verifyCommand(command));
+ assertThrows(TechnicalException.class, () -> service.verifyCommand(command));
}
}
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcFindFilesResponseTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcFindFilesResponseTestFactory.java
index d64013a..82a0bd5 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcFindFilesResponseTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcFindFilesResponseTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.file.grpc;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
public class GrpcFindFilesResponseTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java
index 84d7d60..7886016 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java
@@ -12,10 +12,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
class GrpcOzgCloudFileServiceTest {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgFileTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgFileTestFactory.java
index c7f9179..39790a4 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgFileTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgFileTestFactory.java
@@ -1,7 +1,7 @@
package de.ozgcloud.apilib.file.grpc;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
public class GrpcOzgFileTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcAntragstellerTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcAntragstellerTestFactory.java
index 12f7860..41e6230 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcAntragstellerTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcAntragstellerTestFactory.java
@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
import static de.ozgcloud.apilib.vorgang.OzgCloudAntragstellerTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcAntragsteller;
+import de.ozgcloud.vorgang.vorgang.GrpcAntragsteller;
public class GrpcAntragstellerTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangHeaderTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangHeaderTestFactory.java
index 50c6c63..a49b3b0 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangHeaderTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangHeaderTestFactory.java
@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
import static de.ozgcloud.apilib.vorgang.OzgCloudEingangHeaderTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcEingangHeader;
public class GrpcEingangHeaderTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangTestFactory.java
index f98076b..46ec136 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangTestFactory.java
@@ -2,10 +2,10 @@ package de.ozgcloud.apilib.vorgang.grpc;
import static de.ozgcloud.apilib.vorgang.OzgCloudVorgangEingangTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
-import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
public class GrpcEingangTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangWithEingangResponseTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangWithEingangResponseTestFactory.java
index 21beecc..53a707e 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangWithEingangResponseTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangWithEingangResponseTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.vorgang.grpc;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangResponse;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangResponse;
public class GrpcFindVorgangWithEingangResponseTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangServiceTest.java
index 905f273..e93e6d5 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangServiceTest.java
@@ -12,14 +12,14 @@ import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangResponse;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
-import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStubTestFactory;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
import de.ozgcloud.apilib.vorgang.Page;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangResponse;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
+import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
class GrpcOzgCloudVorgangServiceTest {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcServiceKontoTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcServiceKontoTestFactory.java
index 9d62988..0ef9d48 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcServiceKontoTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcServiceKontoTestFactory.java
@@ -1,9 +1,9 @@
package de.ozgcloud.apilib.vorgang.grpc;
-import de.itvsh.ozg.pluto.common.GrpcObject;
-import de.itvsh.ozg.pluto.common.GrpcProperty;
-import de.itvsh.ozg.pluto.vorgang.GrpcPostfachAddress;
-import de.itvsh.ozg.pluto.vorgang.GrpcServiceKonto;
+import de.ozgcloud.vorgang.common.GrpcObject;
+import de.ozgcloud.vorgang.common.GrpcProperty;
+import de.ozgcloud.vorgang.vorgang.GrpcPostfachAddress;
+import de.ozgcloud.vorgang.vorgang.GrpcServiceKonto;
public class GrpcServiceKontoTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeadTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeadTestFactory.java
index 39f0677..f9df0f1 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeadTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeadTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.vorgang.grpc;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHead;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHead;
public class GrpcVorgangHeadTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeaderTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeaderTestFactory.java
index f59cdfc..18ba7a2 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeaderTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangHeaderTestFactory.java
@@ -3,7 +3,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
import static de.ozgcloud.apilib.vorgang.OzgCloudVorgangHeaderTestFactory.*;
import static de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
public class GrpcVorgangHeaderTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangWithEingangTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangWithEingangTestFactory.java
index 07233fa..2a15161 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangWithEingangTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcVorgangWithEingangTestFactory.java
@@ -3,7 +3,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
import static de.ozgcloud.apilib.vorgang.OzgCloudVorgangHeaderTestFactory.*;
import static de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
public class GrpcVorgangWithEingangTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcZustaendigeStelleTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcZustaendigeStelleTestFactory.java
index 5bc53e0..6d26419 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcZustaendigeStelleTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcZustaendigeStelleTestFactory.java
@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
import static de.ozgcloud.apilib.vorgang.OzgCloudZustaendigeStelleTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
+import de.ozgcloud.vorgang.vorgang.GrpcZustaendigeStelle;
public class GrpcZustaendigeStelleTestFactory {
diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
index de90768..72c9378 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
@@ -12,8 +12,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
-import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.apilib.alfa.AlfaService;
import de.ozgcloud.apilib.alfa.CommandAlfaService;
import de.ozgcloud.apilib.alfa.dummy.DummyAlfaService;
@@ -31,6 +29,8 @@ import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
import net.devh.boot.grpc.client.config.GrpcChannelProperties;
import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
@@ -56,10 +56,10 @@ public class OzgCloudClientAutoConfiguration {
@Autowired
private OzgCloudCommandManagerProperties commandManagerProperties;
- // @Bean
- // @ConditionalOnProperty("ozgcloud.vorgang-manager.address")
+ // @Bean
+ // @ConditionalOnProperty("ozgcloud.vorgang-manager.address")
GrpcChannelsProperties channelProperties(GrpcChannelsProperties properties) {
- // var properties = new GrpcChannelsProperties();
+ // var properties = new GrpcChannelsProperties();
var clientMap = properties.getClient();
addVorgangManager(clientMap);
@@ -111,8 +111,8 @@ public class OzgCloudClientAutoConfiguration {
@Bean("ozgCloudVorgangService")
@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub,
- OzgCloudVorgangMapper mapper,
- OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
+ OzgCloudVorgangMapper mapper,
+ OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
}
@@ -141,9 +141,9 @@ public class OzgCloudClientAutoConfiguration {
@Bean
@ConditionalOnProperty("ozgcloud.command-manager.address")
OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
- CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
+ CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
- GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
+ GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
}
@Bean
--
GitLab