Skip to content

Commit 6ad1ce8

Browse files
Revert "Add @required annotation with optional validator (#1558)" (#1566)
This reverts commit 372fff8.
1 parent ab70b31 commit 6ad1ce8

File tree

8 files changed

+7
-353
lines changed

8 files changed

+7
-353
lines changed

slack-api-client/src/main/java/com/slack/api/SlackConfig.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ public void setFailOnUnknownProperties(boolean failOnUnknownProperties) {
6262
throwException();
6363
}
6464

65-
@Override
66-
public void setFailOnRequiredProperties(boolean failOnRequiredProperties) { throwException(); }
67-
6865
@Override
6966
public void setPrettyResponseLoggingEnabled(boolean prettyResponseLoggingEnabled) {
7067
throwException();
@@ -251,11 +248,6 @@ public void setLibraryMaintainerMode(boolean libraryMaintainerMode) {
251248
*/
252249
private boolean failOnUnknownProperties = false;
253250

254-
/**
255-
* If you would like to detect required properties by throwing exceptions, set this flag as true.
256-
*/
257-
private boolean failOnRequiredProperties = false;
258-
259251
/**
260252
* Slack Web API client verifies the existence of tokens before sending HTTP requests to Slack servers.
261253
*/

slack-api-client/src/main/java/com/slack/api/util/json/GsonFactory.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,12 @@ public static Gson createSnakeCase(SlackConfig config) {
4444
GsonBuilder gsonBuilder = new GsonBuilder()
4545
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
4646
registerTypeAdapters(gsonBuilder, failOnUnknownProps);
47-
4847
if (failOnUnknownProps || config.isLibraryMaintainerMode()) {
49-
gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
50-
}
51-
if (config.isFailOnRequiredProperties()) {
52-
gsonBuilder.registerTypeAdapterFactory(new RequiredPropertyDetectionAdapterFactory());
48+
gsonBuilder = gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
5349
}
5450
if (config.isPrettyResponseLoggingEnabled()) {
55-
gsonBuilder.setPrettyPrinting();
51+
gsonBuilder = gsonBuilder.setPrettyPrinting();
5652
}
57-
5853
return gsonBuilder.create();
5954
}
6055

@@ -65,17 +60,12 @@ public static Gson createCamelCase(SlackConfig config) {
6560
boolean failOnUnknownProps = config.isFailOnUnknownProperties();
6661
GsonBuilder gsonBuilder = new GsonBuilder();
6762
registerTypeAdapters(gsonBuilder, failOnUnknownProps);
68-
6963
if (failOnUnknownProps || config.isLibraryMaintainerMode()) {
70-
gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
71-
}
72-
if (config.isFailOnRequiredProperties()) {
73-
gsonBuilder.registerTypeAdapterFactory(new RequiredPropertyDetectionAdapterFactory());
64+
gsonBuilder = gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
7465
}
7566
if (config.isPrettyResponseLoggingEnabled()) {
76-
gsonBuilder.setPrettyPrinting();
67+
gsonBuilder = gsonBuilder.setPrettyPrinting();
7768
}
78-
7969
return gsonBuilder.create();
8070
}
8171

slack-api-model/src/main/java/com/slack/api/util/annotation/Required.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

slack-api-model/src/main/java/com/slack/api/util/json/RequiredPropertyDetectionAdapterFactory.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

slack-api-model/src/main/java/com/slack/api/util/predicate/FieldPredicate.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

slack-api-model/src/main/java/com/slack/api/util/predicate/IsNotNullFieldPredicate.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

slack-api-model/src/test/java/test_locally/unit/GsonFactory.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,7 @@ public static Gson createSnakeCaseWithoutUnknownPropertyDetection(boolean failOn
2727
return createSnakeCase(failOnUnknownProperties, false);
2828
}
2929

30-
public static Gson createSnakeCaseWithRequiredPropertyDetection() {
31-
return createSnakeCase(false, true, true);
32-
}
33-
3430
public static Gson createSnakeCase(boolean failOnUnknownProperties, boolean unknownPropertyDetection) {
35-
return createSnakeCase(failOnUnknownProperties, unknownPropertyDetection, false);
36-
}
37-
38-
public static Gson createSnakeCase(
39-
boolean failOnUnknownProperties,
40-
boolean unknownPropertyDetection,
41-
boolean failOnRequiredProperties
42-
) {
4331
GsonBuilder builder = new GsonBuilder()
4432
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
4533
.registerTypeAdapter(File.class, new GsonFileFactory(failOnUnknownProperties))
@@ -57,12 +45,9 @@ public static Gson createSnakeCase(
5745
new GsonMessageChangedEventPreviousMessageFactory(failOnUnknownProperties));
5846

5947
if (unknownPropertyDetection) {
60-
builder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
61-
}
62-
if (failOnRequiredProperties) {
63-
builder.registerTypeAdapterFactory(new RequiredPropertyDetectionAdapterFactory());
48+
return builder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory()).create();
49+
} else {
50+
return builder.create();
6451
}
65-
66-
return builder.create();
6752
}
6853
}

0 commit comments

Comments
 (0)