From a49473f620d56877889fe37db2cb1c6b04517c69 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 12 Feb 2023 22:43:11 +1100 Subject: [PATCH 1/2] Remove long deprecated method --- .../collect/ImmutableMapWithNullValues.java | 6 +++--- .../graphql/schema/DataFetchingEnvironment.java | 14 +++++++------- src/main/java/graphql/schema/diff/DiffEvent.java | 10 ---------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/main/java/graphql/collect/ImmutableMapWithNullValues.java b/src/main/java/graphql/collect/ImmutableMapWithNullValues.java index 207ad9b5d..8eab40c56 100644 --- a/src/main/java/graphql/collect/ImmutableMapWithNullValues.java +++ b/src/main/java/graphql/collect/ImmutableMapWithNullValues.java @@ -14,9 +14,9 @@ import java.util.function.Function; /** - * The standard ImmutableMap does not allow null values. The implementation does. - * We have cases in graphql, around arguments where a mep entry can be explicitly set to null - * and we want immutable smart maps for these case. + * The standard ImmutableMap does not allow null values. The implementation does. + * We have cases in graphql, around arguments where a map entry can be explicitly set to null + * and we want immutable smart maps for these cases. * * @param for key * @param for victory diff --git a/src/main/java/graphql/schema/DataFetchingEnvironment.java b/src/main/java/graphql/schema/DataFetchingEnvironment.java index 578a234c3..aa36212d3 100644 --- a/src/main/java/graphql/schema/DataFetchingEnvironment.java +++ b/src/main/java/graphql/schema/DataFetchingEnvironment.java @@ -77,10 +77,10 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro T getArgumentOrDefault(String name, T defaultValue); /** - * Returns a legacy context argument that is set up when the {@link graphql.GraphQL#execute(graphql.ExecutionInput)} )} method + * Returns a legacy context argument that is set up when the {@link graphql.GraphQL#execute(graphql.ExecutionInput)} method * is invoked. *

- * This is a info object which is provided to all DataFetchers, but never used by graphql-java itself. + * This is an info object which is provided to all DataFetchers, but never used by graphql-java itself. * * @param you decide what type it is * @@ -96,19 +96,19 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro * Returns a shared context argument that is set up when the {@link graphql.GraphQL#execute(graphql.ExecutionInput)} )} method * is invoked. *

- * This is a info object which is provided to all DataFetchers. + * This is an info object which is provided to all DataFetchers. * * @return can NOT be null */ GraphQLContext getGraphQlContext(); /** - * This returns a context object that parent fields may have returned returned + * This returns a context object that parent fields may have returned * via {@link graphql.execution.DataFetcherResult#getLocalContext()} which can be used to pass down extra information to * fields beyond the normal {@link #getSource()} *

- * This differs from {@link #getContext()} in that it's field specific and passed from parent field to child field, - * whilst {@link #getContext()} is global for the whole query. + * This differs from {@link #getGraphQlContext()} in that it's field specific and passed from parent field to child field, + * whilst {@link #getGraphQlContext()} is global for the whole query. *

* If the field is a top level field then 'localContext' equals null since it's never be set until those * fields execute. @@ -144,7 +144,7 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro List getFields(); /** - * It can happen that a query has overlapping fields which are + * It can happen that a query has overlapping fields which * are querying the same data. If this is the case they get merged * together and fetched only once, but this method returns all of the Fields * from the query. diff --git a/src/main/java/graphql/schema/diff/DiffEvent.java b/src/main/java/graphql/schema/diff/DiffEvent.java index 11d07a60b..c871175c9 100644 --- a/src/main/java/graphql/schema/diff/DiffEvent.java +++ b/src/main/java/graphql/schema/diff/DiffEvent.java @@ -74,16 +74,6 @@ public String toString() { '}'; } - /** - * @return a Builder of Info level diff events - * @deprecated use {@link DiffEvent#apiInfo()} instead - */ - @Deprecated - @DeprecatedAt("2017-12-27") - public static Builder newInfo() { - return new Builder().level(DiffLevel.INFO); - } - public static Builder apiInfo() { return new Builder().level(DiffLevel.INFO); } From ea5be3fe013a73e7e465e83ad51332219dfda79d Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 12 Feb 2023 22:44:22 +1100 Subject: [PATCH 2/2] Remove deprecated method --- src/main/java/graphql/schema/diff/DiffEvent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/graphql/schema/diff/DiffEvent.java b/src/main/java/graphql/schema/diff/DiffEvent.java index c871175c9..1b58988ea 100644 --- a/src/main/java/graphql/schema/diff/DiffEvent.java +++ b/src/main/java/graphql/schema/diff/DiffEvent.java @@ -1,6 +1,5 @@ package graphql.schema.diff; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.language.TypeKind;