From b2c34d72c1b5e3e593b10f47ffbc0ccc66f44b0d Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 14 Oct 2024 09:13:04 +0200 Subject: [PATCH] OZG-6842 Apply code review comments --- .../apilib/vorgang/OzgCloudVorgangQuery.java | 1 - .../FormIdentificationTestFactory.java | 10 +--------- .../GrpcFindVorgangRequestTestFactory.java | 7 ++++--- .../GrpcFindVorgangResponseTestFactory.java | 2 +- .../grpc/GrpcOzgCloudVorgangServiceTest.java | 20 +++++++++---------- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangQuery.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangQuery.java index 228c17a..f4c5552 100644 --- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangQuery.java +++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangQuery.java @@ -31,7 +31,6 @@ public class OzgCloudVorgangQuery { private final Query nestedQuery; } - @Builder public static record FormIdentification(String formId, String formEngineName) { } diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/FormIdentificationTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/FormIdentificationTestFactory.java index f5142a3..be99e60 100644 --- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/FormIdentificationTestFactory.java +++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/FormIdentificationTestFactory.java @@ -5,7 +5,6 @@ import java.util.UUID; import com.thedeanda.lorem.LoremIpsum; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery.FormIdentification; -import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery.FormIdentification.FormIdentificationBuilder; public class FormIdentificationTestFactory { @@ -13,14 +12,7 @@ public class FormIdentificationTestFactory { public static final String FORM_ID = UUID.randomUUID().toString(); public static FormIdentification create() { - return createBuilder() - .build(); - } - - public static FormIdentificationBuilder createBuilder() { - return FormIdentification.builder() - .formId(FORM_ID) - .formEngineName(FORM_ENGINE_NAME); + return new FormIdentification(FORM_ID, FORM_ENGINE_NAME); } } diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangRequestTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangRequestTestFactory.java index 3fdca50..eafaa75 100644 --- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangRequestTestFactory.java +++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangRequestTestFactory.java @@ -7,9 +7,10 @@ import de.ozgcloud.vorgang.vorgang.GrpcQuery; public class GrpcFindVorgangRequestTestFactory { + private static final GrpcOrderBy ORDER_BY = GrpcOrderBy.CREATED_AT_DESC; public static final GrpcQuery QUERY = GrpcQueryTestFactory.create(); - public static final int LIMIT = (int) (Math.random() * 100); - public static final int OFFSET = (int) (Math.random() * LIMIT); + public static final int LIMIT = 10; + public static final int OFFSET = 12; public static GrpcFindVorgangRequest create() { return createBuilder() @@ -21,7 +22,7 @@ public class GrpcFindVorgangRequestTestFactory { .setLimit(LIMIT) .setOffset(OFFSET) .setQuery(QUERY) - .setOrderBy(GrpcOrderBy.CREATED_AT_DESC); + .setOrderBy(ORDER_BY); } } diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangResponseTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangResponseTestFactory.java index 9bd3be8..92112f9 100644 --- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangResponseTestFactory.java +++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcFindVorgangResponseTestFactory.java @@ -7,7 +7,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader; public class GrpcFindVorgangResponseTestFactory { public static final GrpcVorgangHeader VORGANG_HEADER = GrpcVorgangHeaderTestFactory.create(); - public static final long TOTAL = (long) (Math.random() * 100); + public static final long TOTAL = 1; public static GrpcFindVorgangResponse create() { return createBuilder().build(); 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 f0c1f15..6d6d5d4 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 @@ -179,29 +179,29 @@ class GrpcOzgCloudVorgangServiceTest { } @Test - void shouldGetVorgangServiceStub() { - callService(); + void shouldCallGetVorgangServiceStub() { + callFind(); verify(service).getVorgangServiceStub(); } @Test void shouldBuildFindRequest() { - callService(); + callFind(); verify(service).buildFindRequest(query, PAGE); } @Test void shouldFindVorgang() { - callService(); + callFind(); verify(stubWithInterceptor).findVorgang(request); } @Test void shouldMapResponse() { - callService(); + callFind(); verify(stubMapper).fromGrpc(GrpcFindVorgangResponseTestFactory.VORGANG_HEADER); } @@ -211,12 +211,12 @@ class GrpcOzgCloudVorgangServiceTest { var mappedVorgangStub = OzgCloudVorgangStubTestFactory.create(); when(stubMapper.fromGrpc(GrpcFindVorgangResponseTestFactory.VORGANG_HEADER)).thenReturn(mappedVorgangStub); - var vorgangStubs = callService(); + var vorgangStubs = callFind(); assertThat(vorgangStubs).containsExactly(mappedVorgangStub); } - private List<OzgCloudVorgangStub> callService() { + private List<OzgCloudVorgangStub> callFind() { return service.find(query, PAGE); } } @@ -238,19 +238,19 @@ class GrpcOzgCloudVorgangServiceTest { @Test void shouldMapToGrpcQuery() { - callService(); + callBuildFindRequest(); verify(queryMapper).toGrpc(ozgCloudVorgangQuery); } @Test void shouldReturnRequest() { - var request = callService(); + var request = callBuildFindRequest(); assertThat(request).usingRecursiveComparison().isEqualTo(GrpcFindVorgangRequestTestFactory.create()); } - private GrpcFindVorgangRequest callService() { + private GrpcFindVorgangRequest callBuildFindRequest() { return service.buildFindRequest(ozgCloudVorgangQuery, page); } } -- GitLab