diff --git a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/WebFluxWebSocketSampleSubscriptionTests.java b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/WebFluxWebSocketSampleSubscriptionTests.java index c36285d9..6b839c9c 100644 --- a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/WebFluxWebSocketSampleSubscriptionTests.java +++ b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/WebFluxWebSocketSampleSubscriptionTests.java @@ -57,7 +57,7 @@ public class WebFluxWebSocketSampleSubscriptionTests { .toFlux(); StepVerifier.create(result) - .consumeNextWith(response -> response.path("greetings").valueExists()) + .consumeNextWith(response -> response.path("greetings").hasValue()) .consumeNextWith(response -> response.path("greetings").matchesJson("\"Bonjour!\"")) .consumeNextWith(response -> response.path("greetings").matchesJson("\"Hola!\"")) .expectNextCount(2) diff --git a/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java b/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java index b84d4e74..db857a4e 100644 --- a/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java +++ b/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import reactor.core.publisher.Mono; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import org.springframework.graphql.web.WebInterceptor; +import org.springframework.graphql.web.WebGraphQlHandlerInterceptor; @SpringBootApplication public class SampleApplication { @@ -33,7 +33,7 @@ public class SampleApplication { } @Bean - public WebInterceptor interceptor() { + public WebGraphQlHandlerInterceptor interceptor() { return (webInput, interceptorChain) -> { // Switch threads to prove ThreadLocal context propagation works return Mono.delay(Duration.ofMillis(10)).flatMap(aLong -> interceptorChain.next(webInput)); diff --git a/samples/webmvc-http/src/test/java/io/spring/sample/graphql/repository/ArtifactRepositoriesTests.java b/samples/webmvc-http/src/test/java/io/spring/sample/graphql/repository/ArtifactRepositoriesTests.java index 40d2f845..4fface62 100644 --- a/samples/webmvc-http/src/test/java/io/spring/sample/graphql/repository/ArtifactRepositoriesTests.java +++ b/samples/webmvc-http/src/test/java/io/spring/sample/graphql/repository/ArtifactRepositoriesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ class ArtifactRepositoriesTests { this.graphQlTester.documentName("artifactRepositories") .execute() .path("artifactRepositories[*].id") - .entityList(String.class).containsExactly("spring-releases", "spring-milestones"); + .entityList(String.class).containsExactly("spring-releases", "spring-milestones", "spring-snapshots"); } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c3c22c48..8e6c6be4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -26,11 +26,11 @@ plugins { rootProject.name = 'spring-graphql' include 'spring-graphql', 'spring-graphql-test', - 'spring-graphql-docs' -// 'samples:webmvc-http', -// 'samples:webmvc-http-security', -// 'samples:webflux-security', -// 'samples:webflux-websocket' + 'spring-graphql-docs', + 'samples:webmvc-http', + 'samples:webmvc-http-security', + 'samples:webflux-security', + 'samples:webflux-websocket' settings.gradle.projectsLoaded { gradleEnterprise {