Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent naming, simplified package structure

Browse Source
This commit is contained in:
Rossen Stoyanchev
2020-09-17 18:48:36 +01:00
parent 8dc56ceaa5
commit aabe780e9a
8 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-starter-graphql-webflux/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.boot.graphql.reactive.GraphQLWebFluxAutoConfiguration
org.springframework.boot.graphql.WebFluxGraphQLAutoConfiguration

5
spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxAutoConfiguration.java → spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java
View File

@@ -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

5
spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/GraphQLWebAutoConfiguration.java → spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java
View File

@@ -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

6
spring-graphql-web/src/main/java/org/springframework/boot/graphql/reactive/package-info.java
View File

@@ -1,6 +0,0 @@
@NonNullApi
@NonNullFields
package org.springframework.boot.graphql.reactive;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

6
spring-graphql-web/src/main/java/org/springframework/boot/graphql/servlet/package-info.java
View File

@@ -1,6 +0,0 @@
@NonNullApi
@NonNullFields
package org.springframework.boot.graphql.servlet;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

4
spring-graphql-web/src/main/resources/META-INF/spring.factories
View File

@@ -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

11
spring-graphql-web/src/test/java/org/springframework/boot/graphql/reactive/GraphQLWebFluxEndpointTests.java → spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebFluxApplicationContextTests.java
View File

@@ -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);

11
spring-graphql-web/src/test/java/org/springframework/boot/graphql/servlet/GraphQLWebEndpointTests.java → spring-graphql-web/src/test/java/org/springframework/boot/graphql/WebMvcApplicationContextTests.java
View File

@@ -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) -> {