OZG-6239 Cleanup model annotations

src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java

@@ -5,21 +5,21 @@ import jakarta.xml.ws.soap.SOAPBinding;
 
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.jaxws.EndpointImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import genv3.de.xoev.transport.xta.x211.ManagementPortType;
 import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
 import genv3.de.xoev.transport.xta.x211.SendPortType;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 @Configuration
 @Log4j2
+@RequiredArgsConstructor
 public class XTAServer {
 
-	@Autowired
-	private SpringBus bus;
+	private final SpringBus bus;
 
 	@Bean
 	Endpoint managementEndpoint(final ManagementPortType managementPortType) {

src/main/java/de/ozgcloud/xta/test/app/model/XtaFile.java

@@ -19,6 +19,6 @@ public record XtaFile(
 		@NotBlank String name,
 		@Nullable String id,
 		@Nullable String language,
-		@NotNull @PositiveOrZero BigInteger size
+		@PositiveOrZero BigInteger size
 ) {
 }

src/main/java/de/ozgcloud/xta/test/app/model/XtaLookupServiceRequest.java

 package de.ozgcloud.xta.test.app.model;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 
 import lombok.Builder;
 
 @Builder
 public record XtaLookupServiceRequest(
-		@NotNull @NotBlank String service,
-		@NotNull @NotBlank String readerIdentifierValue,
-		@NotNull @NotBlank String authorIdentifierValue
+		@NotBlank String service,
+		@NotBlank String readerIdentifierValue,
+		@NotBlank String authorIdentifierValue
 ) {
 }

src/main/java/de/ozgcloud/xta/test/app/model/XtaMessageMetaData.java

@@ -15,8 +15,8 @@ import lombok.Builder;
 
 @Builder(toBuilder = true)
 public record XtaMessageMetaData(
-		@NotNull @NotBlank String service,
-		@NotNull @NotBlank String businessScenarioCode,
+		@NotBlank String service,
+		@NotBlank String businessScenarioCode,
 		@Nullable String businessScenarioName,
 		@Nullable String businessScenarioListUri,
 		@Nullable String businessScenarioListVersionId,
@@ -25,6 +25,6 @@ public record XtaMessageMetaData(
 		@ValidXtaId(namespace = MESSAGE_ID_NAMESPACE) String messageId,
 		@NotNull @Valid XtaIdentifier authorIdentifier,
 		@NotNull @Valid XtaIdentifier readerIdentifier,
-		@NotNull @PositiveOrZero BigInteger messageSize
+		@PositiveOrZero BigInteger messageSize
 ) {
 }

src/main/java/de/ozgcloud/xta/test/app/model/XtaMessageMetaDataListing.java

@@ -4,7 +4,6 @@ import java.math.BigInteger;
 import java.util.List;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.PositiveOrZero;
 
@@ -12,7 +11,7 @@ import lombok.Builder;
 
 @Builder
 public record XtaMessageMetaDataListing(
-		@NotNull @PositiveOrZero BigInteger pendingMessageCount,
-		@NotNull @Valid List<XtaMessageMetaData> messages
+		@PositiveOrZero BigInteger pendingMessageCount,
+		@NotNull List<@Valid XtaMessageMetaData> messages
 ) {
 }

src/main/java/de/ozgcloud/xta/test/app/model/XtaMessageMetaDataListingRequest.java

 package de.ozgcloud.xta.test.app.model;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 
 import lombok.Builder;
 
 @Builder
 public record XtaMessageMetaDataListingRequest(
-		@NotNull @NotBlank String clientIdentifierValue,
-		@NotNull @Positive int maxListItems
+		@NotBlank String clientIdentifierValue,
+		@Positive int maxListItems
 ) {
 }

src/test/java/de/ozgcloud/xta/test/app/validation/RequestValidatorTest.java

@@ -72,6 +72,16 @@ class RequestValidatorTest {
 
 				assertThatThrownBy(() -> validator.validate(request)).isEqualTo(exception);
 			}
+
+			@DisplayName("should throw if clientIdentifierValue is null")
+			@Test
+			void shouldThrowIfClientIdentifierValueIsNull() {
+				var request = XtaGetMessageRequestTestFactory.createBuilder()
+						.clientIdentifierValue(null)
+						.build();
+
+				assertThatThrownBy(() -> validator.validate(request)).isEqualTo(exception);
+			}
 		}
 
 	}