fix: parse string with random property order

bzkf · Aug 17, 2024 · 8a578b2 · 8a578b2
1 parent acfae16
commit 8a578b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerde.java b/src/main/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerde.java
@@ -12,7 +12,7 @@ public class StructKeyStringSerde implements Serde<StructKey> {
 
   private static final Pattern structPattern =
       Pattern.compile(
-          "Struct\\{(REFERENZ_NUMMER=\"(?<referenznummer>[^\"]*)\")?,?\\s*(TUMOR_ID=\"(?<tumorid>[^\"]*)\")?\\}");
+          "Struct\\{((REFERENZ_NUMMER=\"(?<referenznummer>[^\"]*)\")|(TUMOR_ID=\"(?<tumorid>[^\"]*))\"|,\\s*)+\\}");
 
   @Override
   public Serializer<StructKey> serializer() {

diff --git a/src/test/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerdeTest.java b/src/test/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerdeTest.java
@@ -49,6 +49,18 @@ void shouldDeserializeStructKey() {
     assertThat(actual).isEqualTo(new StructKey("01234", "1"));
   }
 
+  @Test
+  void shouldDeserializeStructKeyWithInvertedPropertyOrder() {
+    var actual =
+        serde
+            .deserializer()
+            .deserialize(
+                "any",
+                "Struct{TUMOR_ID=\"1\",REFERENZ_NUMMER=\"01234\"}"
+                    .getBytes(StandardCharsets.UTF_8));
+    assertThat(actual).isEqualTo(new StructKey("01234", "1"));
+  }
+
   @Test
   void shouldDeserializePartialStructKeyWithRefNumOnly() {
     var actual =