From 6e18a493af197b68cafd3cd07382bbd6d8c4f100 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 25 Apr 2024 13:41:24 +0200
Subject: [PATCH] =?UTF-8?q?OZG-5453=20beh=C3=B6rdenschl=C3=BCsselUri=20and?=
=?UTF-8?q?=20version=20are=20read=20from=20application=20properties?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../de/ozgcloud/alfa/export/XdomeaProperties.java | 4 ++++
.../java/de/ozgcloud/alfa/vorgang/KopfCreator.java | 7 ++-----
.../de/ozgcloud/alfa/vorgang/KopfCreatorTest.java | 11 +++++++++--
3 files changed, 15 insertions(+), 7 deletions(-)
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 cedc492ae5..b6b91bf3b1 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 a31903a230..e5c2cddfa6 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 1bce187cf0..b47fea46dc 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);
}
}
--
GitLab