From ae37e063a55a14c83bfe872c676d8551837f5977 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 26 Jun 2024 11:38:35 +0200
Subject: [PATCH] OZG-5841 OZG-5952 Renamed
 BehoerdenschluesselPropertiesValidator

---
 .../alfa/export/ExportConfiguration.java      |  2 +-
 ...or.java => XdomeaPropertiesValidator.java} |  6 +++++-
 ...enschluesselPropertiesValidatorITCase.java |  2 +-
 ...ava => XdomeaPropertiesValidatorTest.java} | 20 +++++++++----------
 4 files changed, 17 insertions(+), 13 deletions(-)
 rename alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/{BehoerdenschluesselPropertiesValidator.java => XdomeaPropertiesValidator.java} (85%)
 rename alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/{BehoerdenschluesselPropertiesValidatorTest.java => XdomeaPropertiesValidatorTest.java} (84%)

diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportConfiguration.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportConfiguration.java
index b28f0c4de3..1ad1ea3746 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportConfiguration.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportConfiguration.java
@@ -23,7 +23,7 @@ class ExportConfiguration {
 
 	@Bean
 	static Validator configurationPropertiesValidator() {
-		return new BehoerdenschluesselPropertiesValidator();
+		return new XdomeaPropertiesValidator();
 	}
 
 	@Bean
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidator.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaPropertiesValidator.java
similarity index 85%
rename from alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidator.java
rename to alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaPropertiesValidator.java
index 1789c74036..8cc320ecb6 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidator.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaPropertiesValidator.java
@@ -7,7 +7,7 @@ import org.springframework.validation.Validator;
 
 import de.ozgcloud.common.errorhandling.TechnicalException;
 
-public class BehoerdenschluesselPropertiesValidator implements Validator {
+public class XdomeaPropertiesValidator implements Validator {
 
 	@Override
 	public boolean supports(Class<?> clazz) {
@@ -17,6 +17,10 @@ public class BehoerdenschluesselPropertiesValidator implements Validator {
 	@Override
 	public void validate(Object target, Errors errors) {
 		var properties = (XdomeaProperties) target;
+		validateBehoerdenschluesselProperties(errors, properties);
+	}
+
+	private void validateBehoerdenschluesselProperties(Errors errors, XdomeaProperties properties) {
 		if (StringUtils.isNotBlank(properties.getBehoerdenschluessel())) {
 			validateNotBlank("behoerdenschluesselUri", properties, errors);
 			validateNotBlank("behoerdenschluesselVersion", properties, errors);
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorITCase.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorITCase.java
index 67a235f209..d74d131288 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorITCase.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorITCase.java
@@ -12,6 +12,6 @@ class BehoerdenschluesselPropertiesValidatorITCase {
 
 	@Test
 	void shouldExistInApplicationContext(ApplicationContext context) {
-		assertThat(context.getBean("configurationPropertiesValidator")).isNotNull().isInstanceOf(BehoerdenschluesselPropertiesValidator.class);
+		assertThat(context.getBean("configurationPropertiesValidator")).isNotNull().isInstanceOf(XdomeaPropertiesValidator.class);
 	}
 }
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XdomeaPropertiesValidatorTest.java
similarity index 84%
rename from alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorTest.java
rename to alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XdomeaPropertiesValidatorTest.java
index eb81f121bc..cd6cf19672 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/BehoerdenschluesselPropertiesValidatorTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XdomeaPropertiesValidatorTest.java
@@ -9,10 +9,10 @@ import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.mockito.Spy;
 import org.springframework.validation.Errors;
 
-class BehoerdenschluesselPropertiesValidatorTest {
+class XdomeaPropertiesValidatorTest {
 
 	@Spy
-	private BehoerdenschluesselPropertiesValidator validator;
+	private XdomeaPropertiesValidator validator;
 
 	@Nested
 	class TestSupports {
@@ -57,7 +57,7 @@ class BehoerdenschluesselPropertiesValidatorTest {
 			@ParameterizedTest
 			@NullAndEmptySource
 			void shouldHaveFieldErrors(String uri) {
-				var properties = havingBehoerdenschluesselUri(uri);
+				var properties = withBehoerdenschluesselUri(uri);
 
 				var errors = validate(properties);
 
@@ -67,7 +67,7 @@ class BehoerdenschluesselPropertiesValidatorTest {
 			@ParameterizedTest
 			@NullAndEmptySource
 			void shouldHaveMeaningfulErrorMessage(String uri) {
-				var properties = havingBehoerdenschluesselUri(uri);
+				var properties = withBehoerdenschluesselUri(uri);
 
 				var errors = validate(properties);
 
@@ -77,14 +77,14 @@ class BehoerdenschluesselPropertiesValidatorTest {
 			@ParameterizedTest
 			@NullAndEmptySource
 			void shouldHaveErrorCode(String uri) {
-				var properties = havingBehoerdenschluesselUri(uri);
+				var properties = withBehoerdenschluesselUri(uri);
 
 				var errors = validate(properties);
 
 				assertThat(errors.getFieldError(PROPERTY_NAME).getCode()).isEqualTo(ERROR_CODE);
 			}
 
-			private XdomeaProperties havingBehoerdenschluesselUri(String uri) {
+			private XdomeaProperties withBehoerdenschluesselUri(String uri) {
 				return XdomeaPropertiesTestFactory.createBuilder().behoerdenschluesselUri(uri).build();
 			}
 		}
@@ -99,7 +99,7 @@ class BehoerdenschluesselPropertiesValidatorTest {
 			@ParameterizedTest
 			@NullAndEmptySource
 			void shouldHaveFieldErrors(String version) {
-				var properties = havingBehoerdenschluesselVersion(version);
+				var properties = withBehoerdenschluesselVersion(version);
 
 				var errors = validate(properties);
 
@@ -109,7 +109,7 @@ class BehoerdenschluesselPropertiesValidatorTest {
 			@ParameterizedTest
 			@NullAndEmptySource
 			void shouldHaveMeaningfulErrorMessage(String version) {
-				var properties = havingBehoerdenschluesselVersion(version);
+				var properties = withBehoerdenschluesselVersion(version);
 
 				var errors = validate(properties);
 
@@ -119,14 +119,14 @@ class BehoerdenschluesselPropertiesValidatorTest {
 			@ParameterizedTest
 			@NullAndEmptySource
 			void shouldHaveErrorCode(String version) {
-				var properties = havingBehoerdenschluesselVersion(version);
+				var properties = withBehoerdenschluesselVersion(version);
 
 				var errors = validate(properties);
 
 				assertThat(errors.getFieldError(PROPERTY_NAME).getCode()).isEqualTo(ERROR_CODE);
 			}
 
-			private XdomeaProperties havingBehoerdenschluesselVersion(String version) {
+			private XdomeaProperties withBehoerdenschluesselVersion(String version) {
 				return XdomeaPropertiesTestFactory.createBuilder().behoerdenschluesselVersion(version).build();
 			}
 		}
-- 
GitLab