Skip to content

Commit b61931f

Browse files
committed
Update reference docs configuration
1 parent 258bb10 commit b61931f

7 files changed

Lines changed: 32 additions & 88 deletions

File tree

build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ subprojects {
2323

2424
repositories {
2525
mavenCentral()
26-
maven {
27-
url "https://repo.spring.io/milestone"
28-
content {
29-
includeGroup "org.springframework.boot"
30-
}
31-
}
3226
if (version.contains('-')) {
3327
maven { url "https://repo.spring.io/milestone" }
3428
}

spring-graphql-docs/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ asciidoc:
2929
javadoc: https://docs.spring.io/spring-graphql/docs/{spring-graphql-version}/api
3030
# version attributes from main build.gradle
3131
spring-framework-ref-docs: https://docs.spring.io/spring-framework/reference
32-
spring-boot-ref-docs: https://docs.spring.io/spring-boot/{spring-boot-version}
32+
spring-boot-ref-docs: https://docs.spring.io/spring-boot
3333
examples-repo: https://github.com/spring-projects/spring-graphql-examples

spring-graphql-docs/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,18 @@ nullability {
1919
requireExplicitNullMarking = false
2020
}
2121

22-
def springBootVersion = "4.0.2"
2322

2423
dependencies {
2524
dependencyManagement(enforcedPlatform(dependencies.project(path: ":platform")))
2625
api project(':spring-graphql')
2726
api project(':spring-graphql-test')
27+
implementation 'jakarta.servlet:jakarta.servlet-api'
2828
implementation 'org.springframework:spring-webflux'
2929
implementation 'org.springframework:spring-webmvc'
3030
implementation 'org.springframework:spring-websocket'
3131
implementation 'org.springframework:spring-messaging'
3232
implementation 'org.springframework.data:spring-data-commons'
3333
implementation 'com.querydsl:querydsl-core'
34-
implementation ("org.springframework.boot:spring-boot-graphql:${springBootVersion}") {
35-
exclude group: 'org.springframework.graphql'
36-
}
37-
implementation "org.springframework.boot:spring-boot-starter-webmvc:${springBootVersion}"
3834
implementation 'tools.jackson.core:jackson-databind'
3935
implementation 'io.rsocket:rsocket-core'
4036
implementation 'io.rsocket:rsocket-transport-netty'
@@ -103,7 +99,6 @@ antora {
10399

104100
tasks.named("generateAntoraYml") {
105101
asciidocAttributes = project.provider( { ['spring-graphql-version': project.version,
106-
'spring-boot-version': springBootVersion,
107102
'spring-framework-version': springFrameworkVersion] } )
108103
}
109104

spring-graphql-docs/modules/ROOT/pages/controllers.adoc

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,22 @@ include-code::MusicController[]
10751075
Instead of declaring wrapping types ("MusicQueries", "UserQueries") explicitly in controllers,
10761076
you can choose to configure them with the runtime wiring using a `GraphQlSourceBuilderCustomizer` with Spring Boot:
10771077

1078-
include-code::NamespaceConfiguration[]
1078+
[source,java,subs="verbatim,quotes"]
1079+
----
1080+
@Configuration
1081+
public class NamespaceConfiguration {
1082+
1083+
@Bean
1084+
public GraphQlSourceBuilderCustomizer customizer() {
1085+
List<String> queryWrappers = List.of("music", "users"); // <1>
1086+
1087+
return (sourceBuilder) -> sourceBuilder.configureRuntimeWiring((wiringBuilder) ->
1088+
queryWrappers.forEach((field) -> wiringBuilder.type("Query",
1089+
(builder) -> builder.dataFetcher(field, (env) -> Collections.emptyMap()))) // <2>
1090+
);
1091+
}
1092+
1093+
}
1094+
----
10791095
<1> List all the wrapper types for the "Query" type
10801096
<2> Manually declare data fetchers for each of them, returning an empty Map

spring-graphql-docs/modules/ROOT/pages/request-execution.adoc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,20 @@ and `DataFetcherExceptionResolver` and `SubscriptionExceptionResolver` beans fo
2828
xref:request-execution.adoc#execution.exceptions[exception resolution]. For further customizations, you can also
2929
declare a `GraphQlSourceBuilderCustomizer` bean, for example:
3030

31-
include-code::GraphQlConfig[]
31+
[source,java,indent=0,subs="verbatim,quotes"]
32+
----
33+
@Configuration(proxyBeanMethods = false)
34+
public class GraphQlConfig {
3235
36+
@Bean
37+
public GraphQlSourceBuilderCustomizer sourceBuilderCustomizer() {
38+
return (builder) ->
39+
builder.configureGraphQl((graphQlBuilder) ->
40+
graphQlBuilder.executionIdProvider(new CustomExecutionIdProvider()));
41+
}
42+
43+
}
44+
----
3345

3446

3547
[[execution.graphqlsource.schema-resources]]

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/controllers/namespacing/NamespaceConfiguration.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/execution/graphqlsource/GraphQlConfig.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)