From aabe780e9af24b1c6519cc38337f7e143aef2439 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 17 Sep 2020 18:48:36 +0100 Subject: [PATCH] Consistent naming, simplified package structure --- .../src/main/resources/META-INF/spring.factories | 2 +- ...tion.java => WebFluxGraphQLAutoConfiguration.java} | 5 ++--- ...ation.java => WebMvcGraphQLAutoConfiguration.java} | 5 ++--- .../boot/graphql/reactive/package-info.java | 6 ------ .../boot/graphql/servlet/package-info.java | 6 ------ .../src/main/resources/META-INF/spring.factories | 4 ++-- ...Tests.java => WebFluxApplicationContextTests.java} | 11 ++++------- ...tTests.java => WebMvcApplicationContextTests.java} | 11 ++++------- 8 files changed, 15 insertions(+), 35 deletions(-) rename spring-graphql-web/src/main/java/org/springframework/boot/graphql/{reactive/GraphQLWebFluxAutoConfiguration.java => WebFluxGraphQLAutoConfiguration.java} (89%) rename spring-graphql-web/src/main/java/org/springframework/boot/graphql/{servlet/GraphQLWebAutoConfiguration.java => WebMvcGraphQLAutoConfiguration.java} (90%) delete mode 100644 spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/package-info.java delete mode 100644 spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/package-info.java rename spring-graphql-web/src/test/java/org/springframework/boot/graphql/{reactive/GraphQLWebFluxEndpointTests.java => WebFluxApplicationContextTests.java} (85%) rename spring-graphql-web/src/test/java/org/springframework/boot/graphql/{servlet/GraphQLWebEndpointTests.java => WebMvcApplicationContextTests.java} (85%) diff --git a/spring-boot-starter-graphql-webflux/src/main/resources/META-INF/spring.factories b/spring-boot-starter-graphql-webflux/src/main/resources/META-INF/spring.factories index 90756d27..cf4e1043 100644 --- a/spring-boot-starter-graphql-webflux/src/main/resources/META-INF/spring.factories +++ b/spring-boot-starter-graphql-webflux/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.graphql.reactive.GraphQLWebFluxAutoConfiguration +org.springframework.boot.graphql.WebFluxGraphQLAutoConfiguration diff --git a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxAutoConfiguration.java b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java similarity index 89% rename from spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxAutoConfiguration.java rename to spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java index 352120f6..4be22150 100644 --- a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxAutoConfiguration.java +++ b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.boot.graphql.reactive; +package org.springframework.boot.graphql; import graphql.GraphQL; @@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.graphql.GraphQLAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.graphql.WebFluxGraphQLHandler; @@ -20,7 +19,7 @@ import org.springframework.web.reactive.function.server.ServerResponse; @ConditionalOnClass(GraphQL.class) @ConditionalOnBean(GraphQL.Builder.class) @AutoConfigureAfter(GraphQLAutoConfiguration.class) -public class GraphQLWebFluxAutoConfiguration { +public class WebFluxGraphQLAutoConfiguration { @Bean @ConditionalOnMissingBean diff --git a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/GraphQLWebAutoConfiguration.java b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java similarity index 90% rename from spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/GraphQLWebAutoConfiguration.java rename to spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java index e1b52947..66c9deb6 100644 --- a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/GraphQLWebAutoConfiguration.java +++ b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.boot.graphql.servlet; +package org.springframework.boot.graphql; import graphql.GraphQL; @@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.graphql.GraphQLAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.graphql.WebMvcGraphQLHandler; @@ -23,7 +22,7 @@ import static org.springframework.web.servlet.function.RequestPredicates.accept; @ConditionalOnClass(GraphQL.class) @ConditionalOnBean(GraphQL.Builder.class) @AutoConfigureAfter(GraphQLAutoConfiguration.class) -public class GraphQLWebAutoConfiguration { +public class WebMvcGraphQLAutoConfiguration { @Bean @ConditionalOnMissingBean diff --git a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/package-info.java b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/package-info.java deleted file mode 100644 index b112b1d9..00000000 --- a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@NonNullApi -@NonNullFields -package org.springframework.boot.graphql.reactive; - -import org.springframework.lang.NonNullApi; -import org.springframework.lang.NonNullFields; diff --git a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/package-info.java b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/package-info.java deleted file mode 100644 index 7909e686..00000000 --- a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@NonNullApi -@NonNullFields -package org.springframework.boot.graphql.servlet; - -import org.springframework.lang.NonNullApi; -import org.springframework.lang.NonNullFields; diff --git a/spring-graphql-web/src/main/resources/META-INF/spring.factories b/spring-graphql-web/src/main/resources/META-INF/spring.factories index 120520af..867f3762 100644 --- a/spring-graphql-web/src/main/resources/META-INF/spring.factories +++ b/spring-graphql-web/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.boot.graphql.GraphQLAutoConfiguration,\ -org.springframework.boot.graphql.reactive.GraphQLWebFluxAutoConfiguration,\ -org.springframework.boot.graphql.servlet.GraphQLWebAutoConfiguration +org.springframework.boot.graphql.WebFluxGraphQLAutoConfiguration,\ +org.springframework.boot.graphql.WebMvcGraphQLAutoConfiguration diff --git a/spring-graphql-web/src/test/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxEndpointTests.java b/spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebFluxApplicationContextTests.java similarity index 85% rename from spring-graphql-web/src/test/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxEndpointTests.java rename to spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebFluxApplicationContextTests.java index d04be639..3d1fb797 100644 --- a/spring-graphql-web/src/test/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxEndpointTests.java +++ b/spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebFluxApplicationContextTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.graphql.reactive; +package org.springframework.boot.graphql; import org.junit.jupiter.api.Test; @@ -8,9 +8,6 @@ import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration; -import org.springframework.boot.graphql.GraphQLAutoConfiguration; -import org.springframework.boot.graphql.GraphQLDataFetchers; -import org.springframework.boot.graphql.RuntimeWiringCustomizer; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -20,14 +17,14 @@ import org.springframework.test.web.reactive.server.WebTestClient; import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring; -class GraphQLWebFluxEndpointTests { +class WebFluxApplicationContextTests { @Test - void endpointHandlesGraphQLQueries() throws Exception { + void endpointHandlesGraphQLQueries() { new ReactiveWebApplicationContextRunner() .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class, CodecsAutoConfiguration.class, WebFluxAutoConfiguration.class, HttpHandlerAutoConfiguration.class, - GraphQLAutoConfiguration.class, GraphQLWebFluxAutoConfiguration.class)) + GraphQLAutoConfiguration.class, WebFluxGraphQLAutoConfiguration.class)) .withUserConfiguration(DataFetchersConfiguration.class) .withPropertyValues("spring.main.web-application-type=reactive", "spring.graphql.schema:classpath:books/schema.graphqls").run((context) -> { WebTestClient client = createWebTestClient(context); diff --git a/spring-graphql-web/src/test/java/org/springframework/boot/graphql/servlet/GraphQLWebEndpointTests.java b/spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebMvcApplicationContextTests.java similarity index 85% rename from spring-graphql-web/src/test/java/org/springframework/boot/graphql/servlet/GraphQLWebEndpointTests.java rename to spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebMvcApplicationContextTests.java index ae539869..1c9bd31d 100644 --- a/spring-graphql-web/src/test/java/org/springframework/boot/graphql/servlet/GraphQLWebEndpointTests.java +++ b/spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebMvcApplicationContextTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.graphql.servlet; +package org.springframework.boot.graphql; import org.junit.jupiter.api.Test; @@ -8,9 +8,6 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConf import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.graphql.GraphQLAutoConfiguration; -import org.springframework.boot.graphql.GraphQLDataFetchers; -import org.springframework.boot.graphql.RuntimeWiringCustomizer; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -22,14 +19,14 @@ import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -class GraphQLWebEndpointTests { +class WebMvcApplicationContextTests { @Test - void endpointHandlesGraphQLQueries() throws Exception { + void endpointHandlesGraphQLQueries() { new WebApplicationContextRunner() .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class, - GraphQLAutoConfiguration.class, GraphQLWebAutoConfiguration.class)) + GraphQLAutoConfiguration.class, WebMvcGraphQLAutoConfiguration.class)) .withUserConfiguration(DataFetchersConfiguration.class) .withPropertyValues("spring.main.web-application-type=servlet", "spring.graphql.schema:classpath:books/schema.graphqls").run((context) -> {