Fix sonar issues

Author: oliemansm

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/PropertyGroupReader.java

@@ -14,8 +14,8 @@
 
 class PropertyGroupReader {
 
-  private Environment environment;
-  private String prefix;
+  private final Environment environment;
+  private final String prefix;
   private Properties props;
 
   PropertyGroupReader(Environment environment, String prefix) {
@@ -38,14 +38,15 @@ private void loadProps() {
             .forEach(key -> add(propertySource, key)));
   }
 
-  private Stream<EnumerablePropertySource> streamOfPropertySources() {
+  @SuppressWarnings("unchecked")
+  private Stream<EnumerablePropertySource<Object>> streamOfPropertySources() {
     if (environment instanceof ConfigurableEnvironment) {
       Iterator<PropertySource<?>> iterator = ((ConfigurableEnvironment) environment)
           .getPropertySources().iterator();
       Iterable<PropertySource<?>> iterable = () -> iterator;
       return StreamSupport.stream(iterable.spliterator(), false)
           .filter(EnumerablePropertySource.class::isInstance)
-          .map(EnumerablePropertySource.class::cast);
+          .map(it -> (EnumerablePropertySource<Object>) it);
     }
     return Stream.empty();
   }
@@ -58,10 +59,9 @@ private boolean isWanted(String key) {
     return key.startsWith(prefix);
   }
 
-  private Object add(EnumerablePropertySource propertySource, String key) {
-    return props.put(withoutPrefix(key), propertySource.getProperty(key));
+  private void add(EnumerablePropertySource<Object> propertySource, String key) {
+    props.put(withoutPrefix(key), propertySource.getProperty(key));
   }
 
-
 }
 

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/PropsLoader.java

@@ -6,6 +6,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.Properties;
+import lombok.SneakyThrows;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -17,7 +18,7 @@ class PropsLoader {
   private static final String ALTAIR_PROPS_RESOURCES_PREFIX = ALTAIR_PROPS_PREFIX + "resources.";
   private static final String ALTAIR_PROPS_VALUES_PREFIX = ALTAIR_PROPS_PREFIX + "values.";
 
-  private Environment environment;
+  private final Environment environment;
 
   PropsLoader(Environment environment) {
     this.environment = environment;
@@ -34,17 +35,15 @@ String load() throws IOException {
     return objectMapper.writeValueAsString(props);
   }
 
-  private Optional<String> loadPropFromResource(String prop) throws IOException {
+  private Optional<String> loadPropFromResource(String prop) {
     String property = ALTAIR_PROPS_RESOURCES_PREFIX + prop;
-    if (environment.containsProperty(property)) {
-      String location = environment.getProperty(property);
-      Resource resource = new ClassPathResource(location);
-      return Optional.of(loadResource(resource));
-    }
-    return Optional.empty();
+    return Optional.ofNullable(environment.getProperty(property))
+        .map(ClassPathResource::new)
+        .map(this::loadResource);
   }
 
-  private String loadResource(Resource resource) throws IOException {
+  @SneakyThrows
+  private String loadResource(Resource resource) {
     try (InputStream inputStream = resource.getInputStream()) {
       return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
     }

altair-spring-boot-autoconfigure/src/test/java/graphql/kickstart/altair/boot/test/AbstractAutoConfigurationTest.java

@@ -1,5 +1,6 @@
 package graphql.kickstart.altair.boot.test;
 
+import lombok.NonNull;
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;

altair-spring-boot-autoconfigure/src/test/java/graphql/kickstart/altair/boot/test/AltairControllerTest.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 AltairControllerTest extends AbstractAutoConfigurationTest {
+class AltairControllerTest extends AbstractAutoConfigurationTest {
 
   public AltairControllerTest() {
     super(AnnotationConfigWebApplicationContext.class, AltairAutoConfiguration.class);
   }
 
   @Test
-  public void altairLoads() {
+  void altairLoads() {
     load(EnabledConfiguration.class);
 
     assertThat(this.getContext().getBean(AltairController.class)).isNotNull();
   }
 
   @Test
-  public void altairDoesNotLoad() {
+  void altairDoesNotLoad() {
     load(DisabledConfiguration.class);
 
+    AbstractApplicationContext context = getContext();
     assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
-        .isThrownBy(() -> this.getContext().getBean(AltairController.class));
+        .isThrownBy(() -> context.getBean(AltairController.class));
   }
 
   @Configuration

example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/resolvers/StockPriceUpdate.java

@@ -32,6 +32,6 @@ public BigDecimal getStockPrice() {
   }
 
   public BigDecimal getStockPriceChange() {
-    return null; //stockPriceChange;
+    return stockPriceChange;
   }
 }

example-graphql-tools/src/main/java/com/graphql/sample/boot/Comment.java

@@ -1,5 +1,10 @@
 package com.graphql.sample.boot;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
 class Comment {
 
   private Long id;

example-graphql-tools/src/main/java/com/graphql/sample/boot/PostResolver.java

@@ -1,15 +1,26 @@
 package com.graphql.sample.boot;
 
+import static java.util.Collections.singletonList;
+
 import graphql.kickstart.tools.GraphQLResolver;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.springframework.stereotype.Component;
 
 @Component
 class PostResolver implements GraphQLResolver<Post> {
 
+  private final Map<Long, List<Comment>> comments = new HashMap<>();
+
+  PostResolver() {
+    comments.put(1L, singletonList(new Comment(1L, "Some comment")));
+  }
+
   public List<Comment> getComments(Post post) {
-    return Collections.emptyList();
+    return Optional.ofNullable(comments.get(post.getId())).orElseGet(Collections::emptyList);
   }
 
 }

example-graphql-tools/src/test/java/com/graphql/sample/boot/GraphQLToolsSampleApplicationTest.java

@@ -11,22 +11,20 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
 @GraphQLTest
-public class GraphQLToolsSampleApplicationTest {
+class GraphQLToolsSampleApplicationTest {
 
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;
 
   @Test
-  @Disabled
-  public void get_comments() throws IOException {
+  void get_comments() throws IOException {
     GraphQLResponse response = graphQLTestTemplate
         .postForResource("graphql/post-get-comments.graphql");
     assertNotNull(response);
@@ -35,7 +33,7 @@ public void get_comments() throws IOException {
   }
 
   @Test
-  public void get_comments_withFragments() throws IOException {
+  void get_comments_withFragments() throws IOException {
     List<String> fragments = new ArrayList<>();
     fragments.add("graphql/all-comment-fields-fragment.graphql");
     GraphQLResponse response = graphQLTestTemplate
@@ -46,7 +44,7 @@ public void get_comments_withFragments() throws IOException {
   }
 
   @Test
-  public void create_post() throws IOException {
+  void create_post() throws IOException {
     ObjectNode variables = new ObjectMapper().createObjectNode();
     variables.put("text", "lorem ipsum dolor sit amet");
     GraphQLResponse response = graphQLTestTemplate

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

@@ -21,7 +21,7 @@ private CustomerRepository() {
     data.put(106, "Customer Name 6");
   }
 
-  public List getUserNamesForIds(List<Integer> customerIds) {
+  public List<String> getUserNamesForIds(List<Integer> customerIds) {
     return customerIds.parallelStream().map(data::get).collect(Collectors.toList());
   }
 

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

@@ -8,6 +8,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 /**
@@ -16,18 +17,18 @@
 public class SimpleListConnection {
 
   private static final String DUMMY_CURSOR_PREFIX = "simple-cursor";
-  private List<?> data = new ArrayList<Object>();
+  private final List<?> data;
 
   public SimpleListConnection(List<?> data) {
     this.data = data;
   }
 
-  public <T extends EdgeObjectType> T createEdgeObject() {
-    return (T) new EdgeObjectType();
+  public <E extends EdgeObjectType> E createEdgeObject() {
+    return (E) new EdgeObjectType();
   }
 
-  public <T extends ConnectionObjectType> T createConnectionObject() {
-    return (T) new ConnectionObjectType();
+  public <E extends ConnectionObjectType> E createConnectionObject() {
+    return (E) new ConnectionObjectType();
   }
 
   private List<EdgeObjectType> buildEdges() {
@@ -42,7 +43,7 @@ private List<EdgeObjectType> buildEdges() {
     return edges;
   }
 
-  public <T extends ConnectionObjectType> T get(DataFetchingEnvironment environment) {
+  public <C extends ConnectionObjectType> C get(DataFetchingEnvironment environment) {
 
     List<EdgeObjectType> edges = buildEdges();
 
@@ -52,7 +53,7 @@ public <T extends ConnectionObjectType> T get(DataFetchingEnvironment environmen
     int end = Math.min(beforeOffset, edges.size());
 
     edges = edges.subList(begin, end);
-    if (edges.size() == 0) {
+    if (edges.isEmpty()) {
       return emptyConnection();
     }
 
@@ -69,7 +70,7 @@ public <T extends ConnectionObjectType> T get(DataFetchingEnvironment environmen
       edges = edges.subList(edges.size() - last, edges.size());
     }
 
-    if (edges.size() == 0) {
+    if (edges.isEmpty()) {
       return emptyConnection();
     }
 
@@ -86,13 +87,13 @@ public <T extends ConnectionObjectType> T get(DataFetchingEnvironment environmen
     connection.setEdges(edges);
     connection.setPageInfo(pageInfo);
 
-    return (T) connection;
+    return (C) connection;
   }
 
-  private <T extends ConnectionObjectType> T emptyConnection() {
+  private <E extends ConnectionObjectType> E emptyConnection() {
     ConnectionObjectType connection = createConnectionObject();
     connection.setPageInfo(new PageInfoObjectType());
-    return (T) connection;
+    return (E) connection;
   }
 
   public ConnectionCursor cursorForObjectInConnection(Object object) {
@@ -111,9 +112,8 @@ private int getOffsetFromCursor(String cursor, int defaultValue) {
   }
 
   private String createCursor(int offset) {
-    byte[] lala = (DUMMY_CURSOR_PREFIX + Integer.toString(offset)).getBytes(StandardCharsets.UTF_8);
-    String string = java.util.Base64.getEncoder().encodeToString(lala);
-    return string;
+    byte[] lala = (DUMMY_CURSOR_PREFIX + offset).getBytes(StandardCharsets.UTF_8);
+    return Base64.getEncoder().encodeToString(lala);
   }
 
 }