Revert "Upgrading siri-avro-mapper"

entur · Aug 23, 2024 · 0dc3c02 · 0dc3c02
1 parent 0628e8e
commit 0dc3c02
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -230,7 +230,7 @@
         <dependency>
             <groupId>org.entur</groupId>
             <artifactId>siri-avro-mapper</artifactId>
-            <version>3.0.0</version>
+            <version>2.5.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>

diff --git a/src/main/java/no/rutebanken/anshar/routes/pubsub/SiriAvroJsonSerializer.java b/src/main/java/no/rutebanken/anshar/routes/pubsub/SiriAvroJsonSerializer.java
@@ -40,7 +40,17 @@ private void serializeEt(Exchange exchange) throws IOException {
         etWriter.write(body, jsonEncoder);
         jsonEncoder.flush();
 
-        exchange.getMessage().setBody(stream.toByteArray());
+        exchange.getMessage().setBody(replaceAvroEnums(stream.toByteArray()));
+    }
+
+
+    /*
+       Temporary legacy-hack to rewrite avro-data containing Enums to new schema-version where
+       enums are replaced with string for future compatibility.
+     */
+    private static String replaceAvroEnums(byte[] byteArray) {
+        String json = new String(byteArray);
+        return json.replaceAll("\"org.entur.avro.realtime.siri.model.[a-zA-Z]*Enum\"", "\"string\"");
     }
 
     private void serializeVm(Exchange exchange) throws IOException {
@@ -50,8 +60,7 @@ private void serializeVm(Exchange exchange) throws IOException {
                 VehicleActivityRecord.SCHEMA$, stream);
         vmWriter.write(body, jsonEncoder);
         jsonEncoder.flush();
-
-        exchange.getMessage().setBody(stream.toByteArray());
+        exchange.getMessage().setBody(replaceAvroEnums(stream.toByteArray()));
     }
     private void serializeSx(Exchange exchange) throws IOException {
         PtSituationElementRecord body = exchange.getMessage().getBody(PtSituationElementRecord.class);
@@ -60,7 +69,6 @@ private void serializeSx(Exchange exchange) throws IOException {
                 PtSituationElementRecord.SCHEMA$, stream);
         sxWriter.write(body, jsonEncoder);
         jsonEncoder.flush();
-
-        exchange.getMessage().setBody(stream.toByteArray());
+        exchange.getMessage().setBody(replaceAvroEnums(stream.toByteArray()));
     }
 }