From 882b7ad31192529a2346af4931cb8473ba3c4839 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Oct 2023 16:41:21 +0200
Subject: [PATCH] fix tests

---
 .../apilib/file/grpc/GrpcOzgCloudFileService.java         | 3 +--
 .../apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java   | 5 ++---
 .../apilib/file/grpc/GrpcOzgCloudFileServiceTest.java     | 8 ++++----
 .../apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java    | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

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 b74ca3d..e9830c3 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
@@ -7,7 +7,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 
-import org.mapstruct.factory.Mappers;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
@@ -38,7 +37,7 @@ public class GrpcOzgCloudFileService implements OzgCloudFileService {
 	@GrpcClient("file-manager")
 	private final BinaryFileServiceStub asyncServiceStub;
 
-	private final OzgCloudFileMapper mapper = Mappers.getMapper(OzgCloudFileMapper.class);
+	private final OzgCloudFileMapper mapper;
 
 	static final int CHUNK_SIZE = 255 * 1024;
 
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 2494c42..c33b8be 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,7 +2,6 @@ package de.ozgcloud.apilib.vorgang.grpc;
 
 import java.util.List;
 
-import org.mapstruct.factory.Mappers;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
@@ -28,8 +27,8 @@ public class GrpcOzgCloudVorgangService implements OzgCloudVorgangService {
 	@GrpcClient("vorgang-manager")
 	private final VorgangServiceBlockingStub vorgangServiceStub;
 
-	private OzgCloudVorgangMapper mapper = Mappers.getMapper(OzgCloudVorgangMapper.class);
-	private OzgCloudVorgangStubMapper stubMapper = Mappers.getMapper(OzgCloudVorgangStubMapper.class);
+	private final OzgCloudVorgangMapper mapper;
+	private final OzgCloudVorgangStubMapper stubMapper;
 
 	@Override
 	public OzgCloudVorgang getById(@NonNull OzgCloudVorgangId vorgangId) {
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 6830298..ff27abc 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
@@ -32,10 +32,10 @@ class GrpcOzgCloudFileServiceTest {
 
 		@Nested
 		class CallGetFile {
-		@BeforeEach
-		void init() {
-			when(blockingStub.findBinaryFilesMetaData(any())).thenReturn(GrpcFindFilesResponse.newBuilder().addFile(GrpcOzgFileTestFactory.create()).build());
-		}
+			@BeforeEach
+			void init() {
+				when(blockingStub.findBinaryFilesMetaData(any())).thenReturn(GrpcFindFilesResponse.newBuilder().addFile(GrpcOzgFileTestFactory.create()).build());
+			}
 
 			@Test
 			void shouldCallStub() {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
index 968338f..ff22489 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
@@ -44,7 +44,7 @@ class OzgCloudVorgangMapperTest {
 			var mapped = mapper.fromGrpc(GrpcVorgangWithEingangTestFactory.create());
 
 			assertThat(mapped.getEingangs()).hasSize(1).first()
-					.usingRecursiveComparison()
+					.usingRecursiveComparison().ignoringFields("attachments")
 					.isEqualTo(OzgCloudVorgangEingangTestFactory.create());
 		}
 	}
-- 
GitLab