* spring configuration namespace updated to have graphql root node

* update README * update `GraphWebAutoConfiguration` to rely on a new properties namespace
yandooo · Mar 29, 2016 · 5f72343 · 5f72343
1 parent 97bf473
commit 5f72343
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -142,26 +142,23 @@ Server can host multiple schemas (all are registered at the startup time).
 To run query against particular schema - HTTP header `graphql-schema` parameter passed along with the query should contain graphql schema name of interest.
 
 ```yaml
-spring:
-      application:
-               name: graphql-todo-app
-      graphql:
-               server:
-                      mapping: /graphql
-                      corsEnabled: true
-                      suppressSpringResponseCodes: true
-                      query-key: query
-                      variables-key: variables
-                      uploadMaxFileSize: 128KB
-                      uploadMaxRequestSize: 128KB
-               schema:
-                      clientMutationIdName: clientMutationId
-                      injectClientMutationId: true
-                      allowEmptyClientMutationId: false
-                      mutationInputArgumentName: input
-                      outputObjectNamePrefix: Payload
-                      inputObjectNamePrefix: Input
-                      schemaMutationObjectName: Mutation
+graphql:
+      server:
+               mapping: /graphql
+               corsEnabled: true
+               suppressSpringResponseCodes: true
+               query-key: query
+               variables-key: variables
+               uploadMaxFileSize: 128KB
+               uploadMaxRequestSize: 128KB
+      schema:
+               clientMutationIdName: clientMutationId
+               injectClientMutationId: true
+               allowEmptyClientMutationId: false
+               mutationInputArgumentName: input
+               outputObjectNamePrefix: Payload
+               inputObjectNamePrefix: Input
+               schemaMutationObjectName: Mutation
 ```
 
 To facilitate access from Nodejs frontend to GraphQL backend by default system enables global CORS filter for `/graphql/**` context.

diff --git a/graphql-sample-app/src/main/resources/application.yml b/graphql-sample-app/src/main/resources/application.yml
@@ -1,22 +1,22 @@
 spring:
       application:
                name: graphql-todo-app
-      graphql:
-               server:
-                      mapping: /graphql
-                      corsEnabled: true
-                      suppressSpringResponseCodes: true
-                      query-key: query
-                      variables-key: variables
-                      uploadMaxFileSize: 128KB
-                      uploadMaxRequestSize: 128KB
-               schema:
-                      clientMutationIdName: clientMutationId
-                      injectClientMutationId: true
-                      allowEmptyClientMutationId: false
-                      mutationInputArgumentName: input
-                      outputObjectNamePrefix: Payload
-                      inputObjectNamePrefix: Input
-                      schemaMutationObjectName: Mutation
 server:
-      port: 9000
+      port: 9000
+graphql:
+      server:
+               mapping: /graphql
+               corsEnabled: true
+               suppressSpringResponseCodes: true
+               query-key: query
+               variables-key: variables
+               uploadMaxFileSize: 128KB
+               uploadMaxRequestSize: 128KB
+      schema:
+               clientMutationIdName: clientMutationId
+               injectClientMutationId: true
+               allowEmptyClientMutationId: false
+               mutationInputArgumentName: input
+               outputObjectNamePrefix: Payload
+               inputObjectNamePrefix: Input
+               schemaMutationObjectName: Mutation
diff --git a/...g-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLProperties.java b/...g-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLProperties.java
@@ -27,7 +27,7 @@
  * @author <a href="mailto:[email protected]">oEmbedler Inc.</a>
  */
 @Configuration
-@ConfigurationProperties(prefix = "spring.graphql")
+@ConfigurationProperties(prefix = "graphql")
 public class GraphQLProperties {
 
     @NestedConfigurationProperty

diff --git a/...-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLServerController.java b/...-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLServerController.java
@@ -42,7 +42,7 @@
  * @author <a href="mailto:[email protected]">oEmbedler Inc.</a>
  */
 @RestController
-@RequestMapping("${spring.graphql.server.mapping:/graphql}")
+@RequestMapping("${graphql.server.mapping:/graphql}")
 public class GraphQLServerController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GraphQLServerController.class);

diff --git a/...oconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java b/...oconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java
@@ -49,11 +49,11 @@ public class GraphQLWebAutoConfiguration {
     private static final String DEFAULT_UPLOAD_MAX_FILE_SIZE = "128KB";
     private static final String DEFAULT_UPLOAD_MAX_REQUEST_SIZE = "128KB";
 
-    @Value("${spring.graphql.server.mapping:/graphql}")
+    @Value("${graphql.server.mapping:/graphql}")
     private String graphQLServerMapping;
 
     @Bean
-    @ConditionalOnProperty(value = "spring.graphql.server.corsEnabled", havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(value = "graphql.server.corsEnabled", havingValue = "true", matchIfMissing = true)
     public WebMvcConfigurer corsConfigurer() {
         return new WebMvcConfigurerAdapter() {
             @Override
@@ -71,7 +71,7 @@ public GraphQLServerController basicGraphQLController() {
 
     @Bean
     @ConditionalOnMissingBean(GlobalDefaultExceptionHandler.class)
-    @ConditionalOnProperty(value = "spring.graphql.server.suppressSpringResponseCodes", havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(value = "graphql.server.suppressSpringResponseCodes", havingValue = "true", matchIfMissing = true)
     public GlobalDefaultExceptionHandler globalDefaultExceptionHandler() {
         return new GlobalDefaultExceptionHandler();
     }