Skip to content

Commit 0f1a1e9

Browse files
fix(boxsdkgen): Remove enum types from GET enterprise configurations endpoint (box/box-openapi#560) (#1535)
1 parent e6924bb commit 0f1a1e9

File tree

5 files changed

+21
-116
lines changed

5 files changed

+21
-116
lines changed

.codegen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "engineHash": "b98d1dc", "specHash": "cf21406", "version": "5.0.0" }
1+
{ "engineHash": "4421f42", "specHash": "1715587", "version": "5.0.0" }
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package com.box.sdkgen.managers.enterpriseconfigurations;
22

3+
import java.util.List;
4+
35
public class GetEnterpriseConfigurationByIdV2025R0QueryParams {
46

57
/**
6-
* The comma-delimited list of the enterprise configuration categories. Allowed values:
7-
* `security`, `content_and_sharing`, `user_settings`, `shield`.
8+
* A comma-separated list of the enterprise configuration categories. Allowed values: `security`,
9+
* `content_and_sharing`, `user_settings`, `shield`.
810
*/
9-
public final String categories;
11+
public final List<String> categories;
1012

11-
public GetEnterpriseConfigurationByIdV2025R0QueryParams(String categories) {
13+
public GetEnterpriseConfigurationByIdV2025R0QueryParams(List<String> categories) {
1214
this.categories = categories;
1315
}
1416

15-
public String getCategories() {
17+
public List<String> getCategories() {
1618
return categories;
1719
}
1820
}

src/main/java/com/box/sdkgen/networking/retries/BoxRetryStrategy.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ public boolean shouldRetry(
3636
return attemptNumber <= this.maxRetriesOnException;
3737
}
3838
boolean isSuccessful = fetchResponse.getStatus() >= 200 && fetchResponse.getStatus() < 400;
39-
String retryAfterHeader = fetchResponse.getHeaders().get("Retry-After");
39+
String retryAfterHeader =
40+
(fetchResponse.getHeaders().containsKey("Retry-After")
41+
? fetchResponse.getHeaders().get("Retry-After")
42+
: null);
4043
boolean isAcceptedWithRetryAfter =
4144
fetchResponse.getStatus() == 202 && !(retryAfterHeader == null);
4245
if (attemptNumber >= this.maxAttempts) {
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
package com.box.sdkgen.schemas.v2025r0.enterpriseconfigurationcontentandsharingv2025r0;
22

3-
import com.box.sdkgen.schemas.v2025r0.collaborationrestrictionv2025r0.CollaborationRestrictionV2025R0;
43
import com.box.sdkgen.schemas.v2025r0.enterpriseconfigurationitemv2025r0.EnterpriseConfigurationItemV2025R0;
5-
import com.box.sdkgen.serialization.json.EnumWrapper;
6-
import com.box.sdkgen.serialization.json.Valuable;
74
import com.fasterxml.jackson.annotation.JsonFilter;
8-
import com.fasterxml.jackson.core.JsonGenerator;
9-
import com.fasterxml.jackson.core.JsonParser;
10-
import com.fasterxml.jackson.databind.DeserializationContext;
11-
import com.fasterxml.jackson.databind.JsonDeserializer;
12-
import com.fasterxml.jackson.databind.JsonNode;
13-
import com.fasterxml.jackson.databind.JsonSerializer;
14-
import com.fasterxml.jackson.databind.SerializerProvider;
15-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
16-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
17-
import java.io.IOException;
18-
import java.util.ArrayList;
195
import java.util.List;
206
import java.util.Objects;
217

228
@JsonFilter("nullablePropertyFilter")
239
public class EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField
2410
extends EnterpriseConfigurationItemV2025R0 {
2511

26-
@JsonDeserialize(using = ValueDeserializer.class)
27-
@JsonSerialize(using = ValueSerializer.class)
28-
protected List<EnumWrapper<CollaborationRestrictionV2025R0>> value;
12+
protected List<String> value;
2913

3014
public EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsField() {
3115
super();
@@ -38,7 +22,7 @@ protected EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictio
3822
markNullableFieldsAsSet(builder.getExplicitlySetNullableFields());
3923
}
4024

41-
public List<EnumWrapper<CollaborationRestrictionV2025R0>> getValue() {
25+
public List<String> getValue() {
4226
return value;
4327
}
4428

@@ -75,10 +59,10 @@ public String toString() {
7559

7660
public static class Builder extends EnterpriseConfigurationItemV2025R0.Builder {
7761

78-
protected List<EnumWrapper<CollaborationRestrictionV2025R0>> value;
62+
protected List<String> value;
7963

80-
public Builder value(List<? extends Valuable> value) {
81-
this.value = EnumWrapper.wrapValuableEnumList(value, CollaborationRestrictionV2025R0.class);
64+
public Builder value(List<String> value) {
65+
this.value = value;
8266
return this;
8367
}
8468

@@ -93,54 +77,4 @@ public EnterpriseConfigurationContentAndSharingV2025R0CollaborationRestrictionsF
9377
this);
9478
}
9579
}
96-
97-
public static class ValueDeserializer
98-
extends JsonDeserializer<List<EnumWrapper<CollaborationRestrictionV2025R0>>> {
99-
100-
public final JsonDeserializer<EnumWrapper<CollaborationRestrictionV2025R0>> elementDeserializer;
101-
102-
public ValueDeserializer() {
103-
super();
104-
this.elementDeserializer =
105-
new CollaborationRestrictionV2025R0.CollaborationRestrictionV2025R0Deserializer();
106-
}
107-
108-
@Override
109-
public List<EnumWrapper<CollaborationRestrictionV2025R0>> deserialize(
110-
JsonParser p, DeserializationContext ctxt) throws IOException {
111-
JsonNode node = p.getCodec().readTree(p);
112-
List<EnumWrapper<CollaborationRestrictionV2025R0>> elements = new ArrayList<>();
113-
for (JsonNode item : node) {
114-
JsonParser pa = item.traverse(p.getCodec());
115-
pa.nextToken();
116-
elements.add(elementDeserializer.deserialize(pa, ctxt));
117-
}
118-
return elements;
119-
}
120-
}
121-
122-
public static class ValueSerializer
123-
extends JsonSerializer<List<EnumWrapper<CollaborationRestrictionV2025R0>>> {
124-
125-
public final JsonSerializer<EnumWrapper<CollaborationRestrictionV2025R0>> elementSerializer;
126-
127-
public ValueSerializer() {
128-
super();
129-
this.elementSerializer =
130-
new CollaborationRestrictionV2025R0.CollaborationRestrictionV2025R0Serializer();
131-
}
132-
133-
@Override
134-
public void serialize(
135-
List<EnumWrapper<CollaborationRestrictionV2025R0>> value,
136-
JsonGenerator gen,
137-
SerializerProvider serializers)
138-
throws IOException {
139-
gen.writeStartArray();
140-
for (EnumWrapper<CollaborationRestrictionV2025R0> item : value) {
141-
elementSerializer.serialize(item, gen, serializers);
142-
}
143-
gen.writeEndArray();
144-
}
145-
}
14680
}

src/main/java/com/box/sdkgen/schemas/v2025r0/enterpriseconfigurationcontentandsharingv2025r0/EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField.java

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,15 @@
22

33
import com.box.sdkgen.internal.Nullable;
44
import com.box.sdkgen.schemas.v2025r0.enterpriseconfigurationitemv2025r0.EnterpriseConfigurationItemV2025R0;
5-
import com.box.sdkgen.serialization.json.EnumWrapper;
65
import com.fasterxml.jackson.annotation.JsonFilter;
7-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
8-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
96
import java.util.Objects;
107

118
@JsonFilter("nullablePropertyFilter")
129
public class EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField
1310
extends EnterpriseConfigurationItemV2025R0 {
1411

1512
/** The external collaboration status. */
16-
@JsonDeserialize(
17-
using =
18-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField
19-
.EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueFieldDeserializer
20-
.class)
21-
@JsonSerialize(
22-
using =
23-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField
24-
.EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueFieldSerializer
25-
.class)
26-
@Nullable
27-
protected EnumWrapper<
28-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField>
29-
value;
13+
@Nullable protected String value;
3014

3115
public EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusField() {
3216
super();
@@ -39,9 +23,7 @@ protected EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationSt
3923
markNullableFieldsAsSet(builder.getExplicitlySetNullableFields());
4024
}
4125

42-
public EnumWrapper<
43-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField>
44-
getValue() {
26+
public String getValue() {
4527
return value;
4628
}
4729

@@ -78,25 +60,9 @@ public String toString() {
7860

7961
public static class Builder extends EnterpriseConfigurationItemV2025R0.Builder {
8062

81-
protected EnumWrapper<
82-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField>
83-
value;
63+
protected String value;
8464

85-
public Builder value(
86-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField
87-
value) {
88-
this.value =
89-
new EnumWrapper<
90-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField>(
91-
value);
92-
this.markNullableFieldAsSet("value");
93-
return this;
94-
}
95-
96-
public Builder value(
97-
EnumWrapper<
98-
EnterpriseConfigurationContentAndSharingV2025R0ExternalCollaborationStatusFieldValueField>
99-
value) {
65+
public Builder value(String value) {
10066
this.value = value;
10167
this.markNullableFieldAsSet("value");
10268
return this;

0 commit comments

Comments
 (0)