Fix sonar issues

Author: oliemansm

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/DecoratedExecutionResult.java

@@ -1,7 +1,6 @@
 package graphql.kickstart.execution;
 
 import graphql.ExecutionResult;
-import graphql.GraphQL;
 import graphql.GraphQLError;
 import java.util.List;
 import java.util.Map;

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java

@@ -2,15 +2,13 @@
 
 import static java.util.stream.Collectors.toList;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import graphql.ExecutionResult;
 import graphql.ExecutionResultImpl;
 import graphql.GraphQLError;
-import graphql.execution.ResultPath;
 import graphql.kickstart.execution.config.ConfiguringObjectMapperProvider;
 import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
 import graphql.kickstart.execution.config.ObjectMapperProvider;
@@ -24,6 +22,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
+import lombok.SneakyThrows;
 
 /**
  * @author Andrew Potter
@@ -36,7 +35,7 @@ public class GraphQLObjectMapper {
   private final ObjectMapperProvider objectMapperProvider;
   private final Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier;
 
-  private volatile ObjectMapper mapper;
+  private ObjectMapper mapper;
 
   protected GraphQLObjectMapper(ObjectMapperProvider objectMapperProvider,
       Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier) {
@@ -101,13 +100,10 @@ public List<GraphQLRequest> readBatchedGraphQLRequest(String query) throws IOExc
     return requests;
   }
 
+  @SneakyThrows
   public String serializeResultAsJson(ExecutionResult executionResult) {
-    try {
-      return getJacksonMapper()
-          .writeValueAsString(createResultFromExecutionResult(executionResult));
-    } catch (JsonProcessingException e) {
-      throw new RuntimeException(e);
-    }
+    return getJacksonMapper()
+        .writeValueAsString(createResultFromExecutionResult(executionResult));
   }
 
   public void serializeResultAsJson(Writer writer, ExecutionResult executionResult)
@@ -162,22 +158,16 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
     return result;
   }
 
+  @SneakyThrows
   public Map<String, Object> deserializeVariables(String variables) {
-    try {
-      return VariablesDeserializer
-          .deserializeVariablesObject(getJacksonMapper().readValue(variables, Object.class),
-              getJacksonMapper());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    return VariablesDeserializer
+        .deserializeVariablesObject(getJacksonMapper().readValue(variables, Object.class),
+            getJacksonMapper());
   }
 
+  @SneakyThrows
   public Map<String, List<String>> deserializeMultipartMap(InputStream inputStream) {
-    try {
-      return getJacksonMapper().readValue(inputStream, MULTIPART_MAP_TYPE_REFERENCE);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    return getJacksonMapper().readValue(inputStream, MULTIPART_MAP_TYPE_REFERENCE);
   }
 
   public static class Builder {

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/VariablesDeserializationException.java

@@ -0,0 +1,13 @@
+package graphql.kickstart.execution;
+
+public class VariablesDeserializationException extends RuntimeException {
+
+  VariablesDeserializationException(String message) {
+    super(message);
+  }
+
+  VariablesDeserializationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+}

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/VariablesDeserializer.java

@@ -26,10 +26,11 @@ public static Map<String, Object> deserializeVariablesObject(Object variables,
                 new TypeReference<Map<String, Object>>() {
                 });
       } catch (IOException e) {
-        throw new RuntimeException(e);
+        throw new VariablesDeserializationException("Cannot deserialize variables", e);
       }
     } else {
-      throw new RuntimeException("variables should be either an object or a string");
+      throw new VariablesDeserializationException(
+          "Variables should be either an object or a string");
     }
   }
 

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/ContextSetting.java

@@ -58,7 +58,7 @@ public GraphQLBatchedInvocationInput getBatch(List<GraphQLRequest> requests, Gra
       case PER_REQUEST_WITH_INSTRUMENTATION:
         return new PerRequestBatchedInvocationInput(requests, schema, contextSupplier, root, this);
       default:
-        throw new RuntimeException("Unconfigured context setting type");
+        throw new ContextSettingNotConfiguredException();
     }
   }
 
@@ -98,7 +98,7 @@ public Supplier<Instrumentation> configureInstrumentationForContext(
       case PER_QUERY_WITHOUT_INSTRUMENTATION:
         return instrumentation;
       default:
-        throw new RuntimeException("Unconfigured context setting type");
+        throw new ContextSettingNotConfiguredException();
     }
     return () -> new ChainedInstrumentation(
         Arrays.asList(dispatchInstrumentation, instrumentation.get()));

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/ContextSettingNotConfiguredException.java

@@ -0,0 +1,9 @@
+package graphql.kickstart.execution.context;
+
+public class ContextSettingNotConfiguredException extends RuntimeException {
+
+  ContextSettingNotConfiguredException() {
+    super("Unconfigured context setting type");
+  }
+
+}

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/GenericGraphQLError.java

@@ -1,5 +1,7 @@
 package graphql.kickstart.execution.error;
 
+import static java.util.Collections.emptyList;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import graphql.ErrorType;
 import graphql.GraphQLError;
@@ -25,7 +27,7 @@ public String getMessage() {
   @Override
   @JsonIgnore
   public List<SourceLocation> getLocations() {
-    return null;
+    return emptyList();
   }
 
   @Override

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/AbstractTrackingApproach.java

@@ -3,13 +3,11 @@
 import graphql.ExecutionResult;
 import graphql.execution.ExecutionId;
 import graphql.execution.FieldValueInfo;
-import graphql.execution.MergedField;
-import graphql.execution.ResultPath;
+import graphql.execution.ExecutionPath;
 import graphql.execution.instrumentation.ExecutionStrategyInstrumentationContext;
 import graphql.execution.instrumentation.InstrumentationContext;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +38,7 @@ protected RequestStack getStack() {
   public ExecutionStrategyInstrumentationContext beginExecutionStrategy(
       InstrumentationExecutionStrategyParameters parameters) {
     ExecutionId executionId = parameters.getExecutionContext().getExecutionId();
-    ResultPath path = parameters.getExecutionStrategyParameters().getPath();
+    ExecutionPath path = parameters.getExecutionStrategyParameters().getPath();
     int parentLevel = path.getLevel();
     int curLevel = parentLevel + 1;
     int fieldCount = parameters.getExecutionStrategyParameters().getFields().size();
@@ -108,7 +106,7 @@ private int getCountForList(FieldValueInfo fieldValueInfo) {
   public InstrumentationContext<Object> beginFieldFetch(
       InstrumentationFieldFetchParameters parameters) {
     ExecutionId executionId = parameters.getExecutionContext().getExecutionId();
-    ResultPath path = parameters.getEnvironment().getExecutionStepInfo().getPath();
+    ExecutionPath path = parameters.getEnvironment().getExecutionStepInfo().getPath();
     int level = path.getLevel();
     return new InstrumentationContext<Object>() {
 

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/FieldLevelTrackingApproach.java

@@ -20,7 +20,7 @@ public FieldLevelTrackingApproach(DataLoaderRegistry dataLoaderRegistry) {
   public InstrumentationState createState(ExecutionId executionId) {
     synchronized (getStack()) {
       if (getStack().contains(executionId)) {
-        throw new RuntimeException(
+        throw new TrackingApproachException(
             String.format("Execution id %s already in active execution", executionId));
       }
       getStack().addExecution(executionId);

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/RequestLevelTrackingApproach.java

@@ -20,7 +20,7 @@ public RequestLevelTrackingApproach(List<ExecutionId> executionIds,
   @Override
   public InstrumentationState createState(ExecutionId executionId) {
     if (!getStack().contains(executionId)) {
-      throw new RuntimeException(
+      throw new TrackingApproachException(
           String.format("Request tracking not set up with execution id %s", executionId));
     }
     return null;