8000 Removed deprecated methods in GraphQLSchema by bbakerman · Pull Request #3515 · graphql-java/graphql-java · GitHub
[go: up one dir, main page]
Skip to content

Removed deprecated methods in GraphQLSchema #3515

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

Merged
andimarek merged 1 commit into from
Mar 26, 2024
Merged

Removed deprecated methods in GraphQLSchema #3515

Show file tree
Hide file tree
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
56 changes: 1 addition & 55 deletions src/main/java/graphql/schema/GraphQLSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import graphql.schema.validation.InvalidSchemaException;
import graphql.schema.validation.SchemaValidationError;
import graphql.schema.validation.SchemaValidator;
import graphql.schema.visibility.GraphqlFieldVisibility;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -412,16 +411,6 @@ public GraphQLObjectType getSubscriptionType() {
return subscriptionType;
}

/**
* @return the field visibility
*
* @deprecated use {@link GraphQLCodeRegistry#getFieldVisibility()} instead
*/
@Deprecated(since = "2018-12-03")
public GraphqlFieldVisibility getFieldVisibility() {
return codeRegistry.getFieldVisibility();
}
Copy link
Member
@dondonz dondonz Mar 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2018!


/**
* This returns the list of directives definitions that are associated with this schema object including
* built in ones.
Expand Down Expand Up @@ -451,7 +440,6 @@ public GraphQLDirective getDirective(String directiveName) {
}



/**
* This returns the list of directives that have been explicitly applied to the
* schema object. Note that {@link #getDirectives()} will return
Expand Down Expand Up @@ -729,19 +717,6 @@ public Builder subscription(GraphQLObjectType subscriptionType) {
return this;
}

/**
* @param fieldVisibility the field visibility
*
* @return this builder
*
* @deprecated use {@link graphql.schema.GraphQLCodeRegistry.Builder#fieldVisibility(graphql.schema.visibility.GraphqlFieldVisibility)} instead
*/
@Deprecated(since = "2018-12-03")
public Builder fieldVisibility(GraphqlFieldVisibility fieldVisibility) {
this.codeRegistry = this.codeRegistry.transform(builder -> builder.fieldVisibility(fieldVisibility));
return this;
}

public Builder codeRegistry(GraphQLCodeRegistry codeRegistry) {
this.codeRegistry = codeRegistry;
return this;
Expand Down Expand Up @@ -857,35 +832,6 @@ public Builder introspectionSchemaType(GraphQLObjectType introspectionSchemaType
return this;
}

/**
* Builds the schema
*
* @param additionalTypes - please don't use this anymore
*
* @return the built schema
*
* @deprecated - Use the {@link #additionalType(GraphQLType)} methods
*/
@Deprecated(since = "2018-07-30")
public GraphQLSchema build(Set<GraphQLType> additionalTypes) {
return additionalTypes(additionalTypes).build();
}

/**
* Builds the schema
*
* @param additionalTypes - please don't use this anymore
* @param additionalDirectives - please don't use this anymore
*
* @return the built schema
*
* @deprecated - Use the {@link #additionalType(GraphQLType)} and {@link #additionalDirective(GraphQLDirective)} methods
*/
@Deprecated(since = "2018-07-30")
public GraphQLSchema build(Set<GraphQLType> additionalTypes, Set<GraphQLDirective> additionalDirectives) {
return additionalTypes(additionalTypes).additionalDirectives(additionalDirectives).build();
}

/**
* Builds the schema
*
Expand Down Expand Up @@ -935,7 +881,7 @@ private GraphQLSchema buildImpl() {

private GraphQLSchema validateSchema(GraphQLSchema graphQLSchema) {
Collection<SchemaValidationError> errors = new SchemaValidator().validateSchema(graphQLSchema);
if (errors.size() > 0) {
if (!errors.isEmpty()) {
throw new InvalidSchemaException(errors);
}
return graphQLSchema;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/graphql/validation/TraversalContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private void enterImpl(ObjectField objectField) {
GraphQLInputObjectField inputField = null;
if (objectType instanceof GraphQLInputObjectType) {
GraphQLInputObjectType inputObjectType = (GraphQLInputObjectType) objectType;
inputField = schema.getFieldVisibility().getFieldDefinition(inputObjectType, objectField.getName());
inputField = schema.getCodeRegistry().getFieldVisibility().getFieldDefinition(inputObjectType, objectField.getName());
if (inputField != null) {
inputType = inputField.getType();
}
Expand Down Expand Up @@ -337,7 +337,7 @@ private GraphQLFieldDefinition getFieldDef(GraphQLSchema schema, GraphQLType par
return schema.getIntrospectionTypenameFieldDefinition();
}
if (parentType instanceof GraphQLFieldsContainer) {
return schema.getFieldVisibility().getFieldDefinition((GraphQLFieldsContainer) parentType, field.getName());
return schema.getCodeRegistry().getFieldVisibility().getFieldDefinition((GraphQLFieldsContainer) parentType, field.getName());
}
return null;
}
Expand Down
31 changes: 0 additions & 31 deletions src/test/groovy/graphql/schema/visibility/GraphqlFieldVisibilityTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,6 @@ import static graphql.schema.visibility.NoIntrospectionGraphqlFieldVisibility.NO

class GraphqlFieldVisibilityTest extends Specification {

def "visibility is enforced"() {
GraphqlFieldVisibility banNameVisibility = newBlock().addPattern(".*\\.name").build()
def schema = GraphQLSchema.newSchema()
.query(StarWarsSchema.queryType)
.codeRegistry(StarWarsSchema.codeRegistry)
.fieldVisibility(banNameVisibility) // Retain deprecated builder for test coverage
.build()

def graphQL = GraphQL.newGraphQL(schema).build()

given:
def query = """
{
hero {
id
name
friends {
aliasHandled: name
}
}
}
"""

when:
def result = graphQL.execute(query)

then:
result.errors[0].getMessage().contains("Field 'name' in type 'Character' is undefined")
result.errors[1].getMessage().contains("Field 'name' in type 'Character' is undefined")
}

def "introspection visibility is enforced"() {
given:
GraphQLCodeRegistry codeRegistry = StarWarsSchema.codeRegistry.transform(builder -> {
Expand Down
0