chore: Fix Avro and Protobuf serialization/deserialization Kamelets

Use schema resolvers from Camel core
openshift-integration · May 3, 2024 · f11d27c · f11d27c
1 parent 673ed81
commit f11d27c
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 258 deletions.
diff --git a/avro-deserialize-action.kamelet.yaml b/avro-deserialize-action.kamelet.yaml
@@ -30,14 +30,13 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
   dependencies:
-  - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:2.3.0"
   - "camel:kamelet"
   - "camel:core"
   - "camel:jackson-avro"
   template:
     beans:
       - name: schemaResolver
-        type: "#class:org.apache.camel.kamelets.utils.format.converter.avro.AvroSchemaResolver"
+        type: "#class:org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver"
         property:
           - key: validate
             value: '{{validate}}'
@@ -51,5 +50,5 @@ spec:
             library: Jackson
             unmarshalType: com.fasterxml.jackson.databind.JsonNode
             schemaResolver: "#bean:{{schemaResolver}}"
-      - remove-header:
+      - removeHeader:
           name: "Content-Type"
diff --git a/avro-serialize-action.kamelet.yaml b/avro-serialize-action.kamelet.yaml
@@ -30,14 +30,13 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
   dependencies:
-  - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:2.3.0"
   - "camel:kamelet"
   - "camel:core"
   - "camel:jackson-avro"
   template:
     beans:
       - name: schemaResolver
-        type: "#class:org.apache.camel.kamelets.utils.format.converter.avro.AvroSchemaResolver"
+        type: "#class:org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver"
         property:
           - key: validate
             value: '{{validate}}'
@@ -51,6 +50,6 @@ spec:
             library: Jackson
             unmarshalType: com.fasterxml.jackson.databind.JsonNode
             schemaResolver: "#bean:{{schemaResolver}}"
-      - set-header:
+      - setHeader:
           name: "Content-Type"
           constant: "application/avro"
diff --git a/...y/camel-kamelets-catalog/src/main/resources/kamelets/avro-deserialize-action.kamelet.yaml b/...y/camel-kamelets-catalog/src/main/resources/kamelets/avro-deserialize-action.kamelet.yaml
@@ -30,14 +30,13 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
   dependencies:
-  - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:2.3.0"
   - "camel:kamelet"
   - "camel:core"
   - "camel:jackson-avro"
   template:
     beans:
       - name: schemaResolver
-        type: "#class:org.apache.camel.kamelets.utils.format.converter.avro.AvroSchemaResolver"
+        type: "#class:org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver"
         property:
           - key: validate
             value: '{{validate}}'
@@ -51,5 +50,5 @@ spec:
             library: Jackson
             unmarshalType: com.fasterxml.jackson.databind.JsonNode
             schemaResolver: "#bean:{{schemaResolver}}"
-      - remove-header:
+      - removeHeader:
           name: "Content-Type"
diff --git a/...ary/camel-kamelets-catalog/src/main/resources/kamelets/avro-serialize-action.kamelet.yaml b/...ary/camel-kamelets-catalog/src/main/resources/kamelets/avro-serialize-action.kamelet.yaml
@@ -30,14 +30,13 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
   dependencies:
-  - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:2.3.0"
   - "camel:kamelet"
   - "camel:core"
   - "camel:jackson-avro"
   template:
     beans:
       - name: schemaResolver
-        type: "#class:org.apache.camel.kamelets.utils.format.converter.avro.AvroSchemaResolver"
+        type: "#class:org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver"
         property:
           - key: validate
             value: '{{validate}}'
@@ -51,6 +50,6 @@ spec:
             library: Jackson
             unmarshalType: com.fasterxml.jackson.databind.JsonNode
             schemaResolver: "#bean:{{schemaResolver}}"
-      - set-header:
+      - setHeader:
           name: "Content-Type"
           constant: "application/avro"
diff --git a/...mel-kamelets-catalog/src/main/resources/kamelets/protobuf-deserialize-action.kamelet.yaml b/...mel-kamelets-catalog/src/main/resources/kamelets/protobuf-deserialize-action.kamelet.yaml
@@ -30,7 +30,7 @@ spec:
   template:
     beans:
       - name: schemaResolver
-        type: "#class:org.apache.camel.kamelets.utils.format.converter.protobuf.ProtobufSchemaResolver"
+        type: "#class:org.apache.camel.component.jackson.protobuf.transform.ProtobufSchemaResolver"
         property:
           - key: schema
             value: '{{schema:}}'
@@ -42,5 +42,5 @@ spec:
             library: Jackson
             unmarshalType: com.fasterxml.jackson.databind.JsonNode
             schemaResolver: "#bean:{{schemaResolver}}"
-      - remove-header:
+      - removeHeader:
           name: "Content-Type"
diff --git a/...camel-kamelets-catalog/src/main/resources/kamelets/protobuf-serialize-action.kamelet.yaml b/...camel-kamelets-catalog/src/main/resources/kamelets/protobuf-serialize-action.kamelet.yaml
@@ -30,7 +30,7 @@ spec:
   template:
     beans:
       - name: schemaResolver
-        type: "#class:org.apache.camel.kamelets.utils.format.converter.protobuf.ProtobufSchemaResolver"
+        type: "#class:org.apache.camel.component.jackson.protobuf.transform.ProtobufSchemaResolver"
         property:
           - key: schema
             value: '{{schema:}}'
@@ -42,6 +42,6 @@ spec:
             library: Jackson
             unmarshalType: com.fasterxml.jackson.databind.JsonNode
             schemaResolver: "#bean:{{schemaResolver}}"
-      - set-header:
+      - setHeader:
           name: "Content-Type"
           constant: "application/protobuf"
diff --git a/...y/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/MimeType.java b/...y/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/MimeType.java
@@ -22,6 +22,8 @@
 public enum MimeType {
     JSON("application/json"),
     PROTOBUF("application/protobuf"),
+    PROTOBUF_BINARY("protobuf/binary"),
+    PROTOBUF_STRUCT("protobuf/x-struct"),
     AVRO("application/avro"),
     AVRO_BINARY("avro/binary"),
     AVRO_STRUCT("avro/x-struct"),

diff --git a/...camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/SchemaType.java b/...camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/SchemaType.java
diff --git a/...src/main/java/org/apache/camel/kamelets/utils/format/schema/DelegatingSchemaResolver.java b/...src/main/java/org/apache/camel/kamelets/utils/format/schema/DelegatingSchemaResolver.java
@@ -20,9 +20,9 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver;
+import org.apache.camel.component.jackson.protobuf.transform.ProtobufSchemaResolver;
 import org.apache.camel.component.jackson.transform.JsonSchemaResolver;
 import org.apache.camel.kamelets.utils.format.MimeType;
-import org.apache.camel.kamelets.utils.format.schema.protobuf.ProtobufSchemaResolver;
 import org.apache.camel.util.ObjectHelper;
 
 /**
@@ -63,6 +63,8 @@ public void process(Exchange exchange) throws Exception {
     private Processor fromMimeType(MimeType mimeType) {
         switch (mimeType) {
             case PROTOBUF:
+            case PROTOBUF_BINARY:
+            case PROTOBUF_STRUCT:
                 ProtobufSchemaResolver protobufSchemaResolver = new ProtobufSchemaResolver();
                 protobufSchemaResolver.setSchema(this.schema);
                 protobufSchemaResolver.setContentClass(this.contentClass);

diff --git a/...-utils/src/main/java/org/apache/camel/kamelets/utils/format/schema/protobuf/Protobuf.java b/...-utils/src/main/java/org/apache/camel/kamelets/utils/format/schema/protobuf/Protobuf.java
diff --git a/...n/java/org/apache/camel/kamelets/utils/format/schema/protobuf/ProtobufSchemaResolver.java b/...n/java/org/apache/camel/kamelets/utils/format/schema/protobuf/ProtobufSchemaResolver.java