Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/main/java/graphql/collect/ImmutableMapWithNullValues.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 <K> for key
* @param <V> for victory
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/graphql/schema/DataFetchingEnvironment.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro
<T> 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.
* <p>
* 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 <T> you decide what type it is
*
Expand All @@ -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.
* <p>
* 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()}
* <p>
* 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.
* <p>
* If the field is a top level field then 'localContext' equals null since it's never be set until those
* fields execute.
Expand Down Expand Up @@ -144,7 +144,7 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro
List<Field> 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.
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/graphql/schema/diff/DiffEvent.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package graphql.schema.diff;

import graphql.DeprecatedAt;
import graphql.PublicApi;
import graphql.language.TypeKind;

Expand Down Expand Up @@ -74,16 +73,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);
}
Expand Down