Merge remote-tracking branch 'origin/release'

# Conflicts:
#	alfa-client/pom.xml
#	alfa-server/pom.xml
#	alfa-service/pom.xml
#	pom.xml

alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachSettingsService.java

@@ -99,12 +99,18 @@ class PostfachSettingsService {
 				.orElse(false);
 	}
 
-	Optional<OrganisationsEinheitSettings> getOrganisationsEinheitSettings(final String organisationId) {
-		return Optional.ofNullable(postfachProperties.getOrganisationsEinheitSettings().get(organisationId)).map(this::mapOrganisationsEinheitSettings);
+	Optional<OrganisationsEinheitSettings> getOrganisationsEinheitSettings(String organisationId) {
+		return Optional.ofNullable(organisationId)
+				.map(this::getOrganisationsEinheitPostfachSettings)
+				.map(this::mapOrganisationsEinheitSettings);
 	}
 
 	OrganisationsEinheitSettings mapOrganisationsEinheitSettings(Map<String, Object> organisationsEinheitSettings) {
 		var signatur = Optional.ofNullable(organisationsEinheitSettings.get(FIELD_SIGNATUR)).map(Object::toString).orElse(null);
 		return OrganisationsEinheitSettings.builder().signatur(signatur).build();
 	}
+
+	private Map<String, Object> getOrganisationsEinheitPostfachSettings(String organisationId) {
+		return postfachProperties.getOrganisationsEinheitSettings().get(organisationId);
+	}
 }

alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachSettingsServiceTest.java

@@ -384,8 +384,12 @@ class PostfachSettingsServiceTest {
 	@Nested
 	class TestGetOrganisationsEinheitSettings {
 
+		@Nested
+		class OnOrganisationIdNotNull {
+
 			private final OrganisationsEinheitSettings organisationsEinheitSettings = OrganisationsEinheitSettingsTestFactory.create();
-		private final Map<String, Object> organisationsEinheitSettingsMap = Map.of(PostfachSettingsService.FIELD_SIGNATUR, OrganisationsEinheitSettingsTestFactory.TEST_SIGNATUR);
+			private final Map<String, Object> organisationsEinheitSettingsMap = Map.of(PostfachSettingsService.FIELD_SIGNATUR,
+					OrganisationsEinheitSettingsTestFactory.TEST_SIGNATUR);
 
 			@BeforeEach
 			void setUp() {
@@ -422,6 +426,18 @@ class PostfachSettingsServiceTest {
 			}
 		}
 
+		@Nested
+		class OnOrganisationIdNull {
+
+			@Test
+			void shouldReturnEmpty() {
+				var settings = service.getOrganisationsEinheitSettings(null);
+
+				assertThat(settings).isEmpty();
+			}
+		}
+	}
+
 	@Nested
 	class TestMapOrganisationsEinheitSettings {