From b228ba35e91a2727aad3202ea054ddd4ab2b66de Mon Sep 17 00:00:00 2001 From: Jan Zickermann <jan.zickermann@dataport.de> Date: Wed, 26 Mar 2025 15:50:20 +0100 Subject: [PATCH] OZG-6831 format: Use formatter --- .../semantik/common/ServiceKontoFactory.java | 13 ++++++--- .../common/ServiceKontoFactoryTest.java | 29 +++++++++++-------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java index 6d6eba4a..8f9aa3d8 100644 --- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java +++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java @@ -23,6 +23,15 @@ */ package de.ozgcloud.eingang.semantik.common; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +import org.apache.commons.collections.MapUtils; +import org.springframework.stereotype.Component; + import de.ozgcloud.eingang.common.formdata.FormData; import de.ozgcloud.eingang.common.formdata.PostfachAddressIdentifier; import de.ozgcloud.eingang.common.formdata.ServiceKonto; @@ -30,10 +39,6 @@ import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress; import de.ozgcloud.eingang.common.formdata.ServiceKonto.TrustLevel; import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier; import lombok.extern.log4j.Log4j2; -import org.apache.commons.collections.MapUtils; -import org.springframework.stereotype.Component; - -import java.util.*; @Component @Log4j2 diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java index a1a30252..ce057658 100644 --- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java +++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java @@ -23,9 +23,14 @@ */ package de.ozgcloud.eingang.semantik.common; -import de.ozgcloud.eingang.common.formdata.*; -import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress; -import de.ozgcloud.eingang.common.formdata.ServiceKonto.TrustLevel; +import static de.ozgcloud.eingang.semantik.common.ServiceKontoFactory.*; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.Map; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -35,14 +40,14 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.InjectMocks; import org.mockito.Spy; -import java.util.List; -import java.util.Map; - -import static de.ozgcloud.eingang.semantik.common.ServiceKontoFactory.POSTFACH_ADDRESS_DEFAULT; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.*; +import de.ozgcloud.eingang.common.formdata.FormData; +import de.ozgcloud.eingang.common.formdata.FormDataUtils; +import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory; +import de.ozgcloud.eingang.common.formdata.ServiceKonto; +import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress; +import de.ozgcloud.eingang.common.formdata.ServiceKonto.TrustLevel; +import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory; +import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier; class ServiceKontoFactoryTest { @@ -123,7 +128,7 @@ class ServiceKontoFactoryTest { @DisplayName("should return with postfach address type") @ParameterizedTest - @ValueSource(ints = {1, 2, 3}) + @ValueSource(ints = { 1, 2, 3 }) void shouldReturnWithPostfachAddressType(int postfachAddressType) { var formDataWithPostfachAddressType = FormDataUtils.from(FORM_DATA) .put(ServiceKontoFactory.REST_RESPONSE_NAME, List.of(Map.of( -- GitLab