fix: When enum in object property was null, it broke

Fixes #762
kaoto-archive · Jul 13, 2023 · bb8c76b · bb8c76b
1 parent b23298c
commit bb8c76b
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/api/src/test/java/io/kaoto/backend/api/resource/v2/IntegrationsResourceTest.java b/api/src/test/java/io/kaoto/backend/api/resource/v2/IntegrationsResourceTest.java
@@ -373,7 +373,7 @@ void beans() throws Exception {
             "Integration#integration-multiroute.yaml", "Kamelet#jms-amqp-10-source.kamelet.yaml",
             "Integration#integration-no-step.yaml", "Integration#integration-with-beans.yaml",
             "Kamelet#beans.kamelet.yaml", "Kamelet#aws-cloudtrail.yaml",
-            "Kamelet#avro-serialize-action.kamelet.yaml"})
+            "Kamelet#avro-serialize-action.kamelet.yaml", "Kamelet#google-bigquery-sink.kamelet.yaml"})
     void roundTrip(String file) throws IOException {
 
         String[] parameters = file.split("#");

diff --git a/api/src/test/resources/io/kaoto/backend/api/resource/google-bigquery-sink.kamelet.yaml b/api/src/test/resources/io/kaoto/backend/api/resource/google-bigquery-sink.kamelet.yaml
@@ -0,0 +1,58 @@
+apiVersion: camel.apache.org/v1alpha1
+kind: Kamelet
+metadata:
+  annotations:
+    camel.apache.org/kamelet.support.level: Stable
+    camel.apache.org/catalog.version: 4.0.0-SNAPSHOT
+    camel.apache.org/kamelet.icon: data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHdpZHRoPSIyNTAwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgdmlld0JveD0iLTEuNjMzMjM1NDMzMzI4MjU2IDcuMDMyNjA5MzMwMzE1NjU2NSAxMzEuMjY1NzQ2ODI0MTY4NzYgMTE0LjYzNDM5MDY2OTY4NDM1IiB2ZXJzaW9uPSIxLjAiPgogICAgPGxpbmVhckdyYWRpZW50IGlkPSJhIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjY0IiB4Mj0iNjQiIHkxPSI3LjAzNCIgeTI9IjEyMC43ODkiPgogICAgICAgIDxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iIzQzODdmZCIvPgogICAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzQ2ODNlYSIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDxwYXRoIGQ9Ik0yNy43OSAxMTUuMjE3TDEuNTQgNjkuNzQ5YTExLjQ5OSAxMS40OTkgMCAwIDEgMC0xMS40OTlsMjYuMjUtNDUuNDY3YTExLjUgMTEuNSAwIDAgMSA5Ljk2LTUuNzVoNTIuNWExMS41IDExLjUgMCAwIDEgOS45NTkgNS43NWwyNi4yNSA0NS40NjdhMTEuNDk5IDExLjQ5OSAwIDAgMSAwIDExLjVsLTI2LjI1IDQ1LjQ2N2ExMS41IDExLjUgMCAwIDEtOS45NTkgNS43NDloLTUyLjVhMTEuNDk5IDExLjQ5OSAwIDAgMS05Ljk2LTUuNzV6IgogICAgICAgICAgZmlsbD0idXJsKCNhKSIvPgogICAgPHBhdGgKICAgICAgICAgIGQ9Ik0xMTkuMjI5IDg2LjQ4TDgwLjYyNSA0Ny44NzQgNjQgNDMuNDI1bC0xNC45MzMgNS41NUw0My4zIDY0bDQuNjM3IDE2LjcyOSA0MC45MzggNDAuOTM4IDguNjg3LS4zODZ6IgogICAgICAgICAgb3BhY2l0eT0iLjA3Ii8+CiAgICA8ZyBmaWxsPSIjZmZmIj4KICAgICAgICA8cGF0aCBkPSJNNjQgNDAuODA0Yy0xMi44MSAwLTIzLjE5NSAxMC4zODUtMjMuMTk1IDIzLjE5NiAwIDEyLjgxIDEwLjM4NSAyMy4xOTUgMjMuMTk1IDIzLjE5NVM4Ny4xOTQgNzYuODEgODcuMTk0IDY0YzAtMTIuODExLTEwLjM4NS0yMy4xOTYtMjMuMTk0LTIzLjE5Nm0wIDQwLjc5NWMtOS43MiAwLTE3LjYtNy44OC0xNy42LTE3LjZTNTQuMjggNDYuNCA2NCA0Ni40IDgxLjYgNTQuMjggODEuNiA2NCA3My43MiA4MS42IDY0IDgxLjYiLz4KICAgICAgICA8cGF0aCBkPSJNNTIuOTkgNjMuMTA0djcuMjFhMTIuNzk0IDEyLjc5NCAwIDAgMCA0LjM4IDQuNDc1VjYzLjEwNHpNNjEuNjc1IDU3LjAyNnYxOS40MTFjLjc0NS4xMzcgMS41MDcuMjIgMi4yOS4yMi43MTQgMCAxLjQxLS4wNzUgMi4wOTMtLjE4OVY1Ny4wMjZ6TTcwLjc2NiA2Ni4xdjguNTYyYTEyLjc4NiAxMi43ODYgMCAwIDAgNC4zODItNC43di0zLjg2MXpNODAuNjkxIDc4LjI4N2wtMi40MDMgMi40MDVhMS4wODggMS4wODggMCAwIDAgMCAxLjUzN2w5LjExNSA5LjExMmExLjA4OCAxLjA4OCAwIDAgMCAxLjUzNyAwbDIuNDAzLTIuNDAyYTEuMDkyIDEuMDkyIDAgMCAwIDAtMS41MzZsLTkuMTE2LTkuMTE2YTEuMDkgMS4wOSAwIDAgMC0xLjUzNiAwIi8+CiAgICA8L2c+Cjwvc3ZnPg==
+    camel.apache.org/provider: Apache Software Foundation
+    camel.apache.org/kamelet.group: Google Big Query
+    camel.apache.org/kamelet.namespace: GCP
+  labels:
+    camel.apache.org/kamelet.type: sink
+  name: google-bigquery-sink
+spec:
+  definition:
+    properties:
+      projectId:
+        description: The Google Cloud Project ID.
+        title: Google Cloud Project Id
+        type: string
+      dataset:
+        description: The Big Query Dataset ID.
+        title: Big Query Dataset Id
+        type: string
+      table:
+        description: The Big Query Table ID.
+        title: Big Query Table Id
+        type: string
+      serviceAccountKey:
+        description: The service account key to use as credentials for BigQuery.
+        title: Service Account Key
+        type: object
+    required:
+    - projectId
+    - dataset
+    - table
+    - serviceAccountKey
+    title: Google Big Query Sink
+    type: object
+  dependencies:
+  - camel:core
+  - camel:kamelet
+  - camel:google-bigquery
+  - camel:jackson
+  template:
+    from:
+      uri: kamelet:source
+      steps:
+      - unmarshal:
+          json:
+            library: Jackson
+      - to:
+          uri: google-bigquery:{{projectId}}:{{dataset}}:{{table}}
+          parameters:
+            serviceAccountKey: base64:{{serviceAccountKey}}
+  types:
+    in:
+      mediaType: application/json
diff --git a/.../main/java/io/kaoto/backend/api/service/step/parser/kamelet/KameletStepParserService.java b/.../main/java/io/kaoto/backend/api/service/step/parser/kamelet/KameletStepParserService.java
@@ -213,7 +213,7 @@ private void processParameters(final ParseResult<Step> res,
                         break;
                     default:
                         p = new ObjectParameter(key, def.getTitle(), def.getDescription(), def.getNullable(),
-                                def.get_enum().toArray(new AnyType[0]),
+                                def.get_enum() != null ? def.get_enum().toArray(new AnyType[0]) : null,
                                 def.getExample() != null ?
                                         new Object[]{ def.getExample().getValue()} :
                                         null,