fix(generators): auto-infer discriminator fields from unique required properties (generated)

algolia-bot · Fluf22 · algolia-bot · commit b2792d3d6464 · 2026-04-09T09:21:26.000Z
algolia/api-clients-automation#6199 Co-authored-by: algolia-bot <accounts+algolia-api-client-bot@algolia.com> Co-authored-by: Thomas Raffray <Fluf22@users.noreply.github.com>
diff --git a/algoliasearch/src/main/java/com/algolia/model/composition/BatchCompositionAction.java b/algoliasearch/src/main/java/com/algolia/model/composition/BatchCompositionAction.java
@@ -22,7 +22,7 @@ class Deserializer extends JsonDeserializer<BatchCompositionAction> {
     public BatchCompositionAction deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
       // deserialize Composition
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("behavior") && tree.has("name")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           return parser.readValueAs(Composition.class);
         } catch (Exception e) {
diff --git a/algoliasearch/src/main/java/com/algolia/model/composition/CompositionBehavior.java b/algoliasearch/src/main/java/com/algolia/model/composition/CompositionBehavior.java
@@ -22,7 +22,7 @@ class Deserializer extends JsonDeserializer<CompositionBehavior> {
     public CompositionBehavior deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
       // deserialize CompositionInjectionBehavior
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("injection")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           return parser.readValueAs(CompositionInjectionBehavior.class);
         } catch (Exception e) {
@@ -33,7 +33,7 @@ public CompositionBehavior deserialize(JsonParser jp, DeserializationContext ctx
         }
       }
       // deserialize CompositionMultifeedBehavior
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("multifeed")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           return parser.readValueAs(CompositionMultifeedBehavior.class);
         } catch (Exception e) {
diff --git a/algoliasearch/src/main/java/com/algolia/model/composition/RulesBatchCompositionAction.java b/algoliasearch/src/main/java/com/algolia/model/composition/RulesBatchCompositionAction.java
@@ -22,7 +22,7 @@ class Deserializer extends JsonDeserializer<RulesBatchCompositionAction> {
     public RulesBatchCompositionAction deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
       // deserialize CompositionRule
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("consequence")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           return parser.readValueAs(CompositionRule.class);
         } catch (Exception e) {
diff --git a/algoliasearch/src/main/java/com/algolia/model/ingestion/TaskInput.java b/algoliasearch/src/main/java/com/algolia/model/ingestion/TaskInput.java
@@ -21,6 +21,15 @@ class Deserializer extends JsonDeserializer<TaskInput> {
     @Override
     public TaskInput deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
+      // deserialize ShopifyInput
+      if (tree.isObject() && tree.has("market") && tree.has("metafields")) {
+        try (JsonParser parser = tree.traverse(jp.getCodec())) {
+          return parser.readValueAs(ShopifyInput.class);
+        } catch (Exception e) {
+          // deserialization failed, continue
+          LOGGER.finest("Failed to deserialize oneOf ShopifyInput (error: " + e.getMessage() + ") (type: ShopifyInput)");
+        }
+      }
       // deserialize StreamingInput
       if (tree.isObject() && tree.has("mapping")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
@@ -39,15 +48,6 @@ public TaskInput deserialize(JsonParser jp, DeserializationContext ctxt) throws
           LOGGER.finest("Failed to deserialize oneOf DockerStreamsInput (error: " + e.getMessage() + ") (type: DockerStreamsInput)");
         }
       }
-      // deserialize ShopifyInput
-      if (tree.isObject()) {
-        try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(ShopifyInput.class);
-        } catch (Exception e) {
-          // deserialization failed, continue
-          LOGGER.finest("Failed to deserialize oneOf ShopifyInput (error: " + e.getMessage() + ") (type: ShopifyInput)");
-        }
-      }
       throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));
     }
 
diff --git a/algoliasearch/src/main/java/com/algolia/model/ingestion/TransformationInput.java b/algoliasearch/src/main/java/com/algolia/model/ingestion/TransformationInput.java
@@ -22,7 +22,7 @@ class Deserializer extends JsonDeserializer<TransformationInput> {
     public TransformationInput deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
       // deserialize TransformationCode
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("code")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           return parser.readValueAs(TransformationCode.class);
         } catch (Exception e) {
@@ -31,7 +31,7 @@ public TransformationInput deserialize(JsonParser jp, DeserializationContext ctx
         }
       }
       // deserialize TransformationNoCode
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("steps")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           return parser.readValueAs(TransformationNoCode.class);
         } catch (Exception e) {
diff --git a/algoliasearch/src/main/java/com/algolia/model/ingestion/Trigger.java b/algoliasearch/src/main/java/com/algolia/model/ingestion/Trigger.java
@@ -21,22 +21,22 @@ class Deserializer extends JsonDeserializer<Trigger> {
     @Override
     public Trigger deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
-      // deserialize OnDemandTrigger
-      if (tree.isObject()) {
+      // deserialize ScheduleTrigger
+      if (tree.isObject() && tree.has("cron") && tree.has("nextRun")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(OnDemandTrigger.class);
+          return parser.readValueAs(ScheduleTrigger.class);
         } catch (Exception e) {
           // deserialization failed, continue
-          LOGGER.finest("Failed to deserialize oneOf OnDemandTrigger (error: " + e.getMessage() + ") (type: OnDemandTrigger)");
+          LOGGER.finest("Failed to deserialize oneOf ScheduleTrigger (error: " + e.getMessage() + ") (type: ScheduleTrigger)");
         }
       }
-      // deserialize ScheduleTrigger
+      // deserialize OnDemandTrigger
       if (tree.isObject()) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(ScheduleTrigger.class);
+          return parser.readValueAs(OnDemandTrigger.class);
         } catch (Exception e) {
           // deserialization failed, continue
-          LOGGER.finest("Failed to deserialize oneOf ScheduleTrigger (error: " + e.getMessage() + ") (type: ScheduleTrigger)");
+          LOGGER.finest("Failed to deserialize oneOf OnDemandTrigger (error: " + e.getMessage() + ") (type: OnDemandTrigger)");
         }
       }
       // deserialize SubscriptionTrigger
diff --git a/algoliasearch/src/main/java/com/algolia/model/recommend/RecommendationsRequest.java b/algoliasearch/src/main/java/com/algolia/model/recommend/RecommendationsRequest.java
@@ -21,6 +21,15 @@ class Deserializer extends JsonDeserializer<RecommendationsRequest> {
     @Override
     public RecommendationsRequest deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
+      // deserialize TrendingFacetsQuery
+      if (tree.isObject() && tree.has("facetName")) {
+        try (JsonParser parser = tree.traverse(jp.getCodec())) {
+          return parser.readValueAs(TrendingFacetsQuery.class);
+        } catch (Exception e) {
+          // deserialization failed, continue
+          LOGGER.finest("Failed to deserialize oneOf TrendingFacetsQuery (error: " + e.getMessage() + ") (type: TrendingFacetsQuery)");
+        }
+      }
       // deserialize BoughtTogetherQuery
       if (tree.isObject()) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
@@ -48,15 +57,6 @@ public RecommendationsRequest deserialize(JsonParser jp, DeserializationContext
           LOGGER.finest("Failed to deserialize oneOf TrendingItemsQuery (error: " + e.getMessage() + ") (type: TrendingItemsQuery)");
         }
       }
-      // deserialize TrendingFacetsQuery
-      if (tree.isObject()) {
-        try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(TrendingFacetsQuery.class);
-        } catch (Exception e) {
-          // deserialization failed, continue
-          LOGGER.finest("Failed to deserialize oneOf TrendingFacetsQuery (error: " + e.getMessage() + ") (type: TrendingFacetsQuery)");
-        }
-      }
       // deserialize LookingSimilarQuery
       if (tree.isObject()) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
diff --git a/algoliasearch/src/main/java/com/algolia/model/search/AttributeToUpdate.java b/algoliasearch/src/main/java/com/algolia/model/search/AttributeToUpdate.java
@@ -54,23 +54,23 @@ class Deserializer extends JsonDeserializer<AttributeToUpdate> {
     @Override
     public AttributeToUpdate deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
-      // deserialize String
-      if (tree.isTextual()) {
+      // deserialize BuiltInOperation
+      if (tree.isObject() && tree.has("_operation") && tree.has("value")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          String value = parser.readValueAs(String.class);
-          return new AttributeToUpdate.StringWrapper(value);
+          return parser.readValueAs(BuiltInOperation.class);
         } catch (Exception e) {
           // deserialization failed, continue
-          LOGGER.finest("Failed to deserialize oneOf String (error: " + e.getMessage() + ") (type: String)");
+          LOGGER.finest("Failed to deserialize oneOf BuiltInOperation (error: " + e.getMessage() + ") (type: BuiltInOperation)");
         }
       }
-      // deserialize BuiltInOperation
-      if (tree.isObject()) {
+      // deserialize String
+      if (tree.isTextual()) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(BuiltInOperation.class);
+          String value = parser.readValueAs(String.class);
+          return new AttributeToUpdate.StringWrapper(value);
         } catch (Exception e) {
           // deserialization failed, continue
-          LOGGER.finest("Failed to deserialize oneOf BuiltInOperation (error: " + e.getMessage() + ") (type: BuiltInOperation)");
+          LOGGER.finest("Failed to deserialize oneOf String (error: " + e.getMessage() + ") (type: String)");
         }
       }
       throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));
diff --git a/algoliasearch/src/main/java/com/algolia/model/search/SearchResult.java b/algoliasearch/src/main/java/com/algolia/model/search/SearchResult.java
@@ -37,19 +37,8 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanPro
     @Override
     public SearchResult<T> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
-      // deserialize SearchForFacetValuesResponse
-      if (tree.isObject() && tree.has("facetHits")) {
-        try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(SearchForFacetValuesResponse.class);
-        } catch (Exception e) {
-          // deserialization failed, continue
-          LOGGER.finest(
-            "Failed to deserialize oneOf SearchForFacetValuesResponse (error: " + e.getMessage() + ") (type: SearchForFacetValuesResponse)"
-          );
-        }
-      }
       // deserialize SearchResponse
-      if (tree.isObject()) {
+      if (tree.isObject() && tree.has("hits")) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
           // For generic types, the innerType is erased by Java, we need to use the contextual type.
           JavaType innerType = ctxt.getTypeFactory().constructParametricType(SearchResponse.class, returnType);
@@ -62,6 +51,17 @@ public SearchResult<T> deserialize(JsonParser jp, DeserializationContext ctxt) t
           LOGGER.finest("Failed to deserialize oneOf SearchResponse (error: " + e.getMessage() + ") (type: SearchResponse)");
         }
       }
+      // deserialize SearchForFacetValuesResponse
+      if (tree.isObject() && tree.has("facetHits")) {
+        try (JsonParser parser = tree.traverse(jp.getCodec())) {
+          return parser.readValueAs(SearchForFacetValuesResponse.class);
+        } catch (Exception e) {
+          // deserialization failed, continue
+          LOGGER.finest(
+            "Failed to deserialize oneOf SearchForFacetValuesResponse (error: " + e.getMessage() + ") (type: SearchForFacetValuesResponse)"
+          );
+        }
+      }
       throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));
     }
 
