Skip to content

Commit

Permalink
fix(clients): highlight and snippet results e2e (generated)
Browse files Browse the repository at this point in the history 
algolia/api-clients-automation#3567

Co-authored-by: algolia-bot <accounts+algolia-api-client-bot@algolia.com>
Co-authored-by: Clément Vannicatte <vannicattec@gmail.com>
Co-authored-by: Pierre Millot <pierre.millot@algolia.com>
  • Loading branch information
@algolia-bot @shortcuts @millotp
3 people committed Aug 21, 2024
1 parent 18354a6 commit ba8f29f
Show file tree
Hide file tree
Showing 14 changed files with 141 additions and 137 deletions.
4 changes: 4 additions & 0 deletions algoliasearch/src/main/java/com/algolia/model/abtesting/ABTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -113,6 +114,9 @@ public ABTest setRevenueSignificance(Map<String, Double> revenueSignificance) {
}

public ABTest putRevenueSignificance(String key, Double revenueSignificanceItem) {
if (this.revenueSignificance == null) {
this.revenueSignificance = new HashMap<>();
}
this.revenueSignificance.put(key, revenueSignificanceItem);
return this;
}
Expand Down
18 changes: 9 additions & 9 deletions algoliasearch/src/main/java/com/algolia/model/abtesting/AddABTestsVariant.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ class Deserializer extends JsonDeserializer<AddABTestsVariant> {
@Override
public AddABTestsVariant deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize AbTestsVariant
if (tree.isObject()) {
// deserialize AbTestsVariantSearchParams
if (tree.isObject() && tree.has("customSearchParameters")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AbTestsVariant.class);
return parser.readValueAs(AbTestsVariantSearchParams.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf AbTestsVariant (error: " + e.getMessage() + ") (type: AbTestsVariant)");
LOGGER.finest(
"Failed to deserialize oneOf AbTestsVariantSearchParams (error: " + e.getMessage() + ") (type: AbTestsVariantSearchParams)"
);
}
}
// deserialize AbTestsVariantSearchParams
// deserialize AbTestsVariant
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AbTestsVariantSearchParams.class);
return parser.readValueAs(AbTestsVariant.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf AbTestsVariantSearchParams (error: " + e.getMessage() + ") (type: AbTestsVariantSearchParams)"
);
LOGGER.finest("Failed to deserialize oneOf AbTestsVariant (error: " + e.getMessage() + ") (type: AbTestsVariant)");
}
}
throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));
Expand Down
24 changes: 12 additions & 12 deletions algoliasearch/src/main/java/com/algolia/model/ingestion/AuthInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,17 @@ class Deserializer extends JsonDeserializer<AuthInput> {
@Override
public AuthInput deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize AuthOAuth
if (tree.isObject() && tree.has("url") && tree.has("client_id") && tree.has("client_secret")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthOAuth.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf AuthOAuth (error: " + e.getMessage() + ") (type: AuthOAuth)");
}
}
// deserialize AuthGoogleServiceAccount
if (tree.isObject()) {
if (tree.isObject() && tree.has("clientEmail") && tree.has("privateKey")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthGoogleServiceAccount.class);
} catch (Exception e) {
Expand All @@ -33,7 +42,7 @@ public AuthInput deserialize(JsonParser jp, DeserializationContext ctxt) throws
}
}
// deserialize AuthBasic
if (tree.isObject()) {
if (tree.isObject() && tree.has("username") && tree.has("password")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthBasic.class);
} catch (Exception e) {
Expand All @@ -42,23 +51,14 @@ public AuthInput deserialize(JsonParser jp, DeserializationContext ctxt) throws
}
}
// deserialize AuthAPIKey
if (tree.isObject()) {
if (tree.isObject() && tree.has("key")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthAPIKey.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf AuthAPIKey (error: " + e.getMessage() + ") (type: AuthAPIKey)");
}
}
// deserialize AuthOAuth
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthOAuth.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf AuthOAuth (error: " + e.getMessage() + ") (type: AuthOAuth)");
}
}
// deserialize AuthAlgolia
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand Down
8 changes: 4 additions & 4 deletions algoliasearch/src/main/java/com/algolia/model/ingestion/AuthInputPartial.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Deserializer extends JsonDeserializer<AuthInputPartial> {
public AuthInputPartial deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize AuthGoogleServiceAccountPartial
if (tree.isObject()) {
if (tree.isObject() && tree.has("clientEmail")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthGoogleServiceAccountPartial.class);
} catch (Exception e) {
Expand All @@ -35,7 +35,7 @@ public AuthInputPartial deserialize(JsonParser jp, DeserializationContext ctxt)
}
}
// deserialize AuthBasicPartial
if (tree.isObject()) {
if (tree.isObject() && tree.has("username")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthBasicPartial.class);
} catch (Exception e) {
Expand All @@ -44,7 +44,7 @@ public AuthInputPartial deserialize(JsonParser jp, DeserializationContext ctxt)
}
}
// deserialize AuthAPIKeyPartial
if (tree.isObject()) {
if (tree.isObject() && tree.has("key")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthAPIKeyPartial.class);
} catch (Exception e) {
Expand All @@ -53,7 +53,7 @@ public AuthInputPartial deserialize(JsonParser jp, DeserializationContext ctxt)
}
}
// deserialize AuthOAuthPartial
if (tree.isObject()) {
if (tree.isObject() && tree.has("url")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(AuthOAuthPartial.class);
} catch (Exception e) {
Expand Down
48 changes: 24 additions & 24 deletions algoliasearch/src/main/java/com/algolia/model/ingestion/SourceInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,26 @@ class Deserializer extends JsonDeserializer<SourceInput> {
@Override
public SourceInput deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize SourceDocker
if (tree.isObject() && tree.has("registry") && tree.has("image") && tree.has("imageType") && tree.has("configuration")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceDocker.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf SourceDocker (error: " + e.getMessage() + ") (type: SourceDocker)");
}
}
// deserialize SourceGA4BigQueryExport
if (tree.isObject() && tree.has("projectID") && tree.has("datasetID") && tree.has("tablePrefix")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceGA4BigQueryExport.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf SourceGA4BigQueryExport (error: " + e.getMessage() + ") (type: SourceGA4BigQueryExport)"
);
}
}
// deserialize SourceCommercetools
if (tree.isObject() && tree.has("projectKey")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand Down Expand Up @@ -48,15 +68,13 @@ public SourceInput deserialize(JsonParser jp, DeserializationContext ctxt) throw
LOGGER.finest("Failed to deserialize oneOf SourceBigQuery (error: " + e.getMessage() + ") (type: SourceBigQuery)");
}
}
// deserialize SourceGA4BigQueryExport
if (tree.isObject() && tree.has("projectID") && tree.has("datasetID") && tree.has("tablePrefix")) {
// deserialize SourceShopify
if (tree.isObject() && tree.has("shopURL")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceGA4BigQueryExport.class);
return parser.readValueAs(SourceShopify.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf SourceGA4BigQueryExport (error: " + e.getMessage() + ") (type: SourceGA4BigQueryExport)"
);
LOGGER.finest("Failed to deserialize oneOf SourceShopify (error: " + e.getMessage() + ") (type: SourceShopify)");
}
}
// deserialize SourceJSON
Expand All @@ -77,24 +95,6 @@ public SourceInput deserialize(JsonParser jp, DeserializationContext ctxt) throw
LOGGER.finest("Failed to deserialize oneOf SourceCSV (error: " + e.getMessage() + ") (type: SourceCSV)");
}
}
// deserialize SourceDocker
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceDocker.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf SourceDocker (error: " + e.getMessage() + ") (type: SourceDocker)");
}
}
// deserialize SourceShopify
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceShopify.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf SourceShopify (error: " + e.getMessage() + ") (type: SourceShopify)");
}
}
throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));
}

Expand Down
30 changes: 15 additions & 15 deletions algoliasearch/src/main/java/com/algolia/model/ingestion/SourceUpdateInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ class Deserializer extends JsonDeserializer<SourceUpdateInput> {
@Override
public SourceUpdateInput deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize SourceGA4BigQueryExport
if (tree.isObject() && tree.has("projectID") && tree.has("datasetID") && tree.has("tablePrefix")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceGA4BigQueryExport.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf SourceGA4BigQueryExport (error: " + e.getMessage() + ") (type: SourceGA4BigQueryExport)"
);
}
}
// deserialize SourceBigQuery
if (tree.isObject() && tree.has("projectID")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand All @@ -30,15 +41,13 @@ public SourceUpdateInput deserialize(JsonParser jp, DeserializationContext ctxt)
LOGGER.finest("Failed to deserialize oneOf SourceBigQuery (error: " + e.getMessage() + ") (type: SourceBigQuery)");
}
}
// deserialize SourceGA4BigQueryExport
if (tree.isObject() && tree.has("projectID") && tree.has("datasetID") && tree.has("tablePrefix")) {
// deserialize SourceUpdateDocker
if (tree.isObject() && tree.has("configuration")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceGA4BigQueryExport.class);
return parser.readValueAs(SourceUpdateDocker.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf SourceGA4BigQueryExport (error: " + e.getMessage() + ") (type: SourceGA4BigQueryExport)"
);
LOGGER.finest("Failed to deserialize oneOf SourceUpdateDocker (error: " + e.getMessage() + ") (type: SourceUpdateDocker)");
}
}
// deserialize SourceUpdateCommercetools
Expand Down Expand Up @@ -70,15 +79,6 @@ public SourceUpdateInput deserialize(JsonParser jp, DeserializationContext ctxt)
LOGGER.finest("Failed to deserialize oneOf SourceCSV (error: " + e.getMessage() + ") (type: SourceCSV)");
}
}
// deserialize SourceUpdateDocker
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(SourceUpdateDocker.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf SourceUpdateDocker (error: " + e.getMessage() + ") (type: SourceUpdateDocker)");
}
}
// deserialize SourceUpdateShopify
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand Down
14 changes: 7 additions & 7 deletions algoliasearch/src/main/java/com/algolia/model/ingestion/TaskCreateTrigger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ class Deserializer extends JsonDeserializer<TaskCreateTrigger> {
@Override
public TaskCreateTrigger deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize OnDemandTriggerInput
if (tree.isObject()) {
// deserialize ScheduleTriggerInput
if (tree.isObject() && tree.has("cron")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(OnDemandTriggerInput.class);
return parser.readValueAs(ScheduleTriggerInput.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf OnDemandTriggerInput (error: " + e.getMessage() + ") (type: OnDemandTriggerInput)");
LOGGER.finest("Failed to deserialize oneOf ScheduleTriggerInput (error: " + e.getMessage() + ") (type: ScheduleTriggerInput)");
}
}
// deserialize ScheduleTriggerInput
// deserialize OnDemandTriggerInput
if (tree.isObject()) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(ScheduleTriggerInput.class);
return parser.readValueAs(OnDemandTriggerInput.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf ScheduleTriggerInput (error: " + e.getMessage() + ") (type: ScheduleTriggerInput)");
LOGGER.finest("Failed to deserialize oneOf OnDemandTriggerInput (error: " + e.getMessage() + ") (type: OnDemandTriggerInput)");
}
}
// deserialize SubscriptionTrigger
Expand Down
4 changes: 2 additions & 2 deletions algoliasearch/src/main/java/com/algolia/model/ingestion/TaskInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Deserializer extends JsonDeserializer<TaskInput> {
public TaskInput deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize StreamingInput
if (tree.isObject()) {
if (tree.isObject() && tree.has("mapping")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(StreamingInput.class);
} catch (Exception e) {
Expand All @@ -31,7 +31,7 @@ public TaskInput deserialize(JsonParser jp, DeserializationContext ctxt) throws
}
}
// deserialize DockerStreamsInput
if (tree.isObject()) {
if (tree.isObject() && tree.has("streams")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(DockerStreamsInput.class);
} catch (Exception e) {
Expand Down
52 changes: 26 additions & 26 deletions algoliasearch/src/main/java/com/algolia/model/insights/EventsItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@ class Deserializer extends JsonDeserializer<EventsItems> {
@Override
public EventsItems deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode tree = jp.readValueAsTree();
// deserialize ClickedObjectIDsAfterSearch
if (tree.isObject() && tree.has("positions") && tree.has("queryID") && tree.has("eventType")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(ClickedObjectIDsAfterSearch.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf ClickedObjectIDsAfterSearch (error: " + e.getMessage() + ") (type: ClickedObjectIDsAfterSearch)"
);
}
}
// deserialize AddedToCartObjectIDsAfterSearch
if (tree.isObject() && tree.has("eventType") && tree.has("eventSubtype") && tree.has("queryID") && tree.has("objectIDs")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand All @@ -58,28 +47,17 @@ public EventsItems deserialize(JsonParser jp, DeserializationContext ctxt) throw
);
}
}
// deserialize ConvertedObjectIDsAfterSearch
if (tree.isObject() && tree.has("queryID") && tree.has("eventType")) {
// deserialize ClickedObjectIDsAfterSearch
if (tree.isObject() && tree.has("positions") && tree.has("queryID") && tree.has("eventType")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(ConvertedObjectIDsAfterSearch.class);
return parser.readValueAs(ClickedObjectIDsAfterSearch.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf ConvertedObjectIDsAfterSearch (error: " +
e.getMessage() +
") (type: ConvertedObjectIDsAfterSearch)"
"Failed to deserialize oneOf ClickedObjectIDsAfterSearch (error: " + e.getMessage() + ") (type: ClickedObjectIDsAfterSearch)"
);
}
}
// deserialize ClickedObjectIDs
if (tree.isObject() && tree.has("eventType") && tree.has("objectIDs")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(ClickedObjectIDs.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf ClickedObjectIDs (error: " + e.getMessage() + ") (type: ClickedObjectIDs)");
}
}
// deserialize PurchasedObjectIDs
if (tree.isObject() && tree.has("eventType") && tree.has("eventSubtype") && tree.has("objectIDs")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand All @@ -98,6 +76,28 @@ public EventsItems deserialize(JsonParser jp, DeserializationContext ctxt) throw
LOGGER.finest("Failed to deserialize oneOf AddedToCartObjectIDs (error: " + e.getMessage() + ") (type: AddedToCartObjectIDs)");
}
}
// deserialize ConvertedObjectIDsAfterSearch
if (tree.isObject() && tree.has("queryID") && tree.has("eventType")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(ConvertedObjectIDsAfterSearch.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest(
"Failed to deserialize oneOf ConvertedObjectIDsAfterSearch (error: " +
e.getMessage() +
") (type: ConvertedObjectIDsAfterSearch)"
);
}
}
// deserialize ClickedObjectIDs
if (tree.isObject() && tree.has("eventType") && tree.has("objectIDs")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
return parser.readValueAs(ClickedObjectIDs.class);
} catch (Exception e) {
// deserialization failed, continue
LOGGER.finest("Failed to deserialize oneOf ClickedObjectIDs (error: " + e.getMessage() + ") (type: ClickedObjectIDs)");
}
}
// deserialize ConvertedObjectIDs
if (tree.isObject() && tree.has("eventType") && tree.has("objectIDs")) {
try (JsonParser parser = tree.traverse(jp.getCodec())) {
Expand Down
Loading

0 comments on commit ba8f29f

Please sign in to comment.