Fix sonar issues

Author: oliemansm

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomGraphQLContextBuilder.java

@@ -1,11 +1,12 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
+import static java.util.concurrent.CompletableFuture.supplyAsync;
+
 import graphql.kickstart.execution.context.DefaultGraphQLContext;
 import graphql.kickstart.execution.context.GraphQLContext;
 import graphql.kickstart.servlet.context.DefaultGraphQLServletContext;
 import graphql.kickstart.servlet.context.DefaultGraphQLWebSocketContext;
 import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
-import java.util.concurrent.CompletableFuture;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.Session;
@@ -44,10 +45,10 @@ public GraphQLContext build(Session session, HandshakeRequest request) {
 
   private DataLoaderRegistry buildDataLoaderRegistry() {
     DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
-    dataLoaderRegistry.register("customerDataLoader",
-        new DataLoader<Integer, String>(customerIds ->
-            CompletableFuture.supplyAsync(() ->
-                customerRepository.getUserNamesForIds(customerIds))));
+    DataLoader<Integer, String> customerLoader = new DataLoader<>(
+        customerIds -> supplyAsync(() -> customerRepository.getUserNamesForIds(customerIds))
+    );
+    dataLoaderRegistry.register("customerDataLoader", customerLoader);
     return dataLoaderRegistry;
   }
 }

example-spring-common/src/main/java/graphql/kickstart/spring/web/boot/sample/ApplicationBootConfiguration.java

@@ -28,7 +28,7 @@
 @SpringBootApplication
 public class ApplicationBootConfiguration {
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
     SpringApplication.run(ApplicationBootConfiguration.class, args);
   }
 }

example-webflux/src/main/java/graphql/kickstart/spring/web/boot/sample/ApplicationWebfluxConfiguration.java

@@ -20,6 +20,9 @@
 package graphql.kickstart.spring.web.boot.sample;
 
 import graphql.Scalars;
+import graphql.schema.DataFetcher;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import org.springframework.boot.SpringApplication;
@@ -40,15 +43,18 @@ public static void main(String[] args) {
 
   @Bean
   GraphQLSchema schema() {
+    DataFetcher<String> test = env -> "response";
     return GraphQLSchema.newSchema()
         .query(GraphQLObjectType.newObject()
             .name("query")
             .field(field -> field
                 .name("test")
                 .type(Scalars.GraphQLString)
-                .dataFetcher(environment -> "response")
             )
             .build())
+        .codeRegistry(GraphQLCodeRegistry.newCodeRegistry()
+            .dataFetcher(FieldCoordinates.coordinates("query", "test"), test)
+        .build())
         .build();
   }
 }

example/src/main/java/graphql/kickstart/spring/web/boot/sample/ApplicationBootConfiguration.java

@@ -20,6 +20,9 @@
 package graphql.kickstart.spring.web.boot.sample;
 
 import graphql.Scalars;
+import graphql.schema.DataFetcher;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import org.springframework.boot.SpringApplication;
@@ -35,15 +38,18 @@ public static void main(String[] args) {
 
   @Bean
   GraphQLSchema schema() {
+    DataFetcher<String> test = env -> "response";
     return GraphQLSchema.newSchema()
         .query(GraphQLObjectType.newObject()
             .name("query")
             .field(field -> field
                 .name("test")
                 .type(Scalars.GraphQLString)
-                .dataFetcher(environment -> "response")
             )
             .build())
+        .codeRegistry(GraphQLCodeRegistry.newCodeRegistry()
+            .dataFetcher(FieldCoordinates.coordinates("query", "test"), test)
+            .build())
         .build();
   }
 }

graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/ServletGraphiQLController.java

@@ -17,6 +17,7 @@
 @Controller
 public class ServletGraphiQLController extends GraphiQLController {
 
+  @Override
   @PostConstruct
   public void onceConstructed() throws IOException {
     super.onceConstructed();

graphiql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/graphiql/boot/ReactiveGraphiQLControllerTest.java

@@ -13,13 +13,13 @@
 
 @ExtendWith(SpringExtension.class)
 @WebFluxTest
-public class ReactiveGraphiQLControllerTest {
+class ReactiveGraphiQLControllerTest {
 
   @Autowired
   private WebTestClient webTestClient;
 
   @Test
-  public void shouldBeAbleToAccessGraphiQL() {
+  void shouldBeAbleToAccessGraphiQL() {
     webTestClient.get()
         .uri("/graphiql")
         .exchange()

graphiql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/graphiql/boot/ServletGraphiQLControllerTest.java

@@ -16,13 +16,13 @@
 
 @ExtendWith(SpringExtension.class)
 @WebMvcTest
-public class ServletGraphiQLControllerTest {
+class ServletGraphiQLControllerTest {
 
   @Autowired
   private MockMvc mockMvc;
 
   @Test
-  public void shouldBeAbleToAccessGraphiQL() throws Exception {
+  void shouldBeAbleToAccessGraphiQL() throws Exception {
     mockMvc.perform(get("/graphiql"))
         .andExpect(status().is2xxSuccessful())
         .andExpect(content().contentType("text/html; charset=UTF-8"));

graphiql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/graphiql/boot/test/GraphiQLControllerTest.java

@@ -10,31 +10,33 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 /**
  * @author Andrew Potter
  */
-public class GraphiQLControllerTest extends AbstractAutoConfigurationTest {
+class GraphiQLControllerTest extends AbstractAutoConfigurationTest {
 
   public GraphiQLControllerTest() {
     super(AnnotationConfigWebApplicationContext.class, GraphiQLAutoConfiguration.class);
   }
 
   @Test
-  public void graphiqlLoads() {
+  void graphiqlLoads() {
     load(EnabledConfiguration.class);
 
     assertThat(this.getContext().getBean(GraphiQLController.class)).isNotNull();
   }
 
   @Test
-  public void graphiqlDoesNotLoad() {
+  void graphiqlDoesNotLoad() {
     load(DisabledConfiguration.class);
 
+    AbstractApplicationContext context = getContext();
     assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
-        .isThrownBy(() -> this.getContext().getBean(GraphiQLController.class));
+        .isThrownBy(() -> context.getBean(GraphiQLController.class));
   }
 
   @Configuration

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsAutoConfiguration.java

@@ -133,7 +133,7 @@ private void setQueryResolverClass(
   ) {
     final Set<Class<?>> queryResolvers
         = getTypesAnnotatedWith(reflections, GraphQLQueryResolver.class);
-    if (queryResolvers.size() == 0) {
+    if (queryResolvers.isEmpty()) {
       throw new MissingQueryResolverException();
     }
     if (queryResolvers.size() > 1) {

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsBeanTest.java

@@ -12,7 +12,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "query-test"})
-public class GraphQLAnnotationsBeanTest {
+class GraphQLAnnotationsBeanTest {
 
   @Autowired
   private ApplicationContext applicationContext;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsCustomAnnotationProcessorTest.java

@@ -13,7 +13,7 @@
 @DisplayName("Testing custom annotation processor configuration")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "custom-annotation-processor-test"})
-public class GraphQLAnnotationsCustomAnnotationProcessorTest {
+class GraphQLAnnotationsCustomAnnotationProcessorTest {
 
   @SpyBean
   private CustomAnnotationProcessor customAnnotationProcessor;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsCustomScalarTest.java

@@ -15,7 +15,7 @@
 @DisplayName("Testing that custom scalar beans are properly registered.")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "custom-scalar-test"})
-public class GraphQLAnnotationsCustomScalarTest {
+class GraphQLAnnotationsCustomScalarTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsCustomTypeFunctionTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Testing custom type function registration")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "custom-type-function-test"})
-public class GraphQLAnnotationsCustomTypeFunctionTest {
+class GraphQLAnnotationsCustomTypeFunctionTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsDirectiveTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Testing directive registration")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "directive-test"})
-public class GraphQLAnnotationsDirectiveTest {
+class GraphQLAnnotationsDirectiveTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMissingQueryResolver.java renamed to graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMissingQueryResolverTest.java

@@ -9,7 +9,7 @@
 import org.springframework.context.ApplicationContextException;
 
 @DisplayName("Test exception if no query resolver defined.")
-public class GraphQLAnnotationsErrorMissingQueryResolver {
+class GraphQLAnnotationsErrorMissingQueryResolverTest {
 
   @Test
   @DisplayName("Assert that MissingQueryResolverException is throw if no GraphQLQueryResolver classes are found.")

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMultipleMutationResolvers.java renamed to graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMultipleMutationResolversTest.java

@@ -9,11 +9,11 @@
 import org.springframework.context.ApplicationContextException;
 
 @DisplayName("Test exception if multiple mutation resolvers are defined.")
-public class GraphQLAnnotationsErrorMultipleMutationResolvers {
+class GraphQLAnnotationsMultipleMutationResolversTest {
 
   @Test
   @DisplayName("Assert that MultipleMutationResolversException is thrown when multiple mutation resolvers are found.")
-  public void testMultipleMutationResolversExceptionIsThrown() {
+  void testMultipleMutationResolversExceptionIsThrown() {
     // GIVEN
     final SpringApplication app = new SpringApplication(TestApplication.class);
     app.setAdditionalProfiles("test", "test-multiple-mutation-resolvers-exception");

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsExtendTypeTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Test type extension registration")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "extend-type-test"})
-public class GraphQLAnnotationsExtendTypeTest {
+class GraphQLAnnotationsExtendTypeTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsMutationTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Testing mutation resolver registration")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "mutation-test"})
-public class GraphQLAnnotationsMutationTest {
+class GraphQLAnnotationsMutationTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsPrettifyDefaultTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Testing prettify settings (default)")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "prettify-default-test"})
-public class GraphQLAnnotationsPrettifyDefaultTest {
+class GraphQLAnnotationsPrettifyDefaultTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsPrettifyDisabledTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Test prettify settings (disabled)")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "prettify-disabled-test"})
-public class GraphQLAnnotationsPrettifyDisabledTest {
+class GraphQLAnnotationsPrettifyDisabledTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsPrettifyEnabledTest.java

@@ -14,7 +14,7 @@
 @DisplayName("Testing prettify settings (enabled)")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "prettify-enabled-test"})
-public class GraphQLAnnotationsPrettifyEnabledTest {
+class GraphQLAnnotationsPrettifyEnabledTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsQueryTest.java

@@ -16,7 +16,7 @@
 @DisplayName("Testing query resolver registration.")
 @ActiveProfiles({"test", "query-test"})
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class)
-public class GraphQLAnnotationsQueryTest {
+class GraphQLAnnotationsQueryTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsSubscriptionTest.java

@@ -13,7 +13,7 @@
 @DisplayName("Testing subscription resolver registration.")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles({"test", "subscription-test"})
-public class GraphQLAnnotationsSubscriptionTest {
+class GraphQLAnnotationsSubscriptionTest {
 
   @Autowired
   private GraphQLTestSubscription graphQLTestSubscription;

graphql-kickstart-spring-boot-autoconfigure-tools/src/test/java/graphql/kickstart/tools/boot/ClasspathResourceSchemaStringProviderTest.java

@@ -10,9 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Configuration;
 
-public class ClasspathResourceSchemaStringProviderTest extends AbstractAutoConfigurationTest {
-
-  private ClasspathResourceSchemaStringProvider schemaStringProvider;
+class ClasspathResourceSchemaStringProviderTest extends AbstractAutoConfigurationTest {
 
   public ClasspathResourceSchemaStringProviderTest() {
     super(GraphQLJavaToolsAutoConfiguration.class);
@@ -29,9 +27,10 @@ public void clear() {
   }
 
   @Test
-  public void schemaStrings() throws IOException {
+  void schemaStrings() throws IOException {
     load(BaseConfiguration.class);
-    schemaStringProvider = getContext().getBean(ClasspathResourceSchemaStringProvider.class);
+    ClasspathResourceSchemaStringProvider schemaStringProvider = getContext()
+        .getBean(ClasspathResourceSchemaStringProvider.class);
 
     List<String> schemaStrings = schemaStringProvider.schemaStrings();
     assertThat(schemaStrings).hasSize(1);
@@ -41,7 +40,7 @@ public void schemaStrings() throws IOException {
   @Configuration
   static class BaseConfiguration {
 
-    public class Query implements GraphQLQueryResolver {
+    public static class Query implements GraphQLQueryResolver {
 
       String schemaLocationTest(String id) {
         return id;

graphql-kickstart-spring-boot-autoconfigure-tools/src/test/java/graphql/kickstart/tools/boot/GraphQLJavaToolsAutoConfigurationTest.java

@@ -12,21 +12,21 @@
 /**
  * @author <a href="mailto:[email protected]">oEmbedler Inc.</a>
  */
-public class GraphQLJavaToolsAutoConfigurationTest extends AbstractAutoConfigurationTest {
+class GraphQLJavaToolsAutoConfigurationTest extends AbstractAutoConfigurationTest {
 
   public GraphQLJavaToolsAutoConfigurationTest() {
     super(GraphQLJavaToolsAutoConfiguration.class);
   }
 
   @Test
-  public void appContextLoads() {
+  void appContextLoads() {
     load(BaseConfiguration.class);
 
     assertThat(this.getContext().getBean(GraphQLSchema.class)).isNotNull();
   }
 
   @Test
-  public void schemaWithInterfaceLoads() {
+  void schemaWithInterfaceLoads() {
     load(InterfaceConfiguration.class);
 
     assertThat(this.getContext().getBean(GraphQLSchema.class)).isNotNull();

graphql-kickstart-spring-boot-autoconfigure-webflux/src/main/java/graphql/kickstart/spring/webflux/boot/GraphQLSpringWebfluxAutoConfiguration.java

@@ -47,6 +47,7 @@
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
 
+@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Slf4j
 @Configuration
 @ConditionalOnBean({GraphQLSchema.class})