feat(java): deserialize oneof (#492)

algolia · May 11, 2022 · e86e870 · e86e870
1 parent ee9c021
commit e86e870
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/actions/restore-artifacts/action.yml b/.github/actions/restore-artifacts/action.yml
@@ -32,21 +32,21 @@ runs:
 
     # JavaScript utils
     - name: client-javascript-utils-client-common
-      if: ${{ inputs.type == 'all' || inputs.type == 'js_utils' }}
+      if: ${{ (inputs.javascript == 'true' && inputs.type == 'all') || inputs.type == 'js_utils' }}
       uses: actions/download-artifact@v3
       with:
         name: client-javascript-utils-client-common
         path: clients/algoliasearch-client-javascript/packages/client-common/
 
     - name: client-javascript-utils-requester-browser-xhr
-      if: ${{ inputs.type == 'all' || inputs.type == 'js_utils' }}
+      if: ${{ (inputs.javascript == 'true' && inputs.type == 'all') || inputs.type == 'js_utils' }}
       uses: actions/download-artifact@v3
       with:
         name: client-javascript-utils-requester-browser-xhr
         path: clients/algoliasearch-client-javascript/packages/requester-browser-xhr/
 
     - name: client-javascript-utils-requester-node-http
-      if: ${{ inputs.type == 'all' || inputs.type == 'js_utils' }}
+      if: ${{ (inputs.javascript == 'true' && inputs.type == 'all') || inputs.type == 'js_utils' }}
       uses: actions/download-artifact@v3
       with:
         name: client-javascript-utils-requester-node-http

diff --git a/.../algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/JSON.java b/.../algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/JSON.java
@@ -113,6 +113,14 @@ public static <T> T deserialize(String body, Type returnType) {
       }
     }
   }
+
+  public static <T> T tryDeserialize(JsonReader reader, Type returnType) {
+    try {
+      return gson.fromJson(reader, returnType);
+    } catch (JsonParseException e) {
+      return null;
+    }
+  }
 }
 
 /** Gson TypeAdapter for Byte Array type */

diff --git a/templates/java/oneof_interface.mustache b/templates/java/oneof_interface.mustache
@@ -31,6 +31,12 @@ public abstract class {{classname}} implements CompoundType {
         @Override
         public {{classname}} read(final JsonReader jsonReader)
             throws IOException {
+        {{#vendorExtensions.x-is-one-of-list}}
+        {{{type}}} {{#lambda.lowercase}}{{name}}{{/lambda.lowercase}} = JSON.tryDeserialize(jsonReader, new TypeToken<{{{type}}}>() {}.getType());
+        if({{#lambda.lowercase}}{{name}}{{/lambda.lowercase}} != null) {
+          return {{classname}}.of{{name}}({{#lambda.lowercase}}{{name}}{{/lambda.lowercase}});
+        }
+        {{/vendorExtensions.x-is-one-of-list}}
         return null;
         }
     }