feat: move editor props inside graphql group

Author: oliemansm

example/src/main/resources/application.yml

@@ -17,27 +17,27 @@ management:
 graphql:
   servlet:
     actuator-metrics: true
-altair:
-  enabled: true
-  cdn:
-    enabled: false
-graphiql:
-  enabled: true
-  cdn:
-    enabled: false
-    version: 0.17.5
-  headers:
-    Test: TestHeader
-  props:
-    variables:
-      headerEditorEnabled: true
-      headers: '{ "Authorization": "SomeValue" }'
-voyager:
-  enabled: true
-  cdn:
-    enabled: false
-graphql.playground:
-  enabled: true
-  cdn:
-    enabled: false
-    version: latest
+  playground:
+    enabled: true
+    cdn:
+      enabled: false
+      version: latest
+  altair:
+    enabled: true
+    cdn:
+      enabled: false
+  graphiql:
+    enabled: true
+    cdn:
+      enabled: false
+      version: 0.17.5
+    headers:
+      Test: TestHeader
+    props:
+      variables:
+        headerEditorEnabled: true
+        headers: '{ "Authorization": "SomeValue" }'
+  voyager:
+    enabled: true
+    cdn:
+      enabled: false

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

@@ -16,7 +16,7 @@
 public class AltairAutoConfiguration {
 
   @Bean
-  @ConditionalOnProperty(value = "altair.enabled", havingValue = "true")
+  @ConditionalOnProperty(value = "graphql.altair.enabled", havingValue = "true")
   AltairController altairController() {
     return new AltairController();
   }

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

@@ -54,16 +54,16 @@ private void loadTemplate() throws IOException {
   }
 
   private void loadProps() throws IOException {
-    props = new PropsLoader(environment, "altair.props.resources.", "altair.props.values.").load();
+    props = new PropsLoader(environment, "graphql.altair.props.resources.", "graphql.altair.props.values.").load();
   }
 
   private void loadHeaders() throws JsonProcessingException {
-    PropertyGroupReader propertyReader = new PropertyGroupReader(environment, "altair.headers.");
+    PropertyGroupReader propertyReader = new PropertyGroupReader(environment, "graphql.altair.headers.");
     Properties headerProperties = propertyReader.load();
     this.headers = new ObjectMapper().writeValueAsString(headerProperties);
   }
 
-  @GetMapping(value = "${altair.mapping:/altair}")
+  @GetMapping(value = "${graphql.altair.mapping:/altair}")
   public void altair(
       HttpServletRequest request,
       HttpServletResponse response,

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

@@ -4,10 +4,10 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Data
-@ConfigurationProperties("altair")
+@ConfigurationProperties("graphql.altair")
 public class AltairProperties {
 
-  private boolean enabled = true;
+  private boolean enabled = false;
   private Endpoint endpoint = new Endpoint();
   private Cdn cdn = new Cdn();
   private String pageTitle = "Altair";

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

@@ -15,7 +15,7 @@
  * @author Ronny Bräunlich
  */
 @Configuration
-@ConditionalOnProperty(value = "graphiql.enabled", havingValue = "true")
+@ConditionalOnProperty(value = "graphql.graphiql.enabled", havingValue = "true")
 @EnableConfigurationProperties(GraphiQLProperties.class)
 public class GraphiQLAutoConfiguration {
 

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

@@ -4,7 +4,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Data
-@ConfigurationProperties("graphiql")
+@ConfigurationProperties("graphql.graphiql")
 class GraphiQLProperties {
 
   private boolean enabled = false;

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

@@ -26,7 +26,7 @@ public void onceConstructed() throws IOException {
     super.onceConstructed();
   }
 
-  @GetMapping(value = "${graphiql.mapping:/graphiql}")
+  @GetMapping(value = "${graphql.graphiql.mapping:/graphiql}")
   public Mono<Void> graphiql(
       ServerHttpRequest request,
       ServerHttpResponse response,

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

@@ -21,7 +21,7 @@ public void onceConstructed() throws IOException {
     super.onceConstructed();
   }
 
-  @GetMapping(value = "${graphiql.mapping:/graphiql}")
+  @GetMapping(value = "${graphql.graphiql.mapping:/graphiql}")
   public void graphiql(
       HttpServletRequest request,
       HttpServletResponse response,

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerAutoConfiguration.java

@@ -13,7 +13,7 @@
 /** @author Max David Günther */
 @Configuration
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
-@ConditionalOnProperty(value = "voyager.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(value = "graphql.voyager.enabled", havingValue = "true", matchIfMissing = true)
 @EnableConfigurationProperties(VoyagerPropertiesConfiguration.class)
 public class ReactiveVoyagerAutoConfiguration {
 

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerController.java

@@ -17,7 +17,7 @@ public class ReactiveVoyagerController {
 
   @Autowired private VoyagerIndexHtmlTemplate indexTemplate;
 
-  @GetMapping(path = "${voyager.mapping:/voyager}")
+  @GetMapping(path = "${graphql.voyager.mapping:/voyager}")
   public ResponseEntity<String> voyager(@PathVariable Map<String, String> params)
       throws IOException {
     // no context path in spring-webflux

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerAutoConfiguration.java

@@ -9,7 +9,7 @@
 /** @author Guilherme Blanco */
 @Configuration
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-@ConditionalOnProperty(value = "voyager.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(value = "graphql.voyager.enabled", havingValue = "true", matchIfMissing = true)
 @EnableConfigurationProperties(VoyagerPropertiesConfiguration.class)
 public class VoyagerAutoConfiguration {
 

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerController.java

@@ -16,7 +16,7 @@ public class VoyagerController {
 
   @Autowired private VoyagerIndexHtmlTemplate indexTemplate;
 
-  @GetMapping(value = "${voyager.mapping:/voyager}")
+  @GetMapping(value = "${graphql.voyager.mapping:/voyager}")
   public ResponseEntity<String> voyager(
       HttpServletRequest request, @PathVariable Map<String, String> params) throws IOException {
     String contextPath = request.getContextPath();

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerPropertiesConfiguration.java

@@ -9,10 +9,12 @@
 import org.springframework.validation.annotation.Validated;
 
 @Data
-@ConfigurationProperties(prefix = "voyager")
+@ConfigurationProperties(prefix = "graphql.voyager")
 @Validated
 public class VoyagerPropertiesConfiguration {
 
+  private boolean enabled = false;
+
   private String endpoint = "/graphql";
 
   private String pageTitle = "Voyager";

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/CorsTest.java

@@ -28,7 +28,6 @@
 @ImportAutoConfiguration({JacksonAutoConfiguration.class, GraphQLWebAutoConfiguration.class})
 @SpringBootTest(
     properties = {
-      "debug=true",
       "graphql.servlet.mapping=/graphql",
       "graphql.servlet.cors.allowed-origins=https://trusted.com"
     })

graphql-spring-boot-autoconfigure/src/test/resources/application-annotations.yaml

@@ -1,3 +1,2 @@
 graphql:
   schema-strategy: annotations
-debug: true