From 2198ca1623498698ee41e3aff4debb8ad58623ab Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 5 Dec 2023 13:30:20 +0100
Subject: [PATCH] OZG-4589 rename used librarys
---
api-lib-core/pom.xml | 14 +--
...gCloudCallContextAttachingInterceptor.java | 2 +-
.../common/command/OzgCloudCommand.java | 2 +-
.../common/command/OzgCloudCommandId.java | 2 +-
.../common/command/OzgCloudCommandStatus.java | 2 +-
.../common/command/grpc/CommandMapper.java | 2 +-
.../grpc/GrpcOzgCloudCommandService.java | 2 +-
.../command/grpc/OzgCloudCommandMapper.java | 7 +-
.../apilib/common/datatypes/GenericId.java | 2 +-
.../errorhandling/NotFoundException.java | 2 +-
.../ozgcloud/apilib/file/OzgCloudFileId.java | 2 +-
.../file/dummy/DummyOzgCloudFileService.java | 2 +-
.../file/grpc/GrpcOzgCloudFileService.java | 4 +-
.../OzgCloudFileDownloadStreamObserver.java | 2 +-
.../user/GrpcOzgCloudUserProfileService.java | 37 ++++---
.../ozgcloud/apilib/user/OzgCloudUserId.java | 2 +-
.../apilib/user/UserProfileMapper.java | 15 ++-
.../vorgang/OzgCloudServiceKontoType.java | 2 +-
.../apilib/vorgang/OzgCloudVorgangId.java | 2 +-
.../apilib/vorgang/OzgCloudVorgangStatus.java | 2 +-
.../grpc/GrpcOzgCloudCommandServiceTest.java | 2 +-
.../grpc/OzgCloudCommandTestFactory.java | 2 +-
...GrpcGetUserProfileResponseTestFactory.java | 19 ++--
.../GrpcOzgCloudUserProfileServiceTest.java | 96 +++++++------------
.../user/GrpcUserProfileTestFactory.java | 25 ++---
.../GrpcChannelConfigurator.java | 2 +
.../OzgCloudClientAutoConfiguration.java | 37 ++++---
.../OzgCloudUserManagerProperties.java | 8 +-
pom.xml | 6 +-
29 files changed, 137 insertions(+), 167 deletions(-)
diff --git a/api-lib-core/pom.xml b/api-lib-core/pom.xml
index d523d8d..0987833 100644
--- a/api-lib-core/pom.xml
+++ b/api-lib-core/pom.xml
@@ -22,8 +22,8 @@
<dependencies>
<!--ozg cloud project -->
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-lib</artifactId>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-lib</artifactId>
</dependency>
<dependency>
@@ -42,11 +42,11 @@
<version>${vorgang-manager.version}</version>
</dependency>
- <dependency>
- <groupId>de.ozgcloud.user</groupId>
- <artifactId>user-manager-interface</artifactId>
- <version>${user-manager.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>de.ozgcloud.user</groupId>-->
+<!-- <artifactId>user-manager-interface</artifactId>-->
+<!-- <version>${user-manager.version}</version>-->
+<!-- </dependency>-->
<!--spring -->
<dependency>
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/callcontext/OzgCloudCallContextAttachingInterceptor.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/callcontext/OzgCloudCallContextAttachingInterceptor.java
index b46e926..99804f0 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/callcontext/OzgCloudCallContextAttachingInterceptor.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/callcontext/OzgCloudCallContextAttachingInterceptor.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.common.callcontext;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.Optional;
import java.util.UUID;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommand.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommand.java
index 367bd31..1c1fcc9 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommand.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommand.java
@@ -3,9 +3,9 @@ package de.ozgcloud.apilib.common.command;
import java.time.ZonedDateTime;
import java.util.Map;
-import de.itvsh.kop.common.datatype.StringBasedValue;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
+import de.ozgcloud.common.datatype.StringBasedValue;
import lombok.Builder;
import lombok.Getter;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandId.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandId.java
index 333a50b..7d4f0b2 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandId.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandId.java
@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.common.command;
import org.mapstruct.ObjectFactory;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudCommandId extends StringBasedValue {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandStatus.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandStatus.java
index 181039b..116ad2f 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandStatus.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/OzgCloudCommandStatus.java
@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.common.command;
import java.util.Set;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
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 83280f7..7dba4d3 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
@@ -4,13 +4,13 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Named;
-import de.itvsh.kop.common.datatype.StringBasedValue;
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.common.datatype.StringBasedValue;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
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 5b09405..99d49ba 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,12 +1,12 @@
package de.ozgcloud.apilib.common.command.grpc;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
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.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
import lombok.RequiredArgsConstructor;
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 d97671e..1842021 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
@@ -6,8 +6,9 @@ import java.util.Optional;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.kop.common.datatype.StringBasedValue;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
+import de.ozgcloud.common.datatype.StringBasedValue;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
@@ -43,4 +44,8 @@ public interface OzgCloudCommandMapper {
default String toString(StringBasedValue stringBasedValue) {
return Optional.ofNullable(stringBasedValue).map(Objects::toString).orElse(null);
}
+
+ default String map(OzgCloudVorgangId value) {
+ return Optional.ofNullable(value).map(Objects::toString).orElse(null);
+ }
}
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/datatypes/GenericId.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/datatypes/GenericId.java
index 4e5107a..58f8247 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/datatypes/GenericId.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/datatypes/GenericId.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.common.datatypes;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class GenericId extends StringBasedValue {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/errorhandling/NotFoundException.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/errorhandling/NotFoundException.java
index a9ab13c..3f976ef 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/common/errorhandling/NotFoundException.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/common/errorhandling/NotFoundException.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.common.errorhandling;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class NotFoundException extends RuntimeException {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/OzgCloudFileId.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/OzgCloudFileId.java
index d0f0d5b..2f6a826 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/OzgCloudFileId.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/OzgCloudFileId.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.file;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudFileId extends StringBasedValue {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/dummy/DummyOzgCloudFileService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/dummy/DummyOzgCloudFileService.java
index 2e61739..367db8f 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/dummy/DummyOzgCloudFileService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/dummy/DummyOzgCloudFileService.java
@@ -6,10 +6,10 @@ import java.io.OutputStream;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.apilib.file.OzgCloudFileId;
import de.ozgcloud.apilib.file.OzgCloudFileService;
+import de.ozgcloud.common.errorhandling.TechnicalException;
@Service
@ConditionalOnMissingBean(OzgCloudFileService.class)
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 b674f33..139931e 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
@@ -10,14 +10,14 @@ import java.util.logging.Level;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.binaryfile.FileId;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
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.common.binaryfile.FileId;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest;
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 fb61d1d..cb8ca46 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
@@ -4,7 +4,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.concurrent.CompletableFuture;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
import io.grpc.stub.StreamObserver;
import lombok.AccessLevel;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileService.java
index 549ac07..e5ea311 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileService.java
@@ -1,26 +1,23 @@
package de.ozgcloud.apilib.user;
-import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
-import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
-public class GrpcOzgCloudUserProfileService implements OzgCloudUserProfileService {
-
- private final UserProfileServiceBlockingStub serviceStub;
-
- private final UserProfileMapper mapper;
-
- @Override
- public OzgCloudUserProfile getById(OzgCloudUserId userId) {
- var grpcUserProfileResponse = serviceStub.getById(buildGetUserRequest(userId));
-
- return mapper.mapFromGrpc(grpcUserProfileResponse.getUserProfile());
- }
-
- private GrpcGetUserProfileRequest buildGetUserRequest(OzgCloudUserId id) {
- return GrpcGetUserProfileRequest.newBuilder()
- .setUserId(id.toString())
- .build();
- }
+public class GrpcOzgCloudUserProfileService {
+//implements OzgCloudUserProfileService {
+ /*
+ * @GrpcClient("user-manager") private final UserProfileServiceBlockingStub
+ * serviceStub;
+ *
+ * private final UserProfileMapper mapper;
+ *
+ * @Override public OzgCloudUserProfile getById(OzgCloudUserId userId) { var
+ * grpcUserProfileResponse = serviceStub.getById(buildGetUserRequest(userId));
+ *
+ * return mapper.mapFromGrpc(grpcUserProfileResponse.getUserProfile()); }
+ *
+ * private GrpcGetUserProfileRequest buildGetUserRequest(OzgCloudUserId id) {
+ * return GrpcGetUserProfileRequest.newBuilder() .setUserId(id.toString())
+ * .build(); }
+ */
}
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/user/OzgCloudUserId.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/user/OzgCloudUserId.java
index 8c89abf..e068e73 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/user/OzgCloudUserId.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/user/OzgCloudUserId.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.user;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudUserId extends StringBasedValue {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/user/UserProfileMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/user/UserProfileMapper.java
index 5ae1f4e..bc9b7b0 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/user/UserProfileMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/user/UserProfileMapper.java
@@ -2,15 +2,12 @@ package de.ozgcloud.apilib.user;
import org.mapstruct.Mapper;
-import de.ozgcloud.user.userprofile.GrpcUserProfile;
-import lombok.NonNull;
-
@Mapper
public interface UserProfileMapper {
-
- OzgCloudUserProfile mapFromGrpc(GrpcUserProfile userProfile);
-
- default OzgCloudUserId toOzgCloudUserId(@NonNull String id) {
- return OzgCloudUserId.from(id);
- }
+ /*
+ * OzgCloudUserProfile mapFromGrpc(GrpcUserProfile userProfile);
+ *
+ * default OzgCloudUserId toOzgCloudUserId(@NonNull String id) { return
+ * OzgCloudUserId.from(id); }
+ */
}
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudServiceKontoType.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudServiceKontoType.java
index a477cb4..f6ba3c4 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudServiceKontoType.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudServiceKontoType.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.vorgang;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudServiceKontoType extends StringBasedValue {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangId.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangId.java
index 1e969b0..6ec1f09 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangId.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangId.java
@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.vorgang;
import org.mapstruct.ObjectFactory;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudVorgangId extends StringBasedValue {
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangStatus.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangStatus.java
index 2a3080d..c7a4ffd 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangStatus.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangStatus.java
@@ -1,6 +1,6 @@
package de.ozgcloud.apilib.vorgang;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudVorgangStatus extends StringBasedValue {
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 2522f4d..3bd0589 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
@@ -11,10 +11,10 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
class GrpcOzgCloudCommandServiceTest {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandTestFactory.java
index fdc28f8..716f429 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandTestFactory.java
@@ -4,13 +4,13 @@ import java.time.ZonedDateTime;
import java.util.Map;
import java.util.UUID;
-import de.itvsh.kop.common.datatype.StringBasedValue;
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.file.OzgCloudFileTestFactory;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class OzgCloudCommandTestFactory {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcGetUserProfileResponseTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcGetUserProfileResponseTestFactory.java
index 3c9ec6e..829e0ff 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcGetUserProfileResponseTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcGetUserProfileResponseTestFactory.java
@@ -1,15 +1,12 @@
package de.ozgcloud.apilib.user;
-import de.ozgcloud.user.userprofile.GrpcGetUserProfileResponse;
-
public class GrpcGetUserProfileResponseTestFactory {
-
- public static GrpcGetUserProfileResponse create() {
- return createBuilder().build();
- }
-
- public static GrpcGetUserProfileResponse.Builder createBuilder() {
- return GrpcGetUserProfileResponse.newBuilder()
- .setUserProfile(GrpcUserProfileTestFactory.create());
- }
+ /*
+ * public static GrpcGetUserProfileResponse create() { return
+ * createBuilder().build(); }
+ *
+ * public static GrpcGetUserProfileResponse.Builder createBuilder() { return
+ * GrpcGetUserProfileResponse.newBuilder()
+ * .setUserProfile(GrpcUserProfileTestFactory.create()); }
+ */
}
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileServiceTest.java
index 0e15fa0..5bf4b1e 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileServiceTest.java
@@ -1,64 +1,40 @@
package de.ozgcloud.apilib.user;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-
-import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
-import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest;
-
class GrpcOzgCloudUserProfileServiceTest {
-
- @InjectMocks
- private GrpcOzgCloudUserProfileService service;
-
- @Mock
- private UserProfileServiceBlockingStub userProfileServiceStub;
- @Mock
- private UserProfileMapper mapper;
-
- @Nested
- class TestGetById {
- @Captor
- private ArgumentCaptor<GrpcGetUserProfileRequest> requestCaptor;
-
- private OzgCloudUserProfile mappedUserProfile = OzgCloudUserProfileTestFactory.create();
-
- @BeforeEach
- void init() {
- when(userProfileServiceStub.getById(any())).thenReturn(GrpcGetUserProfileResponseTestFactory.create());
- when(mapper.mapFromGrpc(any())).thenReturn(mappedUserProfile);
- }
-
- @Test
- void shouldCallStub() {
- service.getById(OzgCloudUserProfileTestFactory.ID);
-
- verify(userProfileServiceStub).getById(requestCaptor.capture());
- assertThat(requestCaptor.getValue().getUserId()).isEqualTo(OzgCloudUserProfileTestFactory.ID.toString());
- }
-
- @Test
- void shouldCallMapper() {
- service.getById(OzgCloudUserProfileTestFactory.ID);
-
- verify(mapper).mapFromGrpc(any());
- }
-
- @Test
- void shouldReturnResult() {
- var result = service.getById(OzgCloudUserProfileTestFactory.ID);
-
- assertThat(result).isSameAs(mappedUserProfile);
- }
- }
-
+ /*
+ * @InjectMocks private GrpcOzgCloudUserProfileService service;
+ *
+ * @Mock private UserProfileServiceBlockingStub userProfileServiceStub;
+ *
+ * @Mock private UserProfileMapper mapper;
+ *
+ * @Nested class TestGetById {
+ *
+ * @Captor private ArgumentCaptor<GrpcGetUserProfileRequest> requestCaptor;
+ *
+ * private OzgCloudUserProfile mappedUserProfile =
+ * OzgCloudUserProfileTestFactory.create();
+ *
+ * @BeforeEach void init() {
+ * when(userProfileServiceStub.getById(any())).thenReturn(
+ * GrpcGetUserProfileResponseTestFactory.create());
+ * when(mapper.mapFromGrpc(any())).thenReturn(mappedUserProfile); }
+ *
+ * @Test void shouldCallStub() {
+ * service.getById(OzgCloudUserProfileTestFactory.ID);
+ *
+ * verify(userProfileServiceStub).getById(requestCaptor.capture());
+ * assertThat(requestCaptor.getValue().getUserId()).isEqualTo(
+ * OzgCloudUserProfileTestFactory.ID.toString()); }
+ *
+ * @Test void shouldCallMapper() {
+ * service.getById(OzgCloudUserProfileTestFactory.ID);
+ *
+ * verify(mapper).mapFromGrpc(any()); }
+ *
+ * @Test void shouldReturnResult() { var result =
+ * service.getById(OzgCloudUserProfileTestFactory.ID);
+ *
+ * assertThat(result).isSameAs(mappedUserProfile); } }
+ */
}
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcUserProfileTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcUserProfileTestFactory.java
index b34ec0e..f7ab6cd 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcUserProfileTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/user/GrpcUserProfileTestFactory.java
@@ -1,20 +1,13 @@
package de.ozgcloud.apilib.user;
-import static de.ozgcloud.apilib.user.OzgCloudUserProfileTestFactory.*;
-
-import de.ozgcloud.user.userprofile.GrpcUserProfile;
-
public class GrpcUserProfileTestFactory {
-
- public static GrpcUserProfile create() {
- return createBuilder().build();
- }
-
- public static GrpcUserProfile.Builder createBuilder() {
- return GrpcUserProfile.newBuilder()
- .setId(ID.toString())
- .setFirstName(FIRST_NAME)
- .setLastName(LAST_NAME);
-
- }
+ /*
+ * public static GrpcUserProfile create() { return createBuilder().build(); }
+ *
+ * public static GrpcUserProfile.Builder createBuilder() { return
+ * GrpcUserProfile.newBuilder() .setId(ID.toString()) .setFirstName(FIRST_NAME)
+ * .setLastName(LAST_NAME);
+ *
+ * }
+ */
}
diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/GrpcChannelConfigurator.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/GrpcChannelConfigurator.java
index 1329b10..7ab9bee 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/GrpcChannelConfigurator.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/GrpcChannelConfigurator.java
@@ -2,10 +2,12 @@ package de.ozgcloud.client.autoconfigure;
import lombok.Builder;
import lombok.Getter;
+import lombok.ToString;
import net.devh.boot.grpc.client.config.GrpcChannelProperties;
import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
import net.devh.boot.grpc.client.config.NegotiationType;
+@ToString
@Builder
@Getter
public class GrpcChannelConfigurator {
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 9fe9f41..2da75f7 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
@@ -24,8 +24,6 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
-import de.ozgcloud.apilib.user.GrpcOzgCloudUserProfileService;
-import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
import de.ozgcloud.apilib.user.UserProfileMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
@@ -33,7 +31,6 @@ 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.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
@@ -52,8 +49,8 @@ public class OzgCloudClientAutoConfiguration {
private static final String CLIENT_NAME_VORGANG_MANAGER = "vorgang-manager";
private static final String CLIENT_NAME_FILE_MANAGER = "file-manager";
- private static final String CLIENT_NAME_COMMAND_MANAGER = "command-manager";
- private static final String CLIENT_NAME_USER_MANAGER = "user-manager";
+ private static final String CLIENT_NAME_COMMAND_MANAGER = "ozgcloud-command-manager";
+ private static final String CLIENT_NAME_USER_MANAGER = "ozgcloud-user-manager";
@Autowired
private OzgCloudVorgangManagerProperties vorgangManagerProperties;
@@ -87,6 +84,8 @@ public class OzgCloudClientAutoConfiguration {
.build();
}
+ @Bean
+ @ConditionalOnProperty("ozgcloud.user-manager.address")
GrpcChannelConfigurator userManagerConfigurator() {
return GrpcChannelConfigurator.builder()
.clientName(CLIENT_NAME_USER_MANAGER)
@@ -103,14 +102,6 @@ public class OzgCloudClientAutoConfiguration {
return properties;
}
- private void addUserManager(Map<String, GrpcChannelProperties> clientMap) {
- var channelProps = new GrpcChannelProperties();
- channelProps.setAddress(userManagerProperties.getAddress());
- channelProps.setNegotiationType(userManagerProperties.getNegotiationType());
-
- clientMap.put(CLIENT_NAME_USER_MANAGER, channelProps);
- }
-
private void addVorgangManager(Map<String, GrpcChannelProperties> clientMap) {
var channelProps = new GrpcChannelProperties();
channelProps.setAddress(vorgangManagerProperties.getAddress());
@@ -171,9 +162,14 @@ public class OzgCloudClientAutoConfiguration {
return Mappers.getMapper(OzgCloudVorgangIdMapper.class);
}
+ @Bean
+ UserProfileMapper ozgCloudUserProfileMapper() {
+ return Mappers.getMapper(UserProfileMapper.class);
+ }
+
@Bean
@ConditionalOnProperty("ozgcloud.command-manager.address")
- OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
+ OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("ozgcloud-command-manager") CommandServiceBlockingStub commandServiceStub,
CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
@@ -197,10 +193,11 @@ public class OzgCloudClientAutoConfiguration {
return new DummyAlfaService();
}
- @Bean
- @ConditionalOnProperty("ozgcloud.user-manager.address")
- OzgCloudUserProfileService grpcOzgCloudUserProfileService(@GrpcClient("user-manager") UserProfileServiceBlockingStub grpcStub,
- UserProfileMapper mapper) {
- return new GrpcOzgCloudUserProfileService(grpcStub, mapper);
- }
+// @Bean
+// @ConditionalOnProperty("ozgcloud.user-manager.address")
+// OzgCloudUserProfileService grpcOzgCloudUserProfileService(@GrpcClient("ozgcloud-user-manager") UserProfileServiceBlockingStub grpcStub,
+// UserProfileMapper mapper) {
+// System.out.println("#### building UM-ProfileService");
+// return new GrpcOzgCloudUserProfileService(grpcStub, mapper);
+// }
}
diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudUserManagerProperties.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudUserManagerProperties.java
index 0686b02..6ea995b 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudUserManagerProperties.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudUserManagerProperties.java
@@ -1,21 +1,27 @@
package de.ozgcloud.client.autoconfigure;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.annotation.Validated;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
import net.devh.boot.grpc.client.config.NegotiationType;
+@ToString
@Getter
@Setter
@Configuration
-@ConfigurationProperties("ozgcloud.vorgang-manager")
+@ConfigurationProperties("ozgcloud.user-manager")
+@Validated
public class OzgCloudUserManagerProperties {
/**
* Network-Address of the User-Manager instance, starting with resolving
* protocoll.
*/
+ @NotBlank
private String address;
/**
* Negotiation Type for the gRPC connection - possible Values: PLAINTEXT, TLS
diff --git a/pom.xml b/pom.xml
index f62ede3..2f15306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
--
GitLab