From c95c8797a96e04bb7c27e851974b74ed68ffbf7c Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 6 Nov 2023 09:01:38 +0100 Subject: [PATCH] OZG-4456 rename class --- .../enginebased/afm/AfmZustaendigeStelleMapper.java | 6 +++--- ...va => BayernZustaendigeStelleMetadataMapper.java} | 2 +- .../afm/AfmZustaendigeStelleMapperTest.java | 6 +++--- ...> BayernZustaendigeStelleMetadataMapperTest.java} | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) rename semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/{BayernBehoerdeMetadataMapper.java => BayernZustaendigeStelleMetadataMapper.java} (98%) rename semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/{BayernBehoerdeMetadataMapperTest.java => BayernZustaendigeStelleMetadataMapperTest.java} (95%) diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java index cda9bd684..23a89da9a 100644 --- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java +++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java @@ -45,12 +45,12 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper { public static final String TAG_BEZEICHNUNG = "OrganisationseinheitenBEZEICHNUNG"; @Autowired - private BayernBehoerdeMetadataMapper bayernBehoerdeMetadataMapper; + private BayernZustaendigeStelleMetadataMapper bayernZustaendigeStelleMetadataMapper; @Override public FormData parseFormData(FormData formData) { - if (bayernBehoerdeMetadataMapper.isResponsible(formData)) { - return bayernBehoerdeMetadataMapper.parseZustaendigeStelleData(formData); + if (bayernZustaendigeStelleMetadataMapper.isResponsible(formData)) { + return bayernZustaendigeStelleMetadataMapper.parseZustaendigeStelleData(formData); } var zustaendigeStelleMap = getZustaendigeStelle(formData); var organisationseinheitenID = getOrganisationseinheitenId(formData); diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapper.java similarity index 98% rename from semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapper.java rename to semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapper.java index 7417593b4..85fe01c40 100644 --- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapper.java +++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapper.java @@ -21,7 +21,7 @@ import lombok.extern.log4j.Log4j2; @Log4j2 @Component -public class BayernBehoerdeMetadataMapper { +public class BayernZustaendigeStelleMetadataMapper { static final String BEHOERDE_METADATA_SUFFIX = "behoerde_metadata.xml"; diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java index c7a450517..234c2f054 100644 --- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java +++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java @@ -45,7 +45,7 @@ class AfmZustaendigeStelleMapperTest { private AfmZustaendigeStelleMapper mapper; @Mock - private BayernBehoerdeMetadataMapper bayernBehoerdeMetadataMapper; + private BayernZustaendigeStelleMetadataMapper bayernZustaendigeStelleMetadataMapper; @Nested class TestParseFormData { @@ -98,9 +98,9 @@ class AfmZustaendigeStelleMapperTest { @Test void shouldCallParseBayernMetadata() { - when(bayernBehoerdeMetadataMapper.isResponsible(any())).thenReturn(true); + when(bayernZustaendigeStelleMetadataMapper.isResponsible(any())).thenReturn(true); var expectedFormData = FormDataTestFactory.create(); - when(bayernBehoerdeMetadataMapper.parseZustaendigeStelleData(any())).thenReturn(expectedFormData); + when(bayernZustaendigeStelleMetadataMapper.parseZustaendigeStelleData(any())).thenReturn(expectedFormData); var resultFormData = parseFormData(formData); diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapperTest.java similarity index 95% rename from semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapperTest.java rename to semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapperTest.java index b3102fe48..5c2831e80 100644 --- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapperTest.java +++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapperTest.java @@ -1,6 +1,6 @@ package de.ozgcloud.eingang.semantik.enginebased.afm; -import static de.ozgcloud.eingang.semantik.enginebased.afm.BayernBehoerdeMetadataMapper.*; +import static de.ozgcloud.eingang.semantik.enginebased.afm.BayernZustaendigeStelleMetadataMapper.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -21,10 +21,10 @@ import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle; import de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory; import lombok.SneakyThrows; -class BayernBehoerdeMetadataMapperTest { +class BayernZustaendigeStelleMetadataMapperTest { @Spy - private BayernBehoerdeMetadataMapper mapper; + private BayernZustaendigeStelleMetadataMapper mapper; @Nested class TestParseBehoerdeMetadata { @@ -35,7 +35,7 @@ class BayernBehoerdeMetadataMapperTest { @BeforeEach void setUp() { - behoerdeMetadataFile = IncomingFileTestFactory.createBuilder().name(BayernBehoerdeMetadataMapper.BEHOERDE_METADATA_SUFFIX) + behoerdeMetadataFile = IncomingFileTestFactory.createBuilder().name(BayernZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_SUFFIX) .build(); formData = FormDataTestFactory.createBuilder() .zustaendigeStelle(null) @@ -80,7 +80,7 @@ class BayernBehoerdeMetadataMapperTest { @BeforeEach void setUp() { behoerdeMetadataXml = IncomingFileTestFactory.createBuilder() - .name(BayernBehoerdeMetadataMapper.BEHOERDE_METADATA_SUFFIX) + .name(BayernZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_SUFFIX) .file(new File(TestUtils.class.getClassLoader().getResource(BEHOERDE_METADATA_SUFFIX).toURI())).build(); } @@ -252,7 +252,7 @@ class BayernBehoerdeMetadataMapperTest { @Test void shouldApproveResponsibility() { var formData = FormDataTestFactory.createBuilder() - .representation(IncomingFileTestFactory.createBuilder().name(BayernBehoerdeMetadataMapper.BEHOERDE_METADATA_SUFFIX) + .representation(IncomingFileTestFactory.createBuilder().name(BayernZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_SUFFIX) .build()).build(); var isResponsible = mapper.isResponsible(formData); -- GitLab