Code health - IDEA suggestions and general tweaks (#767)

bbakerman · web-flow · commit ea9a01530327 · 2017-10-11T20:56:50.000+11:00
diff --git a/src/main/java/graphql/analysis/QueryTraversal.java b/src/main/java/graphql/analysis/QueryTraversal.java
@@ -76,13 +76,15 @@ private GraphQLObjectType getRootType() {
         }
     }
 
+    @SuppressWarnings("unchecked")
     public <T> T reducePostOrder(QueryReducer<T> queryReducer, T initialValue) {
         // compiler hack to make acc final and mutable :-)
         final Object[] acc = {initialValue};
         visitPostOrder((env) -> acc[0] = queryReducer.reduceField(env, (T) acc[0]));
         return (T) acc[0];
     }
 
+    @SuppressWarnings("unchecked")
     public <T> T reducePreOrder(QueryReducer<T> queryReducer, T initialValue) {
         // compiler hack to make acc final and mutable :-)
         final Object[] acc = {initialValue};
diff --git a/src/main/java/graphql/execution/AsyncSerialExecutionStrategy.java b/src/main/java/graphql/execution/AsyncSerialExecutionStrategy.java
@@ -1,13 +1,11 @@
 package graphql.execution;
 
 import graphql.ExecutionResult;
-import graphql.ExecutionResultImpl;
 import graphql.execution.instrumentation.InstrumentationContext;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters;
 import graphql.language.Field;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -46,7 +44,7 @@ public CompletableFuture<ExecutionResult> execute(ExecutionContext executionCont
         BiConsumer<List<ExecutionResult>, Throwable> listThrowableBiConsumer = handleResults(executionContext, fieldNames, overallResult);
         resultsFuture.whenComplete(listThrowableBiConsumer);
 
-        executionStrategyCtx.onEnd(overallResult,null);
+        executionStrategyCtx.onEnd(overallResult, null);
         return overallResult;
     }
 
diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
@@ -88,8 +88,8 @@ public Object getContext() {
         return context;
     }
 
+    @SuppressWarnings("unchecked")
     public <T> T getRoot() {
-        //noinspection unchecked
         return (T) root;
     }
 
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -413,13 +413,13 @@ protected Object unboxPossibleOptional(Object result) {
      *
      * @throws java.lang.ClassCastException if its not an Iterable
      */
+    @SuppressWarnings("unchecked")
     protected Iterable<Object> toIterable(Object result) {
         if (result.getClass().isArray()) {
             return IntStream.range(0, Array.getLength(result))
                     .mapToObj(i -> Array.get(result, i))
                     .collect(toList());
         }
-        //noinspection unchecked
         return (Iterable<Object>) result;
     }
 
@@ -504,6 +504,7 @@ protected CompletableFuture<ExecutionResult> completeValueForScalar(ExecutionCon
         return completedFuture(new ExecutionResultImpl(serialized, null));
     }
 
+    @SuppressWarnings("SameReturnValue")
     private Object handleCoercionProblem(ExecutionContext context, ExecutionStrategyParameters parameters, CoercingSerializeException e) {
         SerializationError error = new SerializationError(parameters.path(), e);
         log.warn(error.getMessage(), e);
diff --git a/src/main/java/graphql/execution/ValuesResolver.java b/src/main/java/graphql/execution/ValuesResolver.java
@@ -137,6 +137,7 @@ private Map<String, Argument> argumentMap(List<Argument> arguments) {
     }
 
 
+    @SuppressWarnings("unchecked")
     private Object coerceValue(VariableDefinition variableDefinition, GraphQLType graphQLType, Object value) {
         if (graphQLType instanceof GraphQLNonNull) {
             Object returnValue = coerceValue(variableDefinition, ((GraphQLNonNull) graphQLType).getWrappedType(), value);
@@ -158,7 +159,6 @@ private Object coerceValue(VariableDefinition variableDefinition, GraphQLType gr
             return coerceValueForList(variableDefinition, (GraphQLList) graphQLType, value);
         } else if (graphQLType instanceof GraphQLInputObjectType) {
             if (value instanceof Map) {
-                //noinspection unchecked
                 return coerceValueForInputObjectType(variableDefinition, (GraphQLInputObjectType) graphQLType, (Map<String, Object>) value);
             } else {
                 throw new CoercingParseValueException("Variables for GraphQLInputObjectType must be an instance of a Map according to the graphql specification.  The offending object was a " + value.getClass().getName());
diff --git a/src/main/java/graphql/introspection/Introspection.java b/src/main/java/graphql/introspection/Introspection.java
@@ -335,6 +335,7 @@ public enum DirectiveLocation {
 
             .build();
 
+    @SuppressWarnings("deprecation") // because graphql spec still has the deprecated fields
     public static GraphQLObjectType __Directive = newObject()
             .name("__Directive")
             .field(newFieldDefinition()
diff --git a/src/main/java/graphql/language/TypeDefinition.java b/src/main/java/graphql/language/TypeDefinition.java
@@ -2,7 +2,6 @@
 
 
 import java.util.List;
-import java.util.Map;
 
 public interface TypeDefinition extends Node, Definition {
     /**
diff --git a/src/main/java/graphql/language/TypeExtensionDefinition.java b/src/main/java/graphql/language/TypeExtensionDefinition.java
@@ -1,9 +1,6 @@
 package graphql.language;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class TypeExtensionDefinition extends ObjectTypeDefinition {
     public TypeExtensionDefinition() {
         super(null);
@@ -16,10 +13,10 @@ public TypeExtensionDefinition(String name) {
     @Override
     public String toString() {
         return "TypeExtensionDefinition{" +
-               "name='" + getName() + '\'' +
-               ", implements=" + getImplements() +
-               ", directives=" + getDirectives() +
-               ", fieldDefinitions=" + getFieldDefinitions() +
-               '}';
+                "name='" + getName() + '\'' +
+                ", implements=" + getImplements() +
+                ", directives=" + getDirectives() +
+                ", fieldDefinitions=" + getFieldDefinitions() +
+                '}';
     }
 }
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
@@ -3,7 +3,6 @@
 
 import graphql.Internal;
 import graphql.execution.ExecutionId;
-import graphql.execution.ExecutionPath;
 import graphql.execution.ExecutionTypeInfo;
 import graphql.language.Field;
 import graphql.language.FragmentDefinition;
diff --git a/src/main/java/graphql/schema/GraphQLDirective.java b/src/main/java/graphql/schema/GraphQLDirective.java
@@ -18,6 +18,7 @@
  *
  * See http://graphql.org/learn/queries/#directives for more details on the concept.
  */
+@SuppressWarnings("DeprecatedIsStillUsed") // because the graphql spec still has some of these deprecated fields
 @PublicApi
 public class GraphQLDirective {
 
diff --git a/src/main/java/graphql/schema/diff/SchemaDiff.java b/src/main/java/graphql/schema/diff/SchemaDiff.java
@@ -1,6 +1,5 @@
 package graphql.schema.diff;
 
-import graphql.schema.diff.reporting.DifferenceReporter;
 import graphql.introspection.IntrospectionResultToSchema;
 import graphql.language.Argument;
 import graphql.language.Directive;
@@ -21,6 +20,7 @@
 import graphql.language.TypeName;
 import graphql.language.UnionTypeDefinition;
 import graphql.language.Value;
+import graphql.schema.diff.reporting.DifferenceReporter;
 import graphql.schema.idl.TypeInfo;
 
 import java.util.Arrays;
@@ -790,11 +790,7 @@ private Optional<OperationTypeDefinition> getOpDef(String opName, SchemaDefiniti
     private Optional<OperationTypeDefinition> synthOperationTypeDefinition(Function<Type, Optional<ObjectTypeDefinition>> typeReteriver, String opName) {
         TypeName type = new TypeName(capitalize(opName));
         Optional<ObjectTypeDefinition> typeDef = typeReteriver.apply(type);
-        if (typeDef.isPresent()) {
-            return Optional.of(new OperationTypeDefinition(opName, type));
-        } else {
-            return Optional.empty();
-        }
+        return typeDef.map(objectTypeDefinition -> new OperationTypeDefinition(opName, type));
     }
 
     private <T> Map<String, T> sortedMap(List<T> listOfNamedThings, Function<T, String> nameFunc) {
diff --git a/src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java b/src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java
@@ -67,10 +67,10 @@ public TypeDefinitionRegistry merge(TypeDefinitionRegistry typeRegistry) throws
         this.scalarTypes.putAll(tempScalarTypes);
         //
         // merge type extensions since they can be redefined by design
-        typeRegistry.typeExtensions.entrySet().forEach(newEntry -> {
+        typeRegistry.typeExtensions.forEach((key, value) -> {
             List<TypeExtensionDefinition> currentList = this.typeExtensions
-                    .computeIfAbsent(newEntry.getKey(), k -> new ArrayList<>());
-            currentList.addAll(newEntry.getValue());
+                    .computeIfAbsent(key, k -> new ArrayList<>());
+            currentList.addAll(value);
         });
 
         return this;
diff --git a/src/main/java/graphql/validation/rules/KnownDirectives.java b/src/main/java/graphql/validation/rules/KnownDirectives.java
@@ -42,6 +42,7 @@ public void checkDirective(Directive directive, List<Node> ancestors) {
         }
     }
 
+    @SuppressWarnings("deprecation") // the suppression stands because its deprecated but still in graphql spec
     private boolean hasInvalidLocation(GraphQLDirective directive, Node ancestor) {
         if (ancestor instanceof OperationDefinition) {
             Operation operation = ((OperationDefinition) ancestor).getOperation();
diff --git a/src/test/groovy/graphql/NestedInputSchema.java b/src/test/groovy/graphql/NestedInputSchema.java
@@ -1,14 +1,14 @@
 package graphql;
 
-import graphql.schema.DataFetcher;
-import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLInputObjectField;
 import graphql.schema.GraphQLInputObjectType;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
+
 import java.util.Map;
+
 import static graphql.Scalars.GraphQLBoolean;
 import static graphql.Scalars.GraphQLInt;
 
@@ -25,6 +25,7 @@ public static GraphQLSchema createSchema() {
                 .build();
     }
 
+    @SuppressWarnings("unchecked")
     public static GraphQLObjectType rootType() {
         return GraphQLObjectType.newObject()
 
@@ -38,9 +39,9 @@ public static GraphQLObjectType rootType() {
                             if (filter != null) {
                                 if (filter.containsKey("even")) {
                                     Boolean even = (Boolean) filter.get("even");
-                                    if (even && (initialValue%2 != 0)) {
+                                    if (even && (initialValue % 2 != 0)) {
                                         return 0;
-                                    } else if (!even && (initialValue%2 == 0)) {
+                                    } else if (!even && (initialValue % 2 == 0)) {
                                         return 0;
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -76,13 +76,15 @@ private GraphQLObjectType getRootType() {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ @SuppressWarnings("unchecked")`
`79`	`80`	`public <T> T reducePostOrder(QueryReducer<T> queryReducer, T initialValue) {`
`80`	`81`	`// compiler hack to make acc final and mutable :-)`
`81`	`82`	`final Object[] acc = {initialValue};`
`82`	`83`	`visitPostOrder((env) -> acc[0] = queryReducer.reduceField(env, (T) acc[0]));`
`83`	`84`	`return (T) acc[0];`
`84`	`85`	`}`
`85`	`86`
	`87`	`+ @SuppressWarnings("unchecked")`
`86`	`88`	`public <T> T reducePreOrder(QueryReducer<T> queryReducer, T initialValue) {`
`87`	`89`	`// compiler hack to make acc final and mutable :-)`
`88`	`90`	`final Object[] acc = {initialValue};`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ public Object getContext() {`
`88`	`88`	`return context;`
`89`	`89`	`}`
`90`	`90`
	`91`	`+ @SuppressWarnings("unchecked")`
`91`	`92`	`public <T> T getRoot() {`
`92`		`- //noinspection unchecked`
`93`	`93`	`return (T) root;`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -413,13 +413,13 @@ protected Object unboxPossibleOptional(Object result) {`
`413`	`413`	`*`
`414`	`414`	`* @throws java.lang.ClassCastException if its not an Iterable`
`415`	`415`	`*/`
	`416`	`+ @SuppressWarnings("unchecked")`
`416`	`417`	`protected Iterable<Object> toIterable(Object result) {`
`417`	`418`	`if (result.getClass().isArray()) {`
`418`	`419`	`return IntStream.range(0, Array.getLength(result))`
`419`	`420`	`.mapToObj(i -> Array.get(result, i))`
`420`	`421`	`.collect(toList());`
`421`	`422`	`}`
`422`		`- //noinspection unchecked`
`423`	`423`	`return (Iterable<Object>) result;`
`424`	`424`	`}`
`425`	`425`
`@@ -504,6 +504,7 @@ protected CompletableFuture<ExecutionResult> completeValueForScalar(ExecutionCon`
`504`	`504`	`return completedFuture(new ExecutionResultImpl(serialized, null));`
`505`	`505`	`}`
`506`	`506`
	`507`	`+ @SuppressWarnings("SameReturnValue")`
`507`	`508`	`private Object handleCoercionProblem(ExecutionContext context, ExecutionStrategyParameters parameters, CoercingSerializeException e) {`
`508`	`509`	`SerializationError error = new SerializationError(parameters.path(), e);`
`509`	`510`	`log.warn(error.getMessage(), e);`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* See http://graphql.org/learn/queries/#directives for more details on the concept.`
`20`	`20`	`*/`
	`21`	`+@SuppressWarnings("DeprecatedIsStillUsed") // because the graphql spec still has some of these deprecated fields`
`21`	`22`	`@PublicApi`
`22`	`23`	`public class GraphQLDirective {`
`23`	`24`