diff --git a/.codegen.json b/.codegen.json index c7fca8329..fec4feaf5 100644 --- a/.codegen.json +++ b/.codegen.json @@ -1 +1 @@ -{ "engineHash": "b98d1dc", "specHash": "cf21406", "version": "5.0.0" } +{ "engineHash": "4421f42", "specHash": "1715587", "version": "5.0.0" } diff --git a/src/main/java/com/box/sdkgen/managers/enterpriseconfigurations/GetEnterpriseConfigurationByIdV2025R0QueryParams.java b/src/main/java/com/box/sdkgen/managers/enterpriseconfigurations/GetEnterpriseConfigurationByIdV2025R0QueryParams.java index 32ff3727b..59a2f1600 100644 --- a/src/main/java/com/box/sdkgen/managers/enterpriseconfigurations/GetEnterpriseConfigurationByIdV2025R0QueryParams.java +++ b/src/main/java/com/box/sdkgen/managers/enterpriseconfigurations/GetEnterpriseConfigurationByIdV2025R0QueryParams.java @@ -1,18 +1,20 @@ package com.box.sdkgen.managers.enterpriseconfigurations; +import java.util.List; + public class GetEnterpriseConfigurationByIdV2025R0QueryParams { /** - * The comma-delimited list of the enterprise configuration categories. Allowed values: - * `security`, `content_and_sharing`, `user_settings`, `shield`. + * A comma-separated list of the enterprise configuration categories. Allowed values: `security`, + * `content_and_sharing`, `user_settings`, `shield`. */ - public final String categories; + public final List categories; - public GetEnterpriseConfigurationByIdV2025R0QueryParams(String categories) { + public GetEnterpriseConfigurationByIdV2025R0QueryParams(List categories) { this.categories = categories; } - public String getCategories() { + public List getCategories() { return categories; } } diff --git a/src/main/java/com/box/sdkgen/networking/retries/BoxRetryStrategy.java b/src/main/java/com/box/sdkgen/networking/retries/BoxRetryStrategy.java index 6c2891681..dcba2d307 100644 --- a/src/main/java/com/box/sdkgen/networking/retries/BoxRetryStrategy.java +++ b/src/main/java/com/box/sdkgen/networking/retries/BoxRetryStrategy.java @@ -36,7 +36,10 @@ public boolean shouldRetry( return attemptNumber <= this.maxRetriesOnException; } boolean isSuccessful = fetchResponse.getStatus() >= 200 && fetchResponse.getStatus() < 400; - String retryAfterHeader = fetchResponse.getHeaders().get("Retry-After"); + String retryAfterHeader = + (fetchResponse.getHeaders().containsKey("Retry-After") + ? fetchResponse.getHeaders().get("Retry-After") + : null); boolean isAcceptedWithRetryAfter = fetchResponse.getStatus() == 202 && !(retryAfterHeader == null); if (attemptNumber >= this.maxAttempts) { diff --git a/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField.java b/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField.java index 60211ac36..ddd9f9733 100644 --- a/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField.java +++ b/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField.java @@ -1,21 +1,7 @@ package com.box.sdkgen.schemas.v2025r0.enterpriseconfigurationcontentandsharingv2025r0; -import com.box.sdkgen.schemas.v2025r0.collaborationrestrictionv2025r0.CollaborationRestrictionV2025R0; import com.box.sdkgen.schemas.v2025r0.enterpriseconfigurationitemv2025r0.EnterpriseConfigurationItemV2025R0; -import com.box.sdkgen.serialization.json.EnumWrapper; -import com.box.sdkgen.serialization.json.Valuable; import com.fasterxml.jackson.annotation.JsonFilter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import java.io.IOException; -import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -23,9 +9,7 @@ public class EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField extends EnterpriseConfigurationItemV2025R0 { - @JsonDeserialize(using = ValueDeserializer.class) - @JsonSerialize(using = ValueSerializer.class) - protected List> value; + protected List value; public EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField() { super(); @@ -38,7 +22,7 @@ protected EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictio markNullableFieldsAsSet(builder.getExplicitlySetNullableFields()); } - public List> getValue() { + public List getValue() { return value; } @@ -75,10 +59,10 @@ public String toString() { public static class Builder extends EnterpriseConfigurationItemV2025R0.Builder { - protected List> value; + protected List value; - public Builder value(List value) { - this.value = EnumWrapper.wrapValuableEnumList(value, CollaborationRestrictionV2025R0.class); + public Builder value(List value) { + this.value = value; return this; } @@ -93,54 +77,4 @@ public EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsF this); } } - - public static class ValueDeserializer - extends JsonDeserializer>> { - - public final JsonDeserializer> elementDeserializer; - - public ValueDeserializer() { - super(); - this.elementDeserializer = - new CollaborationRestrictionV2025R0.CollaborationRestrictionV2025R0Deserializer(); - } - - @Override - public List> deserialize( - JsonParser p, DeserializationContext ctxt) throws IOException { - JsonNode node = p.getCodec().readTree(p); - List> elements = new ArrayList<>(); - for (JsonNode item : node) { - JsonParser pa = item.traverse(p.getCodec()); - pa.nextToken(); - elements.add(elementDeserializer.deserialize(pa, ctxt)); - } - return elements; - } - } - - public static class ValueSerializer - extends JsonSerializer>> { - - public final JsonSerializer> elementSerializer; - - public ValueSerializer() { - super(); - this.elementSerializer = - new CollaborationRestrictionV2025R0.CollaborationRestrictionV2025R0Serializer(); - } - - @Override - public void serialize( - List> value, - JsonGenerator gen, - SerializerProvider serializers) - throws IOException { - gen.writeStartArray(); - for (EnumWrapper item : value) { - elementSerializer.serialize(item, gen, serializers); - } - gen.writeEndArray(); - } - } } diff --git a/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField.java b/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField.java index 57b84288a..d04cee9be 100644 --- a/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField.java +++ b/src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField.java @@ -2,10 +2,7 @@ import com.box.sdkgen.internal.Nullable; import com.box.sdkgen.schemas.v2025r0.enterpriseconfigurationitemv2025r0.EnterpriseConfigurationItemV2025R0; -import com.box.sdkgen.serialization.json.EnumWrapper; import com.fasterxml.jackson.annotation.JsonFilter; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Objects; @JsonFilter("nullablePropertyFilter") @@ -13,20 +10,7 @@ public class EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaboratio extends EnterpriseConfigurationItemV2025R0 { /** The external collaboration status. */ - @JsonDeserialize( - using = - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField - .EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueFieldDeserializer - .class) - @JsonSerialize( - using = - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField - .EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueFieldSerializer - .class) - @Nullable - protected EnumWrapper< - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField> - value; + @Nullable protected String value; public EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField() { super(); @@ -39,9 +23,7 @@ protected EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationSt markNullableFieldsAsSet(builder.getExplicitlySetNullableFields()); } - public EnumWrapper< - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField> - getValue() { + public String getValue() { return value; } @@ -78,25 +60,9 @@ public String toString() { public static class Builder extends EnterpriseConfigurationItemV2025R0.Builder { - protected EnumWrapper< - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField> - value; + protected String value; - public Builder value( - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField - value) { - this.value = - new EnumWrapper< - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField>( - value); - this.markNullableFieldAsSet("value"); - return this; - } - - public Builder value( - EnumWrapper< - EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField> - value) { + public Builder value(String value) { this.value = value; this.markNullableFieldAsSet("value"); return this;