Merge branch 'master' into release/8.1.1

Author: oliemansm

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,9 @@
 ---
-name: Bug report about: Create a report to help us improve title: ''
-labels: bug assignees: ''
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
 
 ---
 
@@ -9,7 +12,6 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -22,7 +24,6 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
-
 - OS: [e.g. iOS]
 - Browser [e.g. chrome, safari]
 - Version [e.g. 22]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Question
-    url: https://spectrum.chat/graphql-java-kick
-    about: Anything you are not sure about? Ask the community on Spectrum!
+    url: https://github.com/graphql-java-kickstart/graphql-spring-boot/discussions
+    about: Anything you are not sure about? Ask the community in Discussions!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,9 @@
 ---
-name: Feature request about: Suggest an idea for this project title: ''
-labels: enhancement assignees: ''
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
 
 ---
 

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/build.gradle

@@ -17,8 +17,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
+    implementation(project(':graphql-kickstart-starter-utils'))
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
-    
+
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
     compileOnly "org.springframework.boot:spring-boot-starter-web"

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/AltairController.java

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import graphql.kickstart.util.PropertyGroupReader;
+import graphql.kickstart.util.PropsLoader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -55,11 +57,11 @@ private void loadTemplate() throws IOException {
   }
 
   private void loadProps() throws IOException {
-    props = new PropsLoader(environment).load();
+    props = new PropsLoader(environment, "altair.props.resources.", "altair.props.values.").load();
   }
 
   private void loadHeaders() throws JsonProcessingException {
-    PropertyGroupReader propertyReader = new PropertyGroupReader(environment, "graphiql.headers.");
+    PropertyGroupReader propertyReader = new PropertyGroupReader(environment, "altair.headers.");
     Properties headerProperties = propertyReader.load();
     this.headers = new ObjectMapper().writeValueAsString(headerProperties);
   }
@@ -86,7 +88,7 @@ private Map<String, String> getReplacements(String graphqlEndpoint,
     replacements.put("pageTitle", altairProperties.getPageTitle());
     replacements.put("pageFavicon", getResourceUrl("favicon.ico", "favicon.ico"));
     replacements.put("altairBaseUrl", getResourceUrl(
-        StringUtils.join(altairProperties.getSTATIC().getBasePath(), "/vendor/altair/"),
+        StringUtils.join(altairProperties.getBasePath(), "/vendor/altair/"),
         joinJsUnpkgPath(ALTAIR, altairProperties.getCdn().getVersion(), "build/dist/")));
     replacements
         .put("altairLogoUrl", getResourceUrl("assets/img/logo_350.svg", "assets/img/logo_350.svg"));

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

@@ -9,24 +9,21 @@ public class AltairProperties {
 
   private boolean enabled = true;
   private Endpoint endpoint = new Endpoint();
-  private Static STATIC = new Static();
   private Cdn cdn = new Cdn();
   private String pageTitle = "Altair";
   private String mapping = "/altair";
+  private String basePath = "";
 
   @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";
   }