diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaProperties.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaProperties.java index cedc492ae5d58bc2b41284562070372a3331bf3f..b6b91bf3b14188ba000c8e797374e7753b0d5740 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaProperties.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XdomeaProperties.java @@ -19,4 +19,8 @@ public class XdomeaProperties { */ @NotNull private String behoerdenschluessel; + @NotNull + private String behoerdenschluesselUri; + @NotNull + private String behoerdenschluesselVersion; } diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/KopfCreator.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/KopfCreator.java index a31903a23072ed69eac7f8537ea16171d052e36a..e5c2cddfa66a67517f7cc0f24d7c384be37dac22 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/KopfCreator.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/KopfCreator.java @@ -20,9 +20,6 @@ import lombok.RequiredArgsConstructor; @Component class KopfCreator { - static final String BEHOERDENSCHLUSSEL_LIST_URI = "urn:de:bund:destatis:bevoelkerungsstatistik:schluessel:rs"; - static final String BEHOERDENSCHLUSSEL_LIST_VERSION_ID = "2023-11-30"; - static final String NACHRICHTENTYP_CODE_TYPE_LIST_URI = "urn:xoev-de:xdomea:codeliste:nachrichtentyp"; static final String NACHRICHTENTYP_CODE_TYPE_LIST_VERSION_ID = "2.0"; static final String NACHRICHTENTYP_ABGABE_ABGABE_TYPE_CODE = "0401"; @@ -78,8 +75,8 @@ class KopfCreator { Code createBehoerdenschlussen() { var behoerdenschlussel = new Code(); behoerdenschlussel.setCode(xDomeaProperties.getBehoerdenschluessel()); - behoerdenschlussel.setListURI(BEHOERDENSCHLUSSEL_LIST_URI); - behoerdenschlussel.setListVersionID(BEHOERDENSCHLUSSEL_LIST_VERSION_ID); + behoerdenschlussel.setListURI(xDomeaProperties.getBehoerdenschluesselUri()); + behoerdenschlussel.setListVersionID(xDomeaProperties.getBehoerdenschluesselVersion()); return behoerdenschlussel; } diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/KopfCreatorTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/KopfCreatorTest.java index 1bce187cf0a5b5374f18273a56d90000bff3a931..b47fea46dc6d28b0a23af900d3882878530f2b1f 100644 --- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/KopfCreatorTest.java +++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/KopfCreatorTest.java @@ -1,6 +1,7 @@ package de.ozgcloud.alfa.vorgang; import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.time.ZoneOffset; @@ -224,16 +225,22 @@ class KopfCreatorTest { @Test void shouldSetListURI() { + var expectedBehoerdenschluesselUri = "uri"; + when(xDomeaProperties.getBehoerdenschluesselUri()).thenReturn(expectedBehoerdenschluesselUri); + var behoerdenschlussel = creator.createBehoerdenschlussen(); - assertThat(behoerdenschlussel.getListURI()).isEqualTo(KopfCreator.BEHOERDENSCHLUSSEL_LIST_URI); + assertThat(behoerdenschlussel.getListURI()).isEqualTo(expectedBehoerdenschluesselUri); } @Test void shouldSetListVersionID() { + var expectedBehoerdenschluesselVersion = "version"; + when(xDomeaProperties.getBehoerdenschluesselVersion()).thenReturn(expectedBehoerdenschluesselVersion); + var behoerdenschlussel = creator.createBehoerdenschlussen(); - assertThat(behoerdenschlussel.getListVersionID()).isEqualTo(KopfCreator.BEHOERDENSCHLUSSEL_LIST_VERSION_ID); + assertThat(behoerdenschlussel.getListVersionID()).isEqualTo(expectedBehoerdenschluesselVersion); } }