Browse Source

Merge branch 'main' into 4.0.x

pull/45939/head
Stéphane Nicoll 8 months ago
parent
commit
d73ccf4ff7
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java
  2. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java
  3. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java

@ -46,8 +46,6 @@ public final class GraphQlTestDataFetchers { @@ -46,8 +46,6 @@ public final class GraphQlTestDataFetchers {
return (environment) -> getBooksOnSale(environment.getArgument("minPages"));
}
@SuppressWarnings("deprecation")
@org.springframework.lang.Nullable
public static Book getBookById(String id) {
return books.stream().filter((book) -> book.getId().equals(id)).findFirst().orElse(null);
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java

@ -169,8 +169,6 @@ class GraphQlWebFluxSecurityAutoConfigurationTests { @@ -169,8 +169,6 @@ class GraphQlWebFluxSecurityAutoConfigurationTests {
static class BookService {
@PreAuthorize("hasRole('USER')")
@org.springframework.lang.Nullable
@SuppressWarnings("deprecation")
Mono<Book> getBookdById(String id) {
return Mono.justOrEmpty(GraphQlTestDataFetchers.getBookById(id));
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java

@ -158,8 +158,6 @@ class GraphQlWebMvcSecurityAutoConfigurationTests { @@ -158,8 +158,6 @@ class GraphQlWebMvcSecurityAutoConfigurationTests {
static class BookService {
@PreAuthorize("hasRole('USER')")
@org.springframework.lang.Nullable
@SuppressWarnings("deprecation")
Book getBookdById(String id) {
return GraphQlTestDataFetchers.getBookById(id);
}

Loading…
Cancel
Save