Skip to content
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

Jump to bottom

WFCORE-6984 Allow ResourceDefinition.builder(ResourceRegistration, ResourceDescriptionResolver, SubsystemModel) to accept a null deprecated model #6170

Merged
merged 1 commit into from
Sep 11, 2024
Merged

WFCORE-6984 Allow ResourceDefinition.builder(ResourceRegistration, ResourceDescriptionResolver, SubsystemModel) to accept a null deprecated model #6170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions controller/src/main/java/org/jboss/as/controller/ResourceDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -181,9 +182,10 @@ default boolean isFeature() {
* @param registration the resource registration
* @param descriptionResolver the resource description resolver
* @return a builder instance
* @throws NullPointerException if {@code registration} or {@code descriptionResolver} were null
*/
static Builder builder(ResourceRegistration registration, ResourceDescriptionResolver descriptionResolver) {
return new MinimalBuilder(registration, descriptionResolver);
return builder(registration, descriptionResolver, null);
}

/**
Expand All @@ -192,18 +194,24 @@ static Builder builder(ResourceRegistration registration, ResourceDescriptionRes
* @param descriptionResolver a resolver of model descriptions for this resource
* @param deprecation the model that deprecates this resource
* @return a builder instance
* @throws NullPointerException if {@code registration} or {@code descriptionResolver} were null
*/
static Builder builder(ResourceRegistration registration, ResourceDescriptionResolver descriptionResolver, SubsystemModel deprecation) {
return new MinimalBuilder(registration, descriptionResolver, new DeprecationData(deprecation.getVersion()));
Objects.requireNonNull(registration);
Objects.requireNonNull(descriptionResolver);
return new MinimalBuilder(registration, descriptionResolver, (deprecation != null) ? new DeprecationData(deprecation.getVersion()) : null);
}

/**
* Creates a {@link ResourceDefinition} builder using the specified registration and description resolver
* @param registration the resource registration
* @param descriptionProvider provides model descriptions for this resource
* @return a builder instance
* @throws NullPointerException if {@code registration} or {@code descriptionProvider} were null
*/
static Builder builder(ResourceRegistration registration, DescriptionProvider descriptionProvider) {
Objects.requireNonNull(registration);
Objects.requireNonNull(descriptionProvider);
return new MinimalBuilder(registration, descriptionProvider);
}

Expand Down Expand Up @@ -379,15 +387,6 @@ interface Builder extends Configurator<Builder> {
*/
static class MinimalBuilder extends AbstractConfigurator<Builder> implements Builder {

MinimalBuilder(ResourceRegistration registration, ResourceDescriptionResolver resolver) {
super(registration, new Function<>() {
@Override
public DescriptionProvider apply(ImmutableManagementResourceRegistration registration) {
return new DefaultResourceDescriptionProvider(registration, resolver);
}
});
}

MinimalBuilder(ResourceRegistration registration, ResourceDescriptionResolver resolver, DeprecationData deprecation) {
super(registration, new Function<>() {
@Override
Expand Down
Loading