From a571bdd848e74febc8cb03871cbc19b750bf2acf Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 6 Nov 2024 17:14:06 +0100
Subject: [PATCH] OZG-6990 implement comments from code review

---
 .../OzgCloudAccessPermission.java             |  2 +-
 .../OzgCloudBooleanClientAttribute.java       |  2 +-
 .../OzgCloudClientAttribute.java              |  2 +-
 .../OzgCloudClientAttributeService.java}      |  4 +--
 .../OzgCloudDoubleClientAttribute.java        |  2 +-
 .../OzgCloudLongClientAttribute.java          |  2 +-
 .../OzgCloudStringClientAttribute.java        |  2 +-
 .../OzgCloudClientAttributeGrpcService.java}  | 14 +++++-----
 .../grpc/OzgCloudClientAttributeMapper.java   | 10 +++----
 .../GrpcClientAttributeTestFactory.java       |  2 +-
 .../OzgCloudClientAttributeTestFactory.java   | 18 ++++++------
 ...gCloudClientAttributeGrpcServiceTest.java} | 28 +++++++++----------
 .../OzgCloudClientAttributeMapperTest.java    |  6 ++--
 13 files changed, 47 insertions(+), 47 deletions(-)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudAccessPermission.java (95%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudBooleanClientAttribute.java (96%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudClientAttribute.java (96%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes/OzgCloudAttributesService.java => client_attribute/OzgCloudClientAttributeService.java} (93%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudDoubleClientAttribute.java (96%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudLongClientAttribute.java (96%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudStringClientAttribute.java (96%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes/grpc/GrpcOzgCloudAttributesService.java => client_attribute/grpc/OzgCloudClientAttributeGrpcService.java} (85%)
 rename api-lib-core/src/main/java/de/ozgcloud/apilib/{attributes => client_attribute}/grpc/OzgCloudClientAttributeMapper.java (95%)
 rename api-lib-core/src/test/java/de/ozgcloud/apilib/{attributes => client_attribute}/GrpcClientAttributeTestFactory.java (98%)
 rename api-lib-core/src/test/java/de/ozgcloud/apilib/{attributes => client_attribute}/OzgCloudClientAttributeTestFactory.java (76%)
 rename api-lib-core/src/test/java/de/ozgcloud/apilib/{attributes/grpc/GrpcOzgCloudAttributesServiceTest.java => client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java} (90%)
 rename api-lib-core/src/test/java/de/ozgcloud/apilib/{attributes => client_attribute}/grpc/OzgCloudClientAttributeMapperTest.java (91%)

diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudAccessPermission.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudAccessPermission.java
similarity index 95%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudAccessPermission.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudAccessPermission.java
index 1b4b5bf..221b16b 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudAccessPermission.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudAccessPermission.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 public enum OzgCloudAccessPermission {
 	PRIVATE, READ_ONLY, READ_WRITE
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudBooleanClientAttribute.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudBooleanClientAttribute.java
similarity index 96%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudBooleanClientAttribute.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudBooleanClientAttribute.java
index f30f2fd..f56023c 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudBooleanClientAttribute.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudBooleanClientAttribute.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import lombok.experimental.SuperBuilder;
 
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudClientAttribute.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttribute.java
similarity index 96%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudClientAttribute.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttribute.java
index 0c85dc9..db60c3a 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudClientAttribute.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttribute.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudAttributesService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttributeService.java
similarity index 93%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudAttributesService.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttributeService.java
index 6b8c37d..b85b7da 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudAttributesService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttributeService.java
@@ -21,11 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
 
-public interface OzgCloudAttributesService {
+public interface OzgCloudClientAttributeService {
 
 	void setClientAttribute(OzgCloudBooleanClientAttribute clientAttribute, OzgCloudVorgangId vorgangId);
 
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudDoubleClientAttribute.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudDoubleClientAttribute.java
similarity index 96%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudDoubleClientAttribute.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudDoubleClientAttribute.java
index 09a5a72..992021f 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudDoubleClientAttribute.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudDoubleClientAttribute.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import lombok.experimental.SuperBuilder;
 
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudLongClientAttribute.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudLongClientAttribute.java
similarity index 96%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudLongClientAttribute.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudLongClientAttribute.java
index 8111415..bdaff47 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudLongClientAttribute.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudLongClientAttribute.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import lombok.experimental.SuperBuilder;
 
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudStringClientAttribute.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudStringClientAttribute.java
similarity index 96%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudStringClientAttribute.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudStringClientAttribute.java
index 3ceae44..1fa54dd 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/OzgCloudStringClientAttribute.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/OzgCloudStringClientAttribute.java
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import lombok.experimental.SuperBuilder;
 
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/grpc/GrpcOzgCloudAttributesService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java
similarity index 85%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/grpc/GrpcOzgCloudAttributesService.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java
index 2a3b3bc..b99807d 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/grpc/GrpcOzgCloudAttributesService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcService.java
@@ -21,13 +21,13 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes.grpc;
+package de.ozgcloud.apilib.client_attribute.grpc;
 
-import de.ozgcloud.apilib.attributes.OzgCloudAttributesService;
-import de.ozgcloud.apilib.attributes.OzgCloudBooleanClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudDoubleClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudLongClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudStringClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudClientAttributeService;
+import de.ozgcloud.apilib.client_attribute.OzgCloudBooleanClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudDoubleClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudLongClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudStringClientAttribute;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
@@ -37,7 +37,7 @@ import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcSetClientAttributeRequest;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
-public class GrpcOzgCloudAttributesService implements OzgCloudAttributesService {
+public class OzgCloudClientAttributeGrpcService implements OzgCloudClientAttributeService {
 
 	private final ClientAttributeServiceBlockingStub serviceBlockingStub;
 	private final OzgCloudClientAttributeMapper clientAttributeMapper;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/grpc/OzgCloudClientAttributeMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeMapper.java
similarity index 95%
rename from api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/grpc/OzgCloudClientAttributeMapper.java
rename to api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeMapper.java
index 2fb0b7f..7297235 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/attributes/grpc/OzgCloudClientAttributeMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeMapper.java
@@ -21,17 +21,17 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-package de.ozgcloud.apilib.attributes.grpc;
+package de.ozgcloud.apilib.client_attribute.grpc;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 
-import de.ozgcloud.apilib.attributes.OzgCloudBooleanClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudDoubleClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudLongClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudStringClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudBooleanClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudDoubleClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudLongClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudStringClientAttribute;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
 
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/GrpcClientAttributeTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/GrpcClientAttributeTestFactory.java
similarity index 98%
rename from api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/GrpcClientAttributeTestFactory.java
rename to api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/GrpcClientAttributeTestFactory.java
index 4d8fe27..6692210 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/GrpcClientAttributeTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/GrpcClientAttributeTestFactory.java
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/OzgCloudClientAttributeTestFactory.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttributeTestFactory.java
similarity index 76%
rename from api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/OzgCloudClientAttributeTestFactory.java
rename to api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttributeTestFactory.java
index 244bbcd..9b7e435 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/OzgCloudClientAttributeTestFactory.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/OzgCloudClientAttributeTestFactory.java
@@ -22,14 +22,14 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 
-package de.ozgcloud.apilib.attributes;
+package de.ozgcloud.apilib.client_attribute;
 
 import com.thedeanda.lorem.LoremIpsum;
 
-import de.ozgcloud.apilib.attributes.OzgCloudBooleanClientAttribute.OzgCloudBooleanClientAttributeBuilder;
-import de.ozgcloud.apilib.attributes.OzgCloudDoubleClientAttribute.OzgCloudDoubleClientAttributeBuilder;
-import de.ozgcloud.apilib.attributes.OzgCloudLongClientAttribute.OzgCloudLongClientAttributeBuilder;
-import de.ozgcloud.apilib.attributes.OzgCloudStringClientAttribute.OzgCloudStringClientAttributeBuilder;
+import de.ozgcloud.apilib.client_attribute.OzgCloudBooleanClientAttribute.OzgCloudBooleanClientAttributeBuilder;
+import de.ozgcloud.apilib.client_attribute.OzgCloudDoubleClientAttribute.OzgCloudDoubleClientAttributeBuilder;
+import de.ozgcloud.apilib.client_attribute.OzgCloudLongClientAttribute.OzgCloudLongClientAttributeBuilder;
+import de.ozgcloud.apilib.client_attribute.OzgCloudStringClientAttribute.OzgCloudStringClientAttributeBuilder;
 
 public class OzgCloudClientAttributeTestFactory {
 
@@ -45,7 +45,7 @@ public class OzgCloudClientAttributeTestFactory {
 		return createBooleanBuilder().build();
 	}
 
-	public static OzgCloudBooleanClientAttributeBuilder createBooleanBuilder() {
+	public static OzgCloudBooleanClientAttributeBuilder<?, ?> createBooleanBuilder() {
 		return OzgCloudBooleanClientAttribute.builder()
 				.clientName(CLIENT)
 				.attributeName(ATTRIBUTE_NAME)
@@ -57,7 +57,7 @@ public class OzgCloudClientAttributeTestFactory {
 		return createStringBuilder().build();
 	}
 
-	public static OzgCloudStringClientAttributeBuilder createStringBuilder() {
+	public static OzgCloudStringClientAttributeBuilder<?, ?> createStringBuilder() {
 		return OzgCloudStringClientAttribute.builder()
 				.clientName(CLIENT)
 				.attributeName(ATTRIBUTE_NAME)
@@ -69,7 +69,7 @@ public class OzgCloudClientAttributeTestFactory {
 		return createLongBuilder().build();
 	}
 
-	public static OzgCloudLongClientAttributeBuilder createLongBuilder() {
+	public static OzgCloudLongClientAttributeBuilder<?, ?> createLongBuilder() {
 		return OzgCloudLongClientAttribute.builder()
 				.clientName(CLIENT)
 				.attributeName(ATTRIBUTE_NAME)
@@ -81,7 +81,7 @@ public class OzgCloudClientAttributeTestFactory {
 		return createDoubleBuilder().build();
 	}
 
-	public static OzgCloudDoubleClientAttributeBuilder createDoubleBuilder() {
+	public static OzgCloudDoubleClientAttributeBuilder<?, ?> createDoubleBuilder() {
 		return OzgCloudDoubleClientAttribute.builder()
 				.clientName(CLIENT)
 				.attributeName(ATTRIBUTE_NAME)
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/grpc/GrpcOzgCloudAttributesServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java
similarity index 90%
rename from api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/grpc/GrpcOzgCloudAttributesServiceTest.java
rename to api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java
index dbd0a74..039a6ec 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/grpc/GrpcOzgCloudAttributesServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeGrpcServiceTest.java
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 
-package de.ozgcloud.apilib.attributes.grpc;
+package de.ozgcloud.apilib.client_attribute.grpc;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -37,11 +37,11 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import de.ozgcloud.apilib.attributes.OzgCloudBooleanClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudClientAttributeTestFactory;
-import de.ozgcloud.apilib.attributes.OzgCloudDoubleClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudLongClientAttribute;
-import de.ozgcloud.apilib.attributes.OzgCloudStringClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudBooleanClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudClientAttributeTestFactory;
+import de.ozgcloud.apilib.client_attribute.OzgCloudDoubleClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudLongClientAttribute;
+import de.ozgcloud.apilib.client_attribute.OzgCloudStringClientAttribute;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
@@ -49,11 +49,11 @@ import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.Clien
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
 import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcSetClientAttributeRequest;
 
-class GrpcOzgCloudAttributesServiceTest {
+class OzgCloudClientAttributeGrpcServiceTest {
 
 	@Spy
 	@InjectMocks
-	private GrpcOzgCloudAttributesService service;
+	private OzgCloudClientAttributeGrpcService service;
 
 	@Mock
 	private ClientAttributeServiceBlockingStub serviceBlockingStub;
@@ -90,7 +90,7 @@ class GrpcOzgCloudAttributesServiceTest {
 			}
 
 			@Test
-			void shouldCallServiceBlockingStub() {
+			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
 				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
@@ -115,7 +115,7 @@ class GrpcOzgCloudAttributesServiceTest {
 			}
 
 			@Test
-			void shouldCallServiceBlockingStub() {
+			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
 				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
@@ -140,7 +140,7 @@ class GrpcOzgCloudAttributesServiceTest {
 			}
 
 			@Test
-			void shouldCallServiceBlockingStub() {
+			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
 				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
@@ -165,7 +165,7 @@ class GrpcOzgCloudAttributesServiceTest {
 			}
 
 			@Test
-			void shouldCallServiceBlockingStub() {
+			void shouldCallSetClientAttribute() {
 				service.setClientAttribute(CLIENT_ATTRIBUTE, OzgCloudVorgangTestFactory.ID);
 
 				verify(service).setClientAttribute(grpcClientAttribute, OzgCloudVorgangTestFactory.ID);
@@ -215,14 +215,14 @@ class GrpcOzgCloudAttributesServiceTest {
 		private static final String VORGANG_ID = OzgCloudVorgangTestFactory.ID.toString();
 
 		@Test
-		void shouldBuildSetClientAttribute() {
+		void shouldSetClientAttribute() {
 			var request = service.buildRequest(grpcClientAttribute, VORGANG_ID);
 
 			assertThat(request.getAttribute()).isSameAs(grpcClientAttribute);
 		}
 
 		@Test
-		void shouldBuildSetVorgangId() {
+		void shouldSetVorgangId() {
 			var request = service.buildRequest(grpcClientAttribute, VORGANG_ID);
 
 			assertThat(request.getVorgangId()).isEqualTo(VORGANG_ID);
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/grpc/OzgCloudClientAttributeMapperTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeMapperTest.java
similarity index 91%
rename from api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/grpc/OzgCloudClientAttributeMapperTest.java
rename to api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeMapperTest.java
index 0676d2f..965f50f 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/attributes/grpc/OzgCloudClientAttributeMapperTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/client_attribute/grpc/OzgCloudClientAttributeMapperTest.java
@@ -22,15 +22,15 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 
-package de.ozgcloud.apilib.attributes.grpc;
+package de.ozgcloud.apilib.client_attribute.grpc;
 
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 
-import de.ozgcloud.apilib.attributes.GrpcClientAttributeTestFactory;
-import de.ozgcloud.apilib.attributes.OzgCloudClientAttributeTestFactory;
+import de.ozgcloud.apilib.client_attribute.GrpcClientAttributeTestFactory;
+import de.ozgcloud.apilib.client_attribute.OzgCloudClientAttributeTestFactory;
 
 class OzgCloudClientAttributeMapperTest {
 
-- 
GitLab