Skip to content

Commit 9bc4c40

Browse files
committed
Re-enable samples
1 parent 8300152 commit 9bc4c40

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

samples/webflux-websocket/src/test/java/io/spring/sample/graphql/WebFluxWebSocketSampleSubscriptionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void subscriptionWithResponse() {
5757
.toFlux();
5858

5959
StepVerifier.create(result)
60-
.consumeNextWith(response -> response.path("greetings").valueExists())
60+
.consumeNextWith(response -> response.path("greetings").hasValue())
6161
.consumeNextWith(response -> response.path("greetings").matchesJson("\"Bonjour!\""))
6262
.consumeNextWith(response -> response.path("greetings").matchesJson("\"Hola!\""))
6363
.expectNextCount(2)

samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
import org.springframework.boot.SpringApplication;
2424
import org.springframework.boot.autoconfigure.SpringBootApplication;
2525
import org.springframework.context.annotation.Bean;
26-
import org.springframework.graphql.web.WebInterceptor;
26+
import org.springframework.graphql.web.WebGraphQlHandlerInterceptor;
2727

2828
@SpringBootApplication
2929
public class SampleApplication {
@@ -33,7 +33,7 @@ public static void main(String[] args) {
3333
}
3434

3535
@Bean
36-
public WebInterceptor interceptor() {
36+
public WebGraphQlHandlerInterceptor interceptor() {
3737
return (webInput, interceptorChain) -> {
3838
// Switch threads to prove ThreadLocal context propagation works
3939
return Mono.delay(Duration.ofMillis(10)).flatMap(aLong -> interceptorChain.next(webInput));

samples/webmvc-http/src/test/java/io/spring/sample/graphql/repository/ArtifactRepositoriesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ void querydslRepositoryMany() {
4444
this.graphQlTester.documentName("artifactRepositories")
4545
.execute()
4646
.path("artifactRepositories[*].id")
47-
.entityList(String.class).containsExactly("spring-releases", "spring-milestones");
47+
.entityList(String.class).containsExactly("spring-releases", "spring-milestones", "spring-snapshots");
4848
}
4949

5050
}

settings.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ plugins {
2626
rootProject.name = 'spring-graphql'
2727
include 'spring-graphql',
2828
'spring-graphql-test',
29-
'spring-graphql-docs'
30-
// 'samples:webmvc-http',
31-
// 'samples:webmvc-http-security',
32-
// 'samples:webflux-security',
33-
// 'samples:webflux-websocket'
29+
'spring-graphql-docs',
30+
'samples:webmvc-http',
31+
'samples:webmvc-http-security',
32+
'samples:webflux-security',
33+
'samples:webflux-websocket'
3434

3535
settings.gradle.projectsLoaded {
3636
gradleEnterprise {

0 commit comments

Comments
 (0)