Skip to content

Revert "Add @Required annotation with optional validator (#1558)" #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
WilliamBergamin wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Revert "Add @Required annotation with optional validator (#1558)" #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ca637
Revert "Add @Required annotation with optional validator (#1558)"
WilliamBergamin Mar 4, 2026
7205d0e
Merge branch 'main' into revert-#1558
WilliamBergamin Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions slack-api-client/src/main/java/com/slack/api/SlackConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ public void setFailOnUnknownProperties(boolean failOnUnknownProperties) {
throwException();
}

@Override
public void setFailOnRequiredProperties(boolean failOnRequiredProperties) { throwException(); }

@Override
public void setPrettyResponseLoggingEnabled(boolean prettyResponseLoggingEnabled) {
throwException();
Expand Down Expand Up @@ -251,11 +248,6 @@ public void setLibraryMaintainerMode(boolean libraryMaintainerMode) {
*/
private boolean failOnUnknownProperties = false;

/**
* If you would like to detect required properties by throwing exceptions, set this flag as true.
*/
private boolean failOnRequiredProperties = false;

/**
* Slack Web API client verifies the existence of tokens before sending HTTP requests to Slack servers.
*/
Expand Down
18 changes: 4 additions & 14 deletions slack-api-client/src/main/java/com/slack/api/util/json/GsonFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,12 @@ public static Gson createSnakeCase(SlackConfig config) {
GsonBuilder gsonBuilder = new GsonBuilder()
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
registerTypeAdapters(gsonBuilder, failOnUnknownProps);

if (failOnUnknownProps || config.isLibraryMaintainerMode()) {
gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
}
if (config.isFailOnRequiredProperties()) {
gsonBuilder.registerTypeAdapterFactory(new RequiredPropertyDetectionAdapterFactory());
gsonBuilder = gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
}
if (config.isPrettyResponseLoggingEnabled()) {
gsonBuilder.setPrettyPrinting();
gsonBuilder = gsonBuilder.setPrettyPrinting();
}

return gsonBuilder.create();
}

Expand All @@ -65,17 +60,12 @@ public static Gson createCamelCase(SlackConfig config) {
boolean failOnUnknownProps = config.isFailOnUnknownProperties();
GsonBuilder gsonBuilder = new GsonBuilder();
registerTypeAdapters(gsonBuilder, failOnUnknownProps);

if (failOnUnknownProps || config.isLibraryMaintainerMode()) {
gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
}
if (config.isFailOnRequiredProperties()) {
gsonBuilder.registerTypeAdapterFactory(new RequiredPropertyDetectionAdapterFactory());
gsonBuilder = gsonBuilder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
}
if (config.isPrettyResponseLoggingEnabled()) {
gsonBuilder.setPrettyPrinting();
gsonBuilder = gsonBuilder.setPrettyPrinting();
}

return gsonBuilder.create();
}

Expand Down
29 changes: 0 additions & 29 deletions slack-api-model/src/main/java/com/slack/api/util/annotation/Required.java
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions ...-model/src/main/java/com/slack/api/util/json/RequiredPropertyDetectionAdapterFactory.java
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions slack-api-model/src/main/java/com/slack/api/util/predicate/FieldPredicate.java
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions slack-api-model/src/main/java/com/slack/api/util/predicate/IsNotNullFieldPredicate.java
View file
Open in desktop

This file was deleted.

21 changes: 3 additions & 18 deletions slack-api-model/src/test/java/test_locally/unit/GsonFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,7 @@ public static Gson createSnakeCaseWithoutUnknownPropertyDetection(boolean failOn
return createSnakeCase(failOnUnknownProperties, false);
}

public static Gson createSnakeCaseWithRequiredPropertyDetection() {
return createSnakeCase(false, true, true);
}

public static Gson createSnakeCase(boolean failOnUnknownProperties, boolean unknownPropertyDetection) {
return createSnakeCase(failOnUnknownProperties, unknownPropertyDetection, false);
}

public static Gson createSnakeCase(
boolean failOnUnknownProperties,
boolean unknownPropertyDetection,
boolean failOnRequiredProperties
) {
GsonBuilder builder = new GsonBuilder()
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
.registerTypeAdapter(File.class, new GsonFileFactory(failOnUnknownProperties))
Expand All @@ -57,12 +45,9 @@ public static Gson createSnakeCase(
new GsonMessageChangedEventPreviousMessageFactory(failOnUnknownProperties));

if (unknownPropertyDetection) {
builder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory());
}
if (failOnRequiredProperties) {
builder.registerTypeAdapterFactory(new RequiredPropertyDetectionAdapterFactory());
return builder.registerTypeAdapterFactory(new UnknownPropertyDetectionAdapterFactory()).create();
} else {
return builder.create();
}

return builder.create();
}
}
Loading