diff --git a/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxAutoConfiguration.java b/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxAutoConfiguration.java new file mode 100644 index 0000000..0207ca3 --- /dev/null +++ b/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxAutoConfiguration.java @@ -0,0 +1,41 @@ +package ru.sadv1r.spring.graphql.editor.graphiql.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.core.annotation.Order; +import org.springframework.web.reactive.function.server.HandlerFunction; +import org.springframework.web.reactive.function.server.RenderingResponse; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; + +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; + +@AutoConfiguration +@EnableConfigurationProperties(GraphiqlProperties.class) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) +@ConditionalOnProperty(value = "spring.graphql.graphiql.enabled", havingValue = "true", matchIfMissing = true) +public class GraphiQlWebFluxAutoConfiguration { + + @Bean + @Order(-1) + public RouterFunction reactiveGraphiQlRouterFunction(GraphiqlProperties properties, + @Value("${spring.graphql.path:/graphql}") String serverPath) { + final HandlerFunction handler = e -> RenderingResponse.create("graphiql") + .modelAttribute("cdnHost", properties.getCdn().getHost()) + .modelAttribute("serverPath", serverPath) + .modelAttribute("query", properties.getQuery()) + .modelAttribute("defaultEditorToolsVisibility", properties.getDefaultEditorToolsVisibility()) + .modelAttribute("variables", properties.getVariables()) + .modelAttribute("headers", properties.getHeaders()) + .modelAttribute("plugins", properties.getPlugins()) + .modelAttribute("stylePath", properties.getStylePath()) + .build(); + + return RouterFunctions.route(GET(properties.getPath()), handler); + } + +} diff --git a/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxMvcAutoConfiguration.java b/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxMvcAutoConfiguration.java deleted file mode 100644 index c5ac546..0000000 --- a/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxMvcAutoConfiguration.java +++ /dev/null @@ -1,41 +0,0 @@ -package ru.sadv1r.spring.graphql.editor.graphiql.configuration; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.core.annotation.Order; -import org.springframework.web.reactive.function.server.*; -import reactor.core.publisher.Mono; - -@AutoConfiguration -@EnableConfigurationProperties(GraphiqlProperties.class) -@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) -@ConditionalOnProperty(value = "spring.graphql.graphiql.enabled", havingValue = "true", matchIfMissing = true) -public class GraphiQlWebFluxMvcAutoConfiguration { - - @Bean - @Order(-1) - @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) - public RouterFunction reactiveGraphiQlRouterFunction(GraphiqlProperties properties, - @Value("${spring.graphql.path:/graphql}") String serverPath) { - RouterFunctions.Builder builder = RouterFunctions.route(); - if (properties.isEnabled()) { - final HandlerFunction graphiql = e -> (Mono) (Mono) RenderingResponse.create("graphiql") - .modelAttribute("cdnHost", properties.getCdn().getHost()) - .modelAttribute("serverPath", serverPath) - .modelAttribute("query", properties.getQuery()) - .modelAttribute("defaultEditorToolsVisibility", properties.getDefaultEditorToolsVisibility()) - .modelAttribute("variables", properties.getVariables()) - .modelAttribute("headers", properties.getHeaders()) - .modelAttribute("plugins", properties.getPlugins()) - .modelAttribute("stylePath", properties.getStylePath()) - .build(); - builder = builder.GET(properties.getPath(), graphiql); - } - return builder.build(); - } - -} diff --git a/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebMvcAutoConfiguration.java b/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebMvcAutoConfiguration.java index 960fcd2..d1521f0 100644 --- a/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebMvcAutoConfiguration.java +++ b/graphql-graphiql-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebMvcAutoConfiguration.java @@ -9,6 +9,8 @@ import org.springframework.core.annotation.Order; import org.springframework.web.servlet.function.*; +import static org.springframework.web.servlet.function.RequestPredicates.GET; + @AutoConfiguration @EnableConfigurationProperties(GraphiqlProperties.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @@ -19,21 +21,18 @@ public class GraphiQlWebMvcAutoConfiguration { @Order(-1) public RouterFunction graphiQlRouterFunction(GraphiqlProperties properties, @Value("${spring.graphql.path:/graphql}") String serverPath) { - RouterFunctions.Builder builder = RouterFunctions.route(); - if (properties.isEnabled()) { - final HandlerFunction graphiql = e -> RenderingResponse.create("graphiql") - .modelAttribute("cdnHost", properties.getCdn().getHost()) - .modelAttribute("serverPath", serverPath) - .modelAttribute("query", properties.getQuery()) - .modelAttribute("defaultEditorToolsVisibility", properties.getDefaultEditorToolsVisibility()) - .modelAttribute("variables", properties.getVariables()) - .modelAttribute("headers", properties.getHeaders()) - .modelAttribute("plugins", properties.getPlugins()) - .modelAttribute("stylePath", properties.getStylePath()) - .build(); - builder = builder.GET(properties.getPath(), graphiql); - } - return builder.build(); + final HandlerFunction handler = e -> RenderingResponse.create("graphiql") + .modelAttribute("cdnHost", properties.getCdn().getHost()) + .modelAttribute("serverPath", serverPath) + .modelAttribute("query", properties.getQuery()) + .modelAttribute("defaultEditorToolsVisibility", properties.getDefaultEditorToolsVisibility()) + .modelAttribute("variables", properties.getVariables()) + .modelAttribute("headers", properties.getHeaders()) + .modelAttribute("plugins", properties.getPlugins()) + .modelAttribute("stylePath", properties.getStylePath()) + .build(); + + return RouterFunctions.route(GET(properties.getPath()), handler); } } diff --git a/graphql-graphiql-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/graphql-graphiql-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 59072d8..896792f 100644 --- a/graphql-graphiql-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/graphql-graphiql-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -ru.sadv1r.spring.graphql.editor.graphiql.configuration.GraphiQlWebFluxMvcAutoConfiguration +ru.sadv1r.spring.graphql.editor.graphiql.configuration.GraphiQlWebFluxAutoConfiguration ru.sadv1r.spring.graphql.editor.graphiql.configuration.GraphiQlWebMvcAutoConfiguration \ No newline at end of file diff --git a/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebFluxMvcAutoConfiguration.java b/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebFluxMvcAutoConfiguration.java index fb8597c..2f1b4f7 100644 --- a/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebFluxMvcAutoConfiguration.java +++ b/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebFluxMvcAutoConfiguration.java @@ -7,8 +7,12 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.core.annotation.Order; -import org.springframework.web.reactive.function.server.*; -import reactor.core.publisher.Mono; +import org.springframework.web.reactive.function.server.HandlerFunction; +import org.springframework.web.reactive.function.server.RenderingResponse; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; + +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; @AutoConfiguration @EnableConfigurationProperties(PlaygroundProperties.class) @@ -18,21 +22,17 @@ public class PlaygroundWebFluxMvcAutoConfiguration { @Bean @Order(-1) - @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) - public RouterFunction reactivePlaygroundRouterFunction(PlaygroundProperties properties, - @Value("${spring.graphql.path:/graphql}") String serverPath) { - RouterFunctions.Builder builder = RouterFunctions.route(); - if (properties.isEnabled()) { - final HandlerFunction handler = e -> (Mono) (Mono) RenderingResponse.create("playground") - .modelAttribute("cdnHost", properties.getCdn().getHost()) - .modelAttribute("serverPath", serverPath) - .modelAttribute("settings", properties.getSettings()) - .modelAttribute("headers", properties.getHeaders()) - .modelAttribute("tabs", properties.getTabs()) - .build(); - builder = builder.GET(properties.getPath(), handler); - } - return builder.build(); + public RouterFunction reactivePlaygroundRouterFunction(PlaygroundProperties properties, + @Value("${spring.graphql.path:/graphql}") String serverPath) { + final HandlerFunction handler = e -> RenderingResponse.create("playground") + .modelAttribute("cdnHost", properties.getCdn().getHost()) + .modelAttribute("serverPath", serverPath) + .modelAttribute("settings", properties.getSettings()) + .modelAttribute("headers", properties.getHeaders()) + .modelAttribute("tabs", properties.getTabs()) + .build(); + + return RouterFunctions.route(GET(properties.getPath()), handler); } } diff --git a/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebMvcAutoConfiguration.java b/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebMvcAutoConfiguration.java index 2308acd..2a285cb 100644 --- a/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebMvcAutoConfiguration.java +++ b/graphql-playground-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/playground/configuration/PlaygroundWebMvcAutoConfiguration.java @@ -9,6 +9,8 @@ import org.springframework.core.annotation.Order; import org.springframework.web.servlet.function.*; +import static org.springframework.web.servlet.function.RequestPredicates.GET; + @AutoConfiguration @EnableConfigurationProperties(PlaygroundProperties.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @@ -18,19 +20,16 @@ public class PlaygroundWebMvcAutoConfiguration { @Bean @Order(-1) public RouterFunction playgroundRouterFunction(PlaygroundProperties properties, - @Value("${spring.graphql.path:/graphql}") String serverPath) { - RouterFunctions.Builder builder = RouterFunctions.route(); - if (properties.isEnabled()) { - final HandlerFunction handler = e -> RenderingResponse.create("playground") - .modelAttribute("cdnHost", properties.getCdn().getHost()) - .modelAttribute("serverPath", serverPath) - .modelAttribute("settings", properties.getSettings()) - .modelAttribute("headers", properties.getHeaders()) - .modelAttribute("tabs", properties.getTabs()) - .build(); - builder = builder.GET(properties.getPath(), handler); - } - return builder.build(); + @Value("${spring.graphql.path:/graphql}") String serverPath) { + final HandlerFunction handler = e -> RenderingResponse.create("playground") + .modelAttribute("cdnHost", properties.getCdn().getHost()) + .modelAttribute("serverPath", serverPath) + .modelAttribute("settings", properties.getSettings()) + .modelAttribute("headers", properties.getHeaders()) + .modelAttribute("tabs", properties.getTabs()) + .build(); + + return RouterFunctions.route(GET(properties.getPath()), handler); } } diff --git a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/ReactiveVoyagerController.java b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/ReactiveVoyagerController.java deleted file mode 100644 index bf201f0..0000000 --- a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/ReactiveVoyagerController.java +++ /dev/null @@ -1,36 +0,0 @@ -package ru.sadv1r.spring.graphql.editor.voyager; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.reactive.result.view.Rendering; -import reactor.core.publisher.Mono; -import ru.sadv1r.spring.graphql.editor.voyager.configuration.VoyagerProperties; - -@Controller -public class ReactiveVoyagerController { - - private final VoyagerProperties properties; - - @Value("${spring.graphql.path:/graphql}") - private String serverPath; - - public ReactiveVoyagerController(VoyagerProperties properties) { - this.properties = properties; - } - - @GetMapping(value = "${spring.graphql.voyager.path:/voyager}") - public Mono voyager() { - return Mono.just( - Rendering.view("voyager") - .modelAttribute("cdnHost", properties.getCdn().getHost()) - .modelAttribute("serverPath", serverPath) - .modelAttribute("displayOptions", properties.getDisplayOptions()) - .modelAttribute("hideDocs", properties.isHideDocs()) - .modelAttribute("hideSettings", properties.isHideSettings()) - .modelAttribute("stylePath", properties.getStylePath()) - .build() - ); - } - -} diff --git a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/ServletVoyagerController.java b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/ServletVoyagerController.java deleted file mode 100644 index 83a3af5..0000000 --- a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/ServletVoyagerController.java +++ /dev/null @@ -1,33 +0,0 @@ -package ru.sadv1r.spring.graphql.editor.voyager; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import ru.sadv1r.spring.graphql.editor.voyager.configuration.VoyagerProperties; - -@Controller -public class ServletVoyagerController { - - private final VoyagerProperties properties; - - @Value("${spring.graphql.path:/graphql}") - private String serverPath; - - public ServletVoyagerController(VoyagerProperties properties) { - this.properties = properties; - } - - @GetMapping(value = "${spring.graphql.voyager.path:/voyager}") - public String voyager(Model model) { - model - .addAttribute("cdnHost", properties.getCdn().getHost()) - .addAttribute("serverPath", serverPath) - .addAttribute("displayOptions", properties.getDisplayOptions()) - .addAttribute("hideDocs", properties.isHideDocs()) - .addAttribute("hideSettings", properties.isHideSettings()) - .addAttribute("stylePath", properties.getStylePath()); - return "voyager"; - } - -} diff --git a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerAutoConfiguration.java b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerAutoConfiguration.java deleted file mode 100644 index e1cbd8e..0000000 --- a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerAutoConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package ru.sadv1r.spring.graphql.editor.voyager.configuration; - -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import ru.sadv1r.spring.graphql.editor.voyager.ReactiveVoyagerController; -import ru.sadv1r.spring.graphql.editor.voyager.ServletVoyagerController; - -@AutoConfiguration -@ConditionalOnProperty(value = "spring.graphql.voyager.enabled", havingValue = "true", matchIfMissing = true) -@EnableConfigurationProperties(VoyagerProperties.class) -public class VoyagerAutoConfiguration { - - @Bean(name = "voyagerController") - @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) - public ServletVoyagerController servletVoyagerController(VoyagerProperties properties) { - return new ServletVoyagerController(properties); - } - - @Bean(name = "voyagerController") - @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) - public ReactiveVoyagerController reactiveVoyagerController(VoyagerProperties properties) { - return new ReactiveVoyagerController(properties); - } - -} diff --git a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebFluxAutoConfiguration.java b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebFluxAutoConfiguration.java new file mode 100644 index 0000000..0d9f116 --- /dev/null +++ b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebFluxAutoConfiguration.java @@ -0,0 +1,39 @@ +package ru.sadv1r.spring.graphql.editor.voyager.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.core.annotation.Order; +import org.springframework.web.reactive.function.server.HandlerFunction; +import org.springframework.web.reactive.function.server.RenderingResponse; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; + +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; + +@AutoConfiguration +@EnableConfigurationProperties(VoyagerProperties.class) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) +@ConditionalOnProperty(value = "spring.graphql.voyager.enabled", havingValue = "true", matchIfMissing = true) +public class VoyagerWebFluxAutoConfiguration { + + @Bean + @Order(-1) + public RouterFunction reactiveVoyagerRouterFunction(VoyagerProperties properties, + @Value("${spring.graphql.path:/graphql}") String serverPath) { + final HandlerFunction handler = e -> RenderingResponse.create("voyager") + .modelAttribute("cdnHost", properties.getCdn().getHost()) + .modelAttribute("serverPath", serverPath) + .modelAttribute("displayOptions", properties.getDisplayOptions()) + .modelAttribute("hideDocs", properties.isHideDocs()) + .modelAttribute("hideSettings", properties.isHideSettings()) + .modelAttribute("stylePath", properties.getStylePath()) + .build(); + + return RouterFunctions.route(GET(properties.getPath()), handler); + } + +} diff --git a/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebMvcAutoConfiguration.java b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebMvcAutoConfiguration.java new file mode 100644 index 0000000..2377cf4 --- /dev/null +++ b/graphql-voyager-spring-boot-starter/src/main/java/ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebMvcAutoConfiguration.java @@ -0,0 +1,36 @@ +package ru.sadv1r.spring.graphql.editor.voyager.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.core.annotation.Order; +import org.springframework.web.servlet.function.*; + +import static org.springframework.web.servlet.function.RequestPredicates.GET; + +@AutoConfiguration +@EnableConfigurationProperties(VoyagerProperties.class) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +@ConditionalOnProperty(value = "spring.graphql.voyager.enabled", havingValue = "true", matchIfMissing = true) +public class VoyagerWebMvcAutoConfiguration { + + @Bean + @Order(-1) + public RouterFunction voyagerRouterFunction(VoyagerProperties properties, + @Value("${spring.graphql.path:/graphql}") String serverPath) { + final HandlerFunction handler = e -> RenderingResponse.create("voyager") + .modelAttribute("cdnHost", properties.getCdn().getHost()) + .modelAttribute("serverPath", serverPath) + .modelAttribute("displayOptions", properties.getDisplayOptions()) + .modelAttribute("hideDocs", properties.isHideDocs()) + .modelAttribute("hideSettings", properties.isHideSettings()) + .modelAttribute("stylePath", properties.getStylePath()) + .build(); + + return RouterFunctions.route(GET(properties.getPath()), handler); + } + +} diff --git a/graphql-voyager-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/graphql-voyager-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 7e05cce..37e4fa3 100644 --- a/graphql-voyager-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/graphql-voyager-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ -ru.sadv1r.spring.graphql.editor.voyager.configuration.VoyagerAutoConfiguration \ No newline at end of file +ru.sadv1r.spring.graphql.editor.voyager.configuration.VoyagerWebFluxAutoConfiguration +ru.sadv1r.spring.graphql.editor.voyager.configuration.VoyagerWebMvcAutoConfiguration \ No newline at end of file diff --git a/samples/webflux-sample/src/main/java/org/springframework/graphql/editor/example/GraphqlEditorWebfluxExampleApplication.java b/samples/webflux-sample/src/main/java/org/springframework/graphql/editor/example/GraphqlEditorWebFluxExampleApplication.java similarity index 69% rename from samples/webflux-sample/src/main/java/org/springframework/graphql/editor/example/GraphqlEditorWebfluxExampleApplication.java rename to samples/webflux-sample/src/main/java/org/springframework/graphql/editor/example/GraphqlEditorWebFluxExampleApplication.java index d3bb3ee..ae2b124 100644 --- a/samples/webflux-sample/src/main/java/org/springframework/graphql/editor/example/GraphqlEditorWebfluxExampleApplication.java +++ b/samples/webflux-sample/src/main/java/org/springframework/graphql/editor/example/GraphqlEditorWebFluxExampleApplication.java @@ -4,10 +4,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class GraphqlEditorWebfluxExampleApplication { +public class GraphqlEditorWebFluxExampleApplication { public static void main(String[] args) { - SpringApplication.run(GraphqlEditorWebfluxExampleApplication.class, args); + SpringApplication.run(GraphqlEditorWebFluxExampleApplication.class, args); } }