Merge pull request #492 from graphql-java-kickstart/feature/servlet-11

Feature/servlet 11

Author: oliemansm

README.md

@@ -1,14 +1,15 @@
 # GraphQL and Graph*i*QL Spring Framework Boot Starters
 
-[![GitHub CI Workflow](https://github.com/graphql-java-kickstart/graphql-spring-boot/workflows/ci/badge.svg)](https://github.com/graphql-java-kickstart/graphql-spring-boot/actions?query=workflow%3ACI+branch%3Amaster)
 [![Maven Central](https://img.shields.io/maven-central/v/com.graphql-java-kickstart/graphql-spring-boot-starter.svg)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java-kickstart/graphql-spring-boot-starter)
-[![Chat on Spectrum](https://img.shields.io/badge/spectrum-join%20the%20community-%23800080)](https://spectrum.chat/graphql-java-kick)
+[![GitHub CI Workflow](https://github.com/graphql-java-kickstart/graphql-spring-boot/workflows/ci/badge.svg)](https://github.com/graphql-java-kickstart/graphql-spring-boot/actions?query=workflow%3ACI+branch%3Amaster)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=graphql-java-kickstart_graphql-spring-boot&metric=alert_status)](https://sonarcloud.io/dashboard?id=graphql-java-kickstart_graphql-spring-boot)
 
 #### We are looking for contributors!
 
 Are you interested in improving our documentation, working on the codebase, reviewing PRs?
 
-[Reach out to us on Spectrum](https://spectrum.chat/graphql-java-kick) and join the team!
+[Reach out to us on Discussions](https://github.com/graphql-java-kickstart/graphql-spring-boot/discussions)
+and join the team!
 
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
@@ -107,19 +108,19 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.graphql-java-kickstart:graphql-spring-boot-starter:8.0.0'
+  implementation 'com.graphql-java-kickstart:graphql-spring-boot-starter:8.1.0'
   
   // to embed Altair tool
-  runtimeOnly 'com.graphql-java-kickstart:altair-spring-boot-starter:8.0.0'
+  runtimeOnly 'com.graphql-java-kickstart:altair-spring-boot-starter:8.1.0'
 
   // to embed GraphiQL tool
-  runtimeOnly 'com.graphql-java-kickstart:graphiql-spring-boot-starter:8.0.0'
+  runtimeOnly 'com.graphql-java-kickstart:graphiql-spring-boot-starter:8.1.0'
 
   // to embed Voyager tool
-  runtimeOnly 'com.graphql-java-kickstart:voyager-spring-boot-starter:8.0.0'
+  runtimeOnly 'com.graphql-java-kickstart:voyager-spring-boot-starter:8.1.0'
   
   // testing facilities
-  testImplementation 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:8.0.0'
+  testImplementation 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:8.1.0'
 }
 ```
 
@@ -129,38 +130,38 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
 </dependency>
 
 <!-- to embed Altair tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>altair-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- testing facilities -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter-test</artifactId>
-    <version>8.0.0</version>
+    <version>8.1.0</version>
     <scope>test</scope>
 </dependency>
 

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

@@ -17,10 +17,10 @@
 @ConditionalOnClass(DispatcherServlet.class)
 public class AltairAutoConfiguration {
 
-    @Bean
-    @ConditionalOnProperty(value = "altair.enabled", havingValue = "true", matchIfMissing = true)
-    AltairController altairController() {
-        return new AltairController();
-    }
+  @Bean
+  @ConditionalOnProperty(value = "altair.enabled", havingValue = "true", matchIfMissing = true)
+  AltairController altairController() {
+    return new AltairController();
+  }
 
 }

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

@@ -16,17 +16,20 @@ public class AltairProperties {
 
   @Data
   static class Endpoint {
+
     private String graphql = "/graphql";
     private String subscriptions = "/subscriptions";
   }
 
   @Data
   static class Static {
+
     private String basePath = "";
   }
 
   @Data
   static class Cdn {
+
     private boolean enabled = false;
     private String version = "2.4.11";
   }

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

@@ -1,63 +1,66 @@
 package graphql.kickstart.altair.boot;
 
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
-import java.util.*;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
 class PropertyGroupReader {
 
-    private Environment environment;
-    private String prefix;
-    private Properties props;
+  private Environment environment;
+  private String prefix;
+  private Properties props;
 
-    PropertyGroupReader(Environment environment, String prefix) {
-        this.environment = Objects.requireNonNull(environment);
-        this.prefix = Optional.ofNullable(prefix).orElse("");
-    }
+  PropertyGroupReader(Environment environment, String prefix) {
+    this.environment = Objects.requireNonNull(environment);
+    this.prefix = Optional.ofNullable(prefix).orElse("");
+  }
 
-    Properties load() {
-        if (props == null) {
-            props = new Properties();
-            loadProps();
-        }
-        return props;
+  Properties load() {
+    if (props == null) {
+      props = new Properties();
+      loadProps();
     }
+    return props;
+  }
 
-    private void loadProps() {
-        streamOfPropertySources().forEach(propertySource ->
-                Arrays.stream(propertySource.getPropertyNames())
-                        .filter(this::isWanted)
-                        .forEach(key -> add(propertySource, key)));
-    }
+  private void loadProps() {
+    streamOfPropertySources().forEach(propertySource ->
+        Arrays.stream(propertySource.getPropertyNames())
+            .filter(this::isWanted)
+            .forEach(key -> add(propertySource, key)));
+  }
 
-    private Stream<EnumerablePropertySource> 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);
-        }
-        return Stream.empty();
+  private Stream<EnumerablePropertySource> 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);
     }
+    return Stream.empty();
+  }
 
-    private String withoutPrefix(String key) {
-        return key.replace(prefix, "");
-    }
+  private String withoutPrefix(String key) {
+    return key.replace(prefix, "");
+  }
 
-    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 boolean isWanted(String key) {
+    return key.startsWith(prefix);
+  }
 
+  private Object add(EnumerablePropertySource propertySource, String key) {
+    return props.put(withoutPrefix(key), propertySource.getProperty(key));
+  }
 
 
 }

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

@@ -1,54 +1,53 @@
 package graphql.kickstart.altair.boot;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.util.StreamUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.Properties;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.util.StreamUtils;
 
 class PropsLoader {
 
-    private static final String ALTAIR_PROPS_PREFIX = "altair.props.";
-    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;
-
-    PropsLoader(Environment environment) {
-        this.environment = environment;
-    }
-
-    String load() throws IOException {
-        PropertyGroupReader reader = new PropertyGroupReader(environment, ALTAIR_PROPS_VALUES_PREFIX);
-        Properties props = reader.load();
-
-        ObjectMapper objectMapper = new ObjectMapper();
-        loadPropFromResource("defaultQuery").ifPresent(it -> props.put("defaultQuery", it));
-        loadPropFromResource("query").ifPresent(it -> props.put("query", it));
-        loadPropFromResource("variables").ifPresent(it -> props.put("variables", it));
-        return objectMapper.writeValueAsString(props);
-    }
-
-    private Optional<String> loadPropFromResource(String prop) throws IOException {
-        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();
+  private static final String ALTAIR_PROPS_PREFIX = "altair.props.";
+  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;
+
+  PropsLoader(Environment environment) {
+    this.environment = environment;
+  }
+
+  String load() throws IOException {
+    PropertyGroupReader reader = new PropertyGroupReader(environment, ALTAIR_PROPS_VALUES_PREFIX);
+    Properties props = reader.load();
+
+    ObjectMapper objectMapper = new ObjectMapper();
+    loadPropFromResource("defaultQuery").ifPresent(it -> props.put("defaultQuery", it));
+    loadPropFromResource("query").ifPresent(it -> props.put("query", it));
+    loadPropFromResource("variables").ifPresent(it -> props.put("variables", it));
+    return objectMapper.writeValueAsString(props);
+  }
+
+  private Optional<String> loadPropFromResource(String prop) throws IOException {
+    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();
+  }
 
-    private String loadResource(Resource resource) throws IOException {
-        try (InputStream inputStream = resource.getInputStream()) {
-            return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
-        }
+  private String loadResource(Resource resource) throws IOException {
+    try (InputStream inputStream = resource.getInputStream()) {
+      return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
     }
+  }
 
 }