From 5170a2e722e5788dd4ed6ad7bd6fd0e9e840a326 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 Mar 2023 12:35:12 +0000 Subject: [PATCH] Upgrade to Spring Java Format 0.0.38 --- .../support/junit/AwaitApplication.java | 2 +- .../DockerComposeHostParameterResolver.java | 2 +- .../DockerComposePortParameterResolver.java | 2 +- .../junit/WebTestClientParameterResolver.java | 3 +- .../com/example/batch/BatchConfiguration.java | 21 ++- .../JobCompletionNotificationListener.java | 6 +- ...torWebFluxMgmtPortApplicationAotTests.java | 67 +++++++-- .../ActuatorWebFluxApplicationAotTests.java | 128 ++++++++++++++---- .../webflux/ActuatorWebFluxApplication.java | 2 +- .../webmvc/ActuatorWebMvcApplication.java | 2 +- .../example/cloud/gateway/RoutesConfig.java | 12 +- .../SpringCloudStreamKafkaApplication.java | 2 +- .../SpringCloudStreamRabbitApplication.java | 2 +- .../example/data/cassandra/reactive/CLR.java | 6 +- .../reactive/CassandraConfiguration.java | 2 +- .../cassandra/CassandraConfiguration.java | 2 +- .../example/data/mongodb/reactive/CLR.java | 26 ++-- .../mongodb/reactive/OrderRepositoryImpl.java | 18 ++- .../java/com/example/data/mongodb/Order.java | 5 +- .../data/mongodb/OrderRepositoryImpl.java | 18 ++- .../com/example/data/redis/reactive/CLR.java | 17 ++- .../redis/reactive/RedisConfiguration.java | 2 +- .../example/hateoas/ManagerController.java | 7 +- .../assembler/ManagerModelAssembler.java | 2 +- .../example/quartz/QuartzConfiguration.java | 14 +- .../java/com/example/resttemplate/CLR.java | 3 +- .../com/example/rsocket/RSocketClient.java | 18 ++- .../main/java/com/example/webclient/CLR.java | 16 ++- .../webclient/WebClientApplication.java | 2 +- .../webflux/jetty/WebsocketConfig.java | 4 +- .../example/webflux/tls/WebsocketConfig.java | 4 +- .../com/example/webflux/WebsocketConfig.java | 4 +- .../webflux/undertow/WebsocketConfig.java | 4 +- .../jetty/WebMvcControllerMockTests.java | 5 +- .../webmvc/jetty/WebMvcSliceTests.java | 5 +- .../webmvc/AutoConfigureMockMvcTests.java | 5 +- .../webmvc/WebMvcControllerMockTests.java | 5 +- .../com/example/webmvc/WebMvcSliceTests.java | 5 +- .../undertow/AutoConfigureMockMvcTests.java | 5 +- .../undertow/WebMvcControllerMockTests.java | 5 +- .../webmvc/undertow/WebMvcSliceTests.java | 5 +- .../java/com/example/websocket/jetty/CLR.java | 6 +- .../java/com/example/websocket/stomp/CLR.java | 3 +- .../main/java/com/example/websocket/CLR.java | 6 +- .../com/example/websocket/undertow/CLR.java | 4 +- gradle.properties | 2 +- .../graphql/webflux/GraphQlTesterTests.java | 7 +- .../com/example/graphql/webflux/TcpTests.java | 7 +- .../graphql/webflux/GraphQlTesterTests.java | 7 +- .../graphql/webflux/RandomPortTests.java | 14 +- .../graphql/webmvc/GraphQlTesterTests.java | 7 +- .../graphql/webmvc/RandomPortTests.java | 14 +- .../integration/IntegrationApplication.java | 24 ++-- .../example/kafka/KafkaAvroApplication.java | 4 +- .../SpringPulsarReactiveApplication.java | 6 +- .../example/ldap/odm/OdmPersonDaoImpl.java | 11 +- .../java/com/example/security/method/CLR.java | 12 +- .../method/SecurityConfiguration.java | 14 +- .../env/MockWebServerPropertySource.java | 3 +- .../security/thymeleaf/SecurityConfig.java | 22 ++- .../SecurityThymeleafApplication.java | 4 +- .../security/webflux/WebSecurityConfig.java | 26 +++- .../security/webmvc/WebSecurityConfig.java | 26 +++- 63 files changed, 474 insertions(+), 220 deletions(-) diff --git a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/AwaitApplication.java b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/AwaitApplication.java index 05463b0c..2de9c1a9 100644 --- a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/AwaitApplication.java +++ b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/AwaitApplication.java @@ -36,7 +36,7 @@ class AwaitApplication implements BeforeAllCallback { private static final Duration START_TIMEOUT = Duration.ofSeconds(30); private Pattern APPLICATION_STARTED = Pattern - .compile("Started [A-Za-z0-9]+ in [0-9\\.]+ seconds \\(process running for [0-9\\.]+\\)"); + .compile("Started [A-Za-z0-9]+ in [0-9\\.]+ seconds \\(process running for [0-9\\.]+\\)"); @Override public void beforeAll(ExtensionContext context) throws Exception { diff --git a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposeHostParameterResolver.java b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposeHostParameterResolver.java index b239aea2..fe1e085c 100644 --- a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposeHostParameterResolver.java +++ b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposeHostParameterResolver.java @@ -47,7 +47,7 @@ class DockerComposeHostParameterResolver implements ParameterResolver { if (value == null) { throw new ParameterResolutionException( "Can't get host name for docker-compose service '%s', the environment variable '%s' is missing" - .formatted(serviceName, envVariable)); + .formatted(serviceName, envVariable)); } return value; } diff --git a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposePortParameterResolver.java b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposePortParameterResolver.java index 76c66302..5e01fbe5 100644 --- a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposePortParameterResolver.java +++ b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/DockerComposePortParameterResolver.java @@ -48,7 +48,7 @@ class DockerComposePortParameterResolver implements ParameterResolver { if (value == null) { throw new ParameterResolutionException( "Can't get mapped port for docker-compose service '%s' port %d, the environment variable '%s' is missing" - .formatted(serviceName, port, envVariable)); + .formatted(serviceName, port, envVariable)); } return Integer.parseInt(value); } diff --git a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/WebTestClientParameterResolver.java b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/WebTestClientParameterResolver.java index 94f0c42d..4afdb940 100644 --- a/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/WebTestClientParameterResolver.java +++ b/aot-smoke-test-support/src/main/java/org/springframework/aot/smoketest/support/junit/WebTestClientParameterResolver.java @@ -49,7 +49,8 @@ class WebTestClientParameterResolver implements ParameterResolver { private WebTestClient createWebTestClient(ExtensionContext extensionContext) { return WebTestClient.bindToServer() - .baseUrl("http://localhost:" + ApplicationUnderTest.get(extensionContext).getPort()).build(); + .baseUrl("http://localhost:" + ApplicationUnderTest.get(extensionContext).getPort()) + .build(); } } diff --git a/batch/batch/src/main/java/com/example/batch/BatchConfiguration.java b/batch/batch/src/main/java/com/example/batch/BatchConfiguration.java index e6c0b863..f2b6b70c 100644 --- a/batch/batch/src/main/java/com/example/batch/BatchConfiguration.java +++ b/batch/batch/src/main/java/com/example/batch/BatchConfiguration.java @@ -31,8 +31,11 @@ class BatchConfiguration { @StepScope public FlatFileItemReader reader(@Value("#{jobParameters['fileName']}") String fileName) { return new FlatFileItemReaderBuilder().name("personItemReader") - .resource(new ClassPathResource(fileName)).delimited().names("firstName", "lastName") - .fieldSetMapper(new RecordFieldSetMapper<>(Person.class)).build(); + .resource(new ClassPathResource(fileName)) + .delimited() + .names("firstName", "lastName") + .fieldSetMapper(new RecordFieldSetMapper<>(Person.class)) + .build(); } @Bean @@ -46,9 +49,10 @@ class BatchConfiguration { @Bean public JdbcBatchItemWriter writer(DataSource dataSource) { return new JdbcBatchItemWriterBuilder() - .itemSqlParameterSourceProvider(new BeanPropertyItemSqlParameterSourceProvider<>()) - .sql("INSERT INTO person (first_name, last_name) VALUES (:firstName, :lastName)").dataSource(dataSource) - .build(); + .itemSqlParameterSourceProvider(new BeanPropertyItemSqlParameterSourceProvider<>()) + .sql("INSERT INTO person (first_name, last_name) VALUES (:firstName, :lastName)") + .dataSource(dataSource) + .build(); } @Bean @@ -60,8 +64,11 @@ class BatchConfiguration { public Step step1(JobRepository jobRepository, FlatFileItemReader itemReader, ItemProcessor itemProcessor, JdbcBatchItemWriter itemWriter, PlatformTransactionManager transactionManager) { - return new StepBuilder("step1", jobRepository).chunk(2, transactionManager).reader(itemReader) - .processor(itemProcessor).writer(itemWriter).build(); + return new StepBuilder("step1", jobRepository).chunk(2, transactionManager) + .reader(itemReader) + .processor(itemProcessor) + .writer(itemWriter) + .build(); } @Bean diff --git a/batch/batch/src/main/java/com/example/batch/JobCompletionNotificationListener.java b/batch/batch/src/main/java/com/example/batch/JobCompletionNotificationListener.java index 810f7693..9893bb89 100644 --- a/batch/batch/src/main/java/com/example/batch/JobCompletionNotificationListener.java +++ b/batch/batch/src/main/java/com/example/batch/JobCompletionNotificationListener.java @@ -22,9 +22,9 @@ public class JobCompletionNotificationListener implements JobExecutionListener { public void afterJob(JobExecution jobExecution) { if (jobExecution.getStatus() == BatchStatus.COMPLETED) { jdbcTemplate - .query("SELECT first_name, last_name FROM person", - (resultSet, row) -> new Person(resultSet.getString(1), resultSet.getString(2))) - .forEach(person -> LOGGER.info("Found <" + person + "> in the database.")); + .query("SELECT first_name, last_name FROM person", + (resultSet, row) -> new Person(resultSet.getString(1), resultSet.getString(2))) + .forEach(person -> LOGGER.info("Found <" + person + "> in the database.")); } } diff --git a/boot/actuator-webflux-mgmt-port/src/appTest/java/com/example/actuator/webflux/mgmtport/ActuatorWebFluxMgmtPortApplicationAotTests.java b/boot/actuator-webflux-mgmt-port/src/appTest/java/com/example/actuator/webflux/mgmtport/ActuatorWebFluxMgmtPortApplicationAotTests.java index 2e70a28c..8169a4e9 100644 --- a/boot/actuator-webflux-mgmt-port/src/appTest/java/com/example/actuator/webflux/mgmtport/ActuatorWebFluxMgmtPortApplicationAotTests.java +++ b/boot/actuator-webflux-mgmt-port/src/appTest/java/com/example/actuator/webflux/mgmtport/ActuatorWebFluxMgmtPortApplicationAotTests.java @@ -24,39 +24,80 @@ class ActuatorWebFluxMgmtPortApplicationAotTests { @Test void shouldContainLinks() { - client.get().uri("/actuator").exchange().expectStatus().isOk().expectBody().jsonPath("$._links.self.templated") - .isEqualTo(false).jsonPath("$._links.env-toMatch.templated").isEqualTo(true); + client.get() + .uri("/actuator") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$._links.self.templated") + .isEqualTo(false) + .jsonPath("$._links.env-toMatch.templated") + .isEqualTo(true); } @Test void shouldHaveReadiness() { - client.get().uri("/actuator/health/readiness").exchange().expectStatus().isOk().expectBody() - .jsonPath("$.status").isEqualTo("UP"); + client.get() + .uri("/actuator/health/readiness") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.status") + .isEqualTo("UP"); } @Test void shouldHaveEnvInfoProperties() { - client.get().uri("/actuator/info").exchange().expectStatus().isOk().expectBody().jsonPath("$.app.hello") - .isEqualTo("world"); + client.get() + .uri("/actuator/info") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.app.hello") + .isEqualTo("world"); } @Test void shouldHaveJavaInfoProperties() { - client.get().uri("/actuator/info").exchange().expectStatus().isOk().expectBody().jsonPath("$.java.version") - .isNotEmpty(); + client.get() + .uri("/actuator/info") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.java.version") + .isNotEmpty(); } @Test void shouldHaveOsInfoProperties() { - client.get().uri("/actuator/info").exchange().expectStatus().isOk().expectBody().jsonPath("$.os.name") - .isNotEmpty(); + client.get() + .uri("/actuator/info") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.os.name") + .isNotEmpty(); } @Test void shouldHaveLoggers() { - client.get().uri("/actuator/loggers").exchange().expectStatus().isOk().expectBody().jsonPath("$.levels") - .isNotEmpty().jsonPath("$.loggers.['ROOT']").isNotEmpty().jsonPath("$.loggers.['_org.springframework']") - .isNotEmpty(); + client.get() + .uri("/actuator/loggers") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.levels") + .isNotEmpty() + .jsonPath("$.loggers.['ROOT']") + .isNotEmpty() + .jsonPath("$.loggers.['_org.springframework']") + .isNotEmpty(); } private static WebTestClient buildManagementClient() { diff --git a/boot/actuator-webflux/src/appTest/java/com/example/actuator/webflux/ActuatorWebFluxApplicationAotTests.java b/boot/actuator-webflux/src/appTest/java/com/example/actuator/webflux/ActuatorWebFluxApplicationAotTests.java index aea3df62..d7a5b901 100644 --- a/boot/actuator-webflux/src/appTest/java/com/example/actuator/webflux/ActuatorWebFluxApplicationAotTests.java +++ b/boot/actuator-webflux/src/appTest/java/com/example/actuator/webflux/ActuatorWebFluxApplicationAotTests.java @@ -12,71 +12,141 @@ class ActuatorWebFluxApplicationAotTests { @Test void shouldContainLinks(WebTestClient client) { - client.get().uri("/actuator").exchange().expectStatus().isOk().expectBody().jsonPath("$._links.self.templated") - .isEqualTo(false).jsonPath("$._links.env-toMatch.templated").isEqualTo(true); + client.get() + .uri("/actuator") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$._links.self.templated") + .isEqualTo(false) + .jsonPath("$._links.env-toMatch.templated") + .isEqualTo(true); } @Test void shouldHaveCustomHealthIndicator(WebTestClient client) { - client.get().uri("/actuator/health").exchange().expectStatus().isOk().expectBody().jsonPath("$.status") - .isEqualTo("UP").jsonPath("$.components.custom.status").isEqualTo("UP") - .jsonPath("$.components.custom.details.hello").isEqualTo("world"); + client.get() + .uri("/actuator/health") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.status") + .isEqualTo("UP") + .jsonPath("$.components.custom.status") + .isEqualTo("UP") + .jsonPath("$.components.custom.details.hello") + .isEqualTo("world"); } @Test void shouldHaveAnotherCustomHealthIndicator(WebTestClient client) { - client.get().uri("/actuator/health").exchange().expectStatus().isOk().expectBody() - .jsonPath("$.components.composite.status").isEqualTo("UP") - .jsonPath("$.components.composite.components.another-custom.status").isEqualTo("UP") - .jsonPath("$.components.composite.components.custom.status").isEqualTo("UP"); + client.get() + .uri("/actuator/health") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.components.composite.status") + .isEqualTo("UP") + .jsonPath("$.components.composite.components.another-custom.status") + .isEqualTo("UP") + .jsonPath("$.components.composite.components.custom.status") + .isEqualTo("UP"); } @Test void shouldHaveCompositeHealth(WebTestClient client) { - client.get().uri("/actuator/health").exchange().expectStatus().isOk().expectBody() - .jsonPath("$.components.anotherCustom.status").isEqualTo("UP"); + client.get() + .uri("/actuator/health") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.components.anotherCustom.status") + .isEqualTo("UP"); } @Test void shouldHaveReadiness(WebTestClient client) { - client.get().uri("/actuator/health/readiness").exchange().expectStatus().isOk().expectBody() - .jsonPath("$.status").isEqualTo("UP"); + client.get() + .uri("/actuator/health/readiness") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.status") + .isEqualTo("UP"); } @Test void shouldHaveEnvInfoProperties(WebTestClient client) { - client.get().uri("/actuator/info").exchange().expectStatus().isOk().expectBody().jsonPath("$.app.hello") - .isEqualTo("world"); + client.get() + .uri("/actuator/info") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.app.hello") + .isEqualTo("world"); } @Test void shouldHaveJavaInfoProperties(WebTestClient client) { - client.get().uri("/actuator/info").exchange().expectStatus().isOk().expectBody().jsonPath("$.java.version") - .isNotEmpty(); + client.get() + .uri("/actuator/info") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.java.version") + .isNotEmpty(); } @Test void shouldHaveOsInfoProperties(WebTestClient client) { - client.get().uri("/actuator/info").exchange().expectStatus().isOk().expectBody().jsonPath("$.os.name") - .isNotEmpty(); + client.get() + .uri("/actuator/info") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.os.name") + .isNotEmpty(); } @Test void prometheusWorks(WebTestClient client) { - client.get().uri("/actuator/prometheus").exchange().expectStatus().isOk().expectBody() - .consumeWith((result) -> assertThat(new String(result.getResponseBodyContent())) - // Check custom timer - .contains("custom_timer_seconds_max 5.0").contains("custom_timer_seconds_count 1.0") - .contains("custom_timer_seconds_sum 5.0") - // Check JVM metric - .contains("# TYPE jvm_threads_peak_threads gauge")); + client.get() + .uri("/actuator/prometheus") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .consumeWith((result) -> assertThat(new String(result.getResponseBodyContent())) + // Check custom timer + .contains("custom_timer_seconds_max 5.0") + .contains("custom_timer_seconds_count 1.0") + .contains("custom_timer_seconds_sum 5.0") + // Check JVM metric + .contains("# TYPE jvm_threads_peak_threads gauge")); } @Test void shouldHaveLoggers(WebTestClient client) { - client.get().uri("/actuator/loggers").exchange().expectStatus().isOk().expectBody().jsonPath("$.levels") - .isNotEmpty().jsonPath("$.loggers.['ROOT']").isNotEmpty().jsonPath("$.loggers.['_org.springframework']") - .isNotEmpty(); + client.get() + .uri("/actuator/loggers") + .exchange() + .expectStatus() + .isOk() + .expectBody() + .jsonPath("$.levels") + .isNotEmpty() + .jsonPath("$.loggers.['ROOT']") + .isNotEmpty() + .jsonPath("$.loggers.['_org.springframework']") + .isNotEmpty(); } } diff --git a/boot/actuator-webflux/src/main/java/com/example/actuator/webflux/ActuatorWebFluxApplication.java b/boot/actuator-webflux/src/main/java/com/example/actuator/webflux/ActuatorWebFluxApplication.java index de126633..0c0c7411 100644 --- a/boot/actuator-webflux/src/main/java/com/example/actuator/webflux/ActuatorWebFluxApplication.java +++ b/boot/actuator-webflux/src/main/java/com/example/actuator/webflux/ActuatorWebFluxApplication.java @@ -22,7 +22,7 @@ public class ActuatorWebFluxApplication { CompositeReactiveHealthContributor compositeReactiveHealthContributor(CustomHealthIndicator customHealthIndicator, AnotherCustomHealthIndicator anotherCustomHealthIndicator) { return CompositeReactiveHealthContributor - .fromMap(Map.of("custom", customHealthIndicator, "another-custom", anotherCustomHealthIndicator)); + .fromMap(Map.of("custom", customHealthIndicator, "another-custom", anotherCustomHealthIndicator)); } } diff --git a/boot/actuator-webmvc/src/main/java/com/example/actuator/webmvc/ActuatorWebMvcApplication.java b/boot/actuator-webmvc/src/main/java/com/example/actuator/webmvc/ActuatorWebMvcApplication.java index 60e879f1..8d83672c 100644 --- a/boot/actuator-webmvc/src/main/java/com/example/actuator/webmvc/ActuatorWebMvcApplication.java +++ b/boot/actuator-webmvc/src/main/java/com/example/actuator/webmvc/ActuatorWebMvcApplication.java @@ -22,7 +22,7 @@ public class ActuatorWebMvcApplication { CompositeHealthContributor compositeHealthContributor(CustomHealthIndicator customHealthIndicator, AnotherCustomHealthIndicator anotherCustomHealthIndicator) { return CompositeHealthContributor - .fromMap(Map.of("custom", customHealthIndicator, "another-custom", anotherCustomHealthIndicator)); + .fromMap(Map.of("custom", customHealthIndicator, "another-custom", anotherCustomHealthIndicator)); } } diff --git a/cloud/cloud-gateway/src/main/java/org/example/cloud/gateway/RoutesConfig.java b/cloud/cloud-gateway/src/main/java/org/example/cloud/gateway/RoutesConfig.java index 8c5c89f3..31c88e14 100644 --- a/cloud/cloud-gateway/src/main/java/org/example/cloud/gateway/RoutesConfig.java +++ b/cloud/cloud-gateway/src/main/java/org/example/cloud/gateway/RoutesConfig.java @@ -11,10 +11,14 @@ class RoutesConfig { @Bean RouteLocator customRouteLocator(RouteLocatorBuilder builder) { - return builder - .routes().route("demo_service_route", route -> route.path("/demo-service/**").and() - .method(HttpMethod.GET).filters(filter -> filter.stripPrefix(1)).uri("lb://demo-service")) - .build(); + return builder.routes() + .route("demo_service_route", + route -> route.path("/demo-service/**") + .and() + .method(HttpMethod.GET) + .filters(filter -> filter.stripPrefix(1)) + .uri("lb://demo-service")) + .build(); } } \ No newline at end of file diff --git a/cloud/cloud-stream-kafka/src/main/java/com/example/cloud/stream/kafka/SpringCloudStreamKafkaApplication.java b/cloud/cloud-stream-kafka/src/main/java/com/example/cloud/stream/kafka/SpringCloudStreamKafkaApplication.java index 7a03b2ad..6c44cb96 100644 --- a/cloud/cloud-stream-kafka/src/main/java/com/example/cloud/stream/kafka/SpringCloudStreamKafkaApplication.java +++ b/cloud/cloud-stream-kafka/src/main/java/com/example/cloud/stream/kafka/SpringCloudStreamKafkaApplication.java @@ -35,7 +35,7 @@ public class SpringCloudStreamKafkaApplication { @Bean public Supplier graalSupplier() { final String[] splitWoodchuck = "How much wood could a woodchuck chuck if a woodchuck could chuck wood?" - .split(" "); + .split(" "); final AtomicInteger wordsIndex = new AtomicInteger(0); return () -> { int wordIndex = wordsIndex.getAndAccumulate(splitWoodchuck.length, diff --git a/cloud/cloud-stream-rabbit/src/main/java/com/example/cloud/stream/rabbit/SpringCloudStreamRabbitApplication.java b/cloud/cloud-stream-rabbit/src/main/java/com/example/cloud/stream/rabbit/SpringCloudStreamRabbitApplication.java index 13933879..12ff8faa 100644 --- a/cloud/cloud-stream-rabbit/src/main/java/com/example/cloud/stream/rabbit/SpringCloudStreamRabbitApplication.java +++ b/cloud/cloud-stream-rabbit/src/main/java/com/example/cloud/stream/rabbit/SpringCloudStreamRabbitApplication.java @@ -38,7 +38,7 @@ public class SpringCloudStreamRabbitApplication { @Bean public Supplier graalSupplier() { final String[] splitWoodchuck = "How much wood could a woodchuck chuck if a woodchuck could chuck wood?" - .split(" "); + .split(" "); final AtomicInteger wordsIndex = new AtomicInteger(0); return () -> { int wordIndex = wordsIndex.getAndAccumulate(splitWoodchuck.length, diff --git a/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CLR.java b/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CLR.java index 3e12840e..120ec25a 100644 --- a/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CLR.java +++ b/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CLR.java @@ -17,9 +17,9 @@ class CLR implements CommandLineRunner { @Override public void run(String... args) { this.personRepository.save(new Person(UUID.randomUUID().toString(), "first-1", "last-1")) - .then(this.personRepository.save(new Person(UUID.randomUUID().toString(), "first-2", "last-2"))) - .then(this.personRepository.save(new Person(UUID.randomUUID().toString(), "first-3", "last-3"))) - .block(); + .then(this.personRepository.save(new Person(UUID.randomUUID().toString(), "first-2", "last-2"))) + .then(this.personRepository.save(new Person(UUID.randomUUID().toString(), "first-3", "last-3"))) + .block(); this.personRepository.findAll().subscribe((person) -> { System.out.printf("findAll(): %s%n", person); diff --git a/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CassandraConfiguration.java b/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CassandraConfiguration.java index 46ac890e..cccc87ed 100644 --- a/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CassandraConfiguration.java +++ b/data/data-cassandra-reactive/src/main/java/com/example/data/cassandra/reactive/CassandraConfiguration.java @@ -17,7 +17,7 @@ class CassandraConfiguration { // This creates the keyspace on startup try (CqlSession session = cqlSessionBuilder.withKeyspace((String) null).build()) { session.execute(CreateKeyspaceCqlGenerator - .toCql(CreateKeyspaceSpecification.createKeyspace(properties.getKeyspaceName()).ifNotExists())); + .toCql(CreateKeyspaceSpecification.createKeyspace(properties.getKeyspaceName()).ifNotExists())); } return cqlSessionBuilder.withKeyspace(properties.getKeyspaceName()).build(); } diff --git a/data/data-cassandra/src/main/java/com/example/data/cassandra/CassandraConfiguration.java b/data/data-cassandra/src/main/java/com/example/data/cassandra/CassandraConfiguration.java index 0a99486a..13d9e092 100644 --- a/data/data-cassandra/src/main/java/com/example/data/cassandra/CassandraConfiguration.java +++ b/data/data-cassandra/src/main/java/com/example/data/cassandra/CassandraConfiguration.java @@ -17,7 +17,7 @@ class CassandraConfiguration { // This creates the keyspace on startup try (CqlSession session = cqlSessionBuilder.withKeyspace((String) null).build()) { session.execute(CreateKeyspaceCqlGenerator - .toCql(CreateKeyspaceSpecification.createKeyspace(properties.getKeyspaceName()).ifNotExists())); + .toCql(CreateKeyspaceSpecification.createKeyspace(properties.getKeyspaceName()).ifNotExists())); } return cqlSessionBuilder.withKeyspace(properties.getKeyspaceName()).build(); } diff --git a/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/CLR.java b/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/CLR.java index 0ad0758f..a6fdf414 100644 --- a/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/CLR.java +++ b/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/CLR.java @@ -38,7 +38,7 @@ class CLR implements CommandLineRunner { repository.deleteAll().block(); Order order = new Order("c42", new Date()).// - addItem(product1).addItem(product2).addItem(product3); + addItem(product1).addItem(product2).addItem(product3); repository.save(order).block(); Iterable all = repository.findAll().toIterable(); @@ -69,8 +69,9 @@ class CLR implements CommandLineRunner { System.out.println("c42_page1: " + c42_page1); // slice - List c42_slice0 = repository.findSliceByCustomerId("c42", PageRequest.of(0, 2)).collectList() - .block(); + List c42_slice0 = repository.findSliceByCustomerId("c42", PageRequest.of(0, 2)) + .collectList() + .block(); System.out.println("c42_slice0: " + c42_slice0); System.out.println("-----------------\n\n\n"); @@ -82,7 +83,7 @@ class CLR implements CommandLineRunner { repository.deleteAll().block(); Order order = new Order("c42", new Date()).// - addItem(product1).addItem(product2).addItem(product3); + addItem(product1).addItem(product2).addItem(product3); repository.save(order).block(); List byCustomerId = repository.findByCustomerId(order.getCustomerId()).collectList().block(); @@ -98,11 +99,12 @@ class CLR implements CommandLineRunner { repository.deleteAll().block(); Order order = new Order("c42", new Date()).// - addItem(product1).addItem(product2).addItem(product3); + addItem(product1).addItem(product2).addItem(product3); repository.save(order).block(); - List byCustomerId = repository.findByCustomerViaAnnotation(order.getCustomerId()).collectList() - .block(); + List byCustomerId = repository.findByCustomerViaAnnotation(order.getCustomerId()) + .collectList() + .block(); System.out.print("annotatedQuery: "); byCustomerId.forEach(System.out::println); @@ -122,7 +124,8 @@ class CLR implements CommandLineRunner { repository.save(new Order("b12", new Date()).addItem(product1)).block(); List result = repository.totalOrdersPerCustomer(Sort.by(Sort.Order.desc("total"))) - .collectList().block(); + .collectList() + .block(); System.out.println("aggregation: " + result); System.out.println("-----------------\n\n\n"); @@ -134,7 +137,7 @@ class CLR implements CommandLineRunner { repository.deleteAll().block(); Order order = new Order("c42", new Date()).// - addItem(product1).addItem(product2).addItem(product3); + addItem(product1).addItem(product2).addItem(product3); order = repository.save(order).block(); Invoice invoice = repository.getInvoiceFor(order).block(); @@ -149,11 +152,12 @@ class CLR implements CommandLineRunner { repository.deleteAll().block(); Order order = new Order("c42", new Date()).// - addItem(product1).addItem(product2).addItem(product3); + addItem(product1).addItem(product2).addItem(product3); repository.save(order).block(); List result = repository.findOrderProjectionByCustomerId(order.getCustomerId()) - .collectList().block(); + .collectList() + .block(); System.out.print("projection: "); result.forEach(it -> System.out.println(String.format("OrderProjection(%s){id=%s, customerId=%s}", diff --git a/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/OrderRepositoryImpl.java b/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/OrderRepositoryImpl.java index 4383e58b..eee2eb70 100755 --- a/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/OrderRepositoryImpl.java +++ b/data/data-mongodb-reactive/src/main/java/com/example/data/mongodb/reactive/OrderRepositoryImpl.java @@ -42,14 +42,20 @@ class OrderRepositoryImpl implements OrderRepositoryCustom { match(where("id").is(order.getId())), // unwind("items"), // project("id", "customerId", "items") // - .andExpression("'$items.price' * '$items.quantity'").as("lineTotal"), // + .andExpression("'$items.price' * '$items.quantity'") + .as("lineTotal"), // group("id") // - .sum("lineTotal").as("netAmount") // - .addToSet("items").as("items"), // + .sum("lineTotal") + .as("netAmount") // + .addToSet("items") + .as("items"), // project("id", "items", "netAmount") // - .and("orderId").previousOperation() // - .andExpression("netAmount * [0]", taxRate).as("taxAmount") // - .andExpression("netAmount * (1 + [0])", taxRate).as("totalAmount") // + .and("orderId") + .previousOperation() // + .andExpression("netAmount * [0]", taxRate) + .as("taxAmount") // + .andExpression("netAmount * (1 + [0])", taxRate) + .as("totalAmount") // ), Invoice.class); return results.next(); diff --git a/data/data-mongodb/src/main/java/com/example/data/mongodb/Order.java b/data/data-mongodb/src/main/java/com/example/data/mongodb/Order.java index 5424ca63..d37e4120 100755 --- a/data/data-mongodb/src/main/java/com/example/data/mongodb/Order.java +++ b/data/data-mongodb/src/main/java/com/example/data/mongodb/Order.java @@ -197,8 +197,9 @@ public class Order { public static List getIndexes(IndexResolver indexResolver) { List ret = new ArrayList<>(); indexResolver.resolveIndexFor(Order.class).forEach(ret::add); - ret.add(new Index().unique().on("createdBy", Sort.Direction.ASC) - .partial(PartialIndexFilter.of(Criteria.where("createdBy").exists(true)))); + ret.add(new Index().unique() + .on("createdBy", Sort.Direction.ASC) + .partial(PartialIndexFilter.of(Criteria.where("createdBy").exists(true)))); return ret; } diff --git a/data/data-mongodb/src/main/java/com/example/data/mongodb/OrderRepositoryImpl.java b/data/data-mongodb/src/main/java/com/example/data/mongodb/OrderRepositoryImpl.java index a360af6f..4dcd59b2 100755 --- a/data/data-mongodb/src/main/java/com/example/data/mongodb/OrderRepositoryImpl.java +++ b/data/data-mongodb/src/main/java/com/example/data/mongodb/OrderRepositoryImpl.java @@ -41,14 +41,20 @@ class OrderRepositoryImpl implements OrderRepositoryCustom { match(where("id").is(order.getId())), // unwind("items"), // project("id", "customerId", "items") // - .andExpression("'$items.price' * '$items.quantity'").as("lineTotal"), // + .andExpression("'$items.price' * '$items.quantity'") + .as("lineTotal"), // group("id") // - .sum("lineTotal").as("netAmount") // - .addToSet("items").as("items"), // + .sum("lineTotal") + .as("netAmount") // + .addToSet("items") + .as("items"), // project("id", "items", "netAmount") // - .and("orderId").previousOperation() // - .andExpression("netAmount * [0]", taxRate).as("taxAmount") // - .andExpression("netAmount * (1 + [0])", taxRate).as("totalAmount") // + .and("orderId") + .previousOperation() // + .andExpression("netAmount * [0]", taxRate) + .as("taxAmount") // + .andExpression("netAmount * (1 + [0])", taxRate) + .as("totalAmount") // ), Invoice.class); return results.getUniqueMappedResult(); diff --git a/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/CLR.java b/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/CLR.java index 71429f51..7e603f3e 100644 --- a/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/CLR.java +++ b/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/CLR.java @@ -40,25 +40,30 @@ class CLR implements CommandLineRunner { Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(objectMapper, Person.class); RedisSerializationContext.RedisSerializationContextBuilder builder = RedisSerializationContext - .newSerializationContext(new StringRedisSerializer()); + .newSerializationContext(new StringRedisSerializer()); RedisSerializationContext context = builder.value(serializer).build(); ReactiveRedisTemplate personTemplate = new ReactiveRedisTemplate<>(connectionFactory, context); Flux.just(new Person("1", "first-1", "last-1"), new Person("2", "first-2", "last-2"), new Person("3", "first-3", "last-3")) - .flatMap((person) -> personTemplate.opsForValue().set(person.getId(), person)).collectList().block(); + .flatMap((person) -> personTemplate.opsForValue().set(person.getId(), person)) + .collectList() + .block(); for (int i = 1; i <= 3; i++) { String id = Integer.toString(i); - personTemplate.opsForValue().get(id).subscribe((person) -> System.out.printf("%s: %s%n", id, person), - (ex) -> ex.printStackTrace(System.out)); + personTemplate.opsForValue() + .get(id) + .subscribe((person) -> System.out.printf("%s: %s%n", id, person), + (ex) -> ex.printStackTrace(System.out)); } } private void templateOperations() { this.template.opsForValue().set("success-token", "OK").block(); - this.template.opsForValue().get("success-token").subscribe( - value -> System.out.printf("template ops: %s%n", value), (ex) -> ex.printStackTrace(System.out)); + this.template.opsForValue() + .get("success-token") + .subscribe(value -> System.out.printf("template ops: %s%n", value), (ex) -> ex.printStackTrace(System.out)); } private void connectionCommand() { diff --git a/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/RedisConfiguration.java b/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/RedisConfiguration.java index b8c2b4e5..4537219c 100644 --- a/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/RedisConfiguration.java +++ b/data/data-redis-reactive/src/main/java/com/example/data/redis/reactive/RedisConfiguration.java @@ -18,7 +18,7 @@ class RedisConfiguration { ReactiveRedisConnectionFactory connectionFactory) { Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(objectMapper, Person.class); RedisSerializationContext.RedisSerializationContextBuilder builder = RedisSerializationContext - .newSerializationContext(new StringRedisSerializer()); + .newSerializationContext(new StringRedisSerializer()); RedisSerializationContext context = builder.value(serializer).build(); return new ReactiveRedisTemplate<>(connectionFactory, context); } diff --git a/data/hateoas/src/main/java/com/example/hateoas/ManagerController.java b/data/hateoas/src/main/java/com/example/hateoas/ManagerController.java index 63f4ea82..4adb2478 100644 --- a/data/hateoas/src/main/java/com/example/hateoas/ManagerController.java +++ b/data/hateoas/src/main/java/com/example/hateoas/ManagerController.java @@ -44,9 +44,10 @@ public class ManagerController { List employees = List.of(new Employee("1", "first-name-1", "last-name-1", "1"), new Employee("2", "first-name-2", "last-name-2", "1"), new Employee("3", "first-name-3", "last-name-3", "1")); - return employeeModelAssembler.toCollectionModel(employees).withFallbackType(EmployeeModel.class) - .add(WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(ManagerController.class).reports(id)) - .withSelfRel()); + return employeeModelAssembler.toCollectionModel(employees) + .withFallbackType(EmployeeModel.class) + .add(WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(ManagerController.class).reports(id)) + .withSelfRel()); } } diff --git a/data/hateoas/src/main/java/com/example/hateoas/assembler/ManagerModelAssembler.java b/data/hateoas/src/main/java/com/example/hateoas/assembler/ManagerModelAssembler.java index 87b9c9dd..792af8a9 100644 --- a/data/hateoas/src/main/java/com/example/hateoas/assembler/ManagerModelAssembler.java +++ b/data/hateoas/src/main/java/com/example/hateoas/assembler/ManagerModelAssembler.java @@ -19,7 +19,7 @@ public class ManagerModelAssembler extends RepresentationModelAssemblerSupport { Flux stream = Flux.just(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) - .map(element -> webSocketSession.textMessage(Integer.toString(element))) - .delayElements(Duration.ofMillis(100)); + .map(element -> webSocketSession.textMessage(Integer.toString(element))) + .delayElements(Duration.ofMillis(100)); return webSocketSession.send(stream); }; } diff --git a/framework/webflux-netty-tls/src/main/java/com/example/webflux/tls/WebsocketConfig.java b/framework/webflux-netty-tls/src/main/java/com/example/webflux/tls/WebsocketConfig.java index 28bdd1ff..fe39a299 100644 --- a/framework/webflux-netty-tls/src/main/java/com/example/webflux/tls/WebsocketConfig.java +++ b/framework/webflux-netty-tls/src/main/java/com/example/webflux/tls/WebsocketConfig.java @@ -18,8 +18,8 @@ class WebsocketConfig { WebSocketHandler webSocketHandler() { return webSocketSession -> { Flux stream = Flux.just(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) - .map(element -> webSocketSession.textMessage(Integer.toString(element))) - .delayElements(Duration.ofMillis(100)); + .map(element -> webSocketSession.textMessage(Integer.toString(element))) + .delayElements(Duration.ofMillis(100)); return webSocketSession.send(stream); }; } diff --git a/framework/webflux-netty/src/main/java/com/example/webflux/WebsocketConfig.java b/framework/webflux-netty/src/main/java/com/example/webflux/WebsocketConfig.java index d58ad6c2..956d7ce6 100644 --- a/framework/webflux-netty/src/main/java/com/example/webflux/WebsocketConfig.java +++ b/framework/webflux-netty/src/main/java/com/example/webflux/WebsocketConfig.java @@ -18,8 +18,8 @@ class WebsocketConfig { WebSocketHandler webSocketHandler() { return webSocketSession -> { Flux stream = Flux.just(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) - .map(element -> webSocketSession.textMessage(Integer.toString(element))) - .delayElements(Duration.ofMillis(100)); + .map(element -> webSocketSession.textMessage(Integer.toString(element))) + .delayElements(Duration.ofMillis(100)); return webSocketSession.send(stream); }; } diff --git a/framework/webflux-undertow/src/main/java/com/example/webflux/undertow/WebsocketConfig.java b/framework/webflux-undertow/src/main/java/com/example/webflux/undertow/WebsocketConfig.java index bdb99fcc..415658fa 100644 --- a/framework/webflux-undertow/src/main/java/com/example/webflux/undertow/WebsocketConfig.java +++ b/framework/webflux-undertow/src/main/java/com/example/webflux/undertow/WebsocketConfig.java @@ -18,8 +18,8 @@ class WebsocketConfig { WebSocketHandler webSocketHandler() { return webSocketSession -> { Flux stream = Flux.just(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) - .map(element -> webSocketSession.textMessage(Integer.toString(element))) - .delayElements(Duration.ofMillis(100)); + .map(element -> webSocketSession.textMessage(Integer.toString(element))) + .delayElements(Duration.ofMillis(100)); return webSocketSession.send(stream); }; } diff --git a/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcControllerMockTests.java b/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcControllerMockTests.java index 66c8fb36..24e4d850 100644 --- a/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcControllerMockTests.java +++ b/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcControllerMockTests.java @@ -18,8 +18,9 @@ class WebMvcControllerMockTests { @Test void check() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebMvcController()).build(); - mockMvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Jetty")); + mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Jetty")); } } diff --git a/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcSliceTests.java b/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcSliceTests.java index dfd67d40..dedc8a49 100644 --- a/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcSliceTests.java +++ b/framework/webmvc-jetty/src/test/java/com/example/webmvc/jetty/WebMvcSliceTests.java @@ -20,8 +20,9 @@ class WebMvcSliceTests { @Test void check() throws Exception { - this.mockMvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Jetty")); + this.mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Jetty")); } } diff --git a/framework/webmvc-tomcat/src/test/java/com/example/webmvc/AutoConfigureMockMvcTests.java b/framework/webmvc-tomcat/src/test/java/com/example/webmvc/AutoConfigureMockMvcTests.java index 2e52bf04..cc1a6cd3 100644 --- a/framework/webmvc-tomcat/src/test/java/com/example/webmvc/AutoConfigureMockMvcTests.java +++ b/framework/webmvc-tomcat/src/test/java/com/example/webmvc/AutoConfigureMockMvcTests.java @@ -20,8 +20,9 @@ class AutoConfigureMockMvcTests { @Test void shouldGetResponse() throws Exception { - mvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Tomcat")); + mvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Tomcat")); } } diff --git a/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcControllerMockTests.java b/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcControllerMockTests.java index d6a409c7..6d161b6c 100644 --- a/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcControllerMockTests.java +++ b/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcControllerMockTests.java @@ -15,8 +15,9 @@ class WebMvcControllerMockTests { @Test void check() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebMvcController()).build(); - mockMvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Tomcat")); + mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Tomcat")); } } diff --git a/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcSliceTests.java b/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcSliceTests.java index c3bee5f3..4e118fa6 100644 --- a/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcSliceTests.java +++ b/framework/webmvc-tomcat/src/test/java/com/example/webmvc/WebMvcSliceTests.java @@ -17,8 +17,9 @@ class WebMvcSliceTests { @Test void check() throws Exception { - this.mockMvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Tomcat")); + this.mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Tomcat")); } } diff --git a/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/AutoConfigureMockMvcTests.java b/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/AutoConfigureMockMvcTests.java index 0073fb8f..f61f0b82 100644 --- a/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/AutoConfigureMockMvcTests.java +++ b/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/AutoConfigureMockMvcTests.java @@ -20,8 +20,9 @@ class AutoConfigureMockMvcTests { @Test void shouldGetResponse() throws Exception { - mvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Undertow")); + mvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Undertow")); } } diff --git a/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcControllerMockTests.java b/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcControllerMockTests.java index efdcd05b..68b009f1 100644 --- a/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcControllerMockTests.java +++ b/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcControllerMockTests.java @@ -16,8 +16,9 @@ class WebMvcControllerMockTests { @Test void check() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebMvcController()).build(); - mockMvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Undertow")); + mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Undertow")); } } diff --git a/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcSliceTests.java b/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcSliceTests.java index beb82dd1..eaf664c9 100644 --- a/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcSliceTests.java +++ b/framework/webmvc-undertow/src/test/java/com/example/webmvc/undertow/WebMvcSliceTests.java @@ -18,8 +18,9 @@ class WebMvcSliceTests { @Test void check() throws Exception { - this.mockMvc.perform(get("/")).andExpect(status().isOk()) - .andExpect(content().string("Hello from Spring MVC and Undertow")); + this.mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello from Spring MVC and Undertow")); } } diff --git a/framework/websocket-jetty/src/main/java/com/example/websocket/jetty/CLR.java b/framework/websocket-jetty/src/main/java/com/example/websocket/jetty/CLR.java index 384d4388..57131322 100644 --- a/framework/websocket-jetty/src/main/java/com/example/websocket/jetty/CLR.java +++ b/framework/websocket-jetty/src/main/java/com/example/websocket/jetty/CLR.java @@ -25,8 +25,10 @@ class CLR implements CommandLineRunner { @Override public void run(String... args) throws Exception { - WebSocketSession session = this.webSocketClient.doHandshake(new MyWebsocketHandler(), null, - URI.create("ws://localhost:%d/echo".formatted(getServerPort()))).get(5, TimeUnit.SECONDS); + WebSocketSession session = this.webSocketClient + .doHandshake(new MyWebsocketHandler(), null, + URI.create("ws://localhost:%d/echo".formatted(getServerPort()))) + .get(5, TimeUnit.SECONDS); TextMessage message = new TextMessage("Hello Websocket"); session.sendMessage(message); System.out.printf("Client: Sent '%s'%n", message.getPayload()); diff --git a/framework/websocket-stomp/src/main/java/com/example/websocket/stomp/CLR.java b/framework/websocket-stomp/src/main/java/com/example/websocket/stomp/CLR.java index aad8b350..a5d85ee6 100644 --- a/framework/websocket-stomp/src/main/java/com/example/websocket/stomp/CLR.java +++ b/framework/websocket-stomp/src/main/java/com/example/websocket/stomp/CLR.java @@ -31,7 +31,8 @@ class CLR implements CommandLineRunner { public void run(String... args) throws Exception { MyStompHandler handler = new MyStompHandler(); StompSession stompSession = this.webSocketStompClient - .connect("ws://localhost:%d/stomp".formatted(getServerPort()), handler).get(5, TimeUnit.SECONDS); + .connect("ws://localhost:%d/stomp".formatted(getServerPort()), handler) + .get(5, TimeUnit.SECONDS); stompSession.subscribe("/topic/greetings", handler); stompSession.subscribe("/app/subscription", new EmptyStompHandler()); diff --git a/framework/websocket-tomcat/src/main/java/com/example/websocket/CLR.java b/framework/websocket-tomcat/src/main/java/com/example/websocket/CLR.java index f8ae400b..4e3bb76e 100644 --- a/framework/websocket-tomcat/src/main/java/com/example/websocket/CLR.java +++ b/framework/websocket-tomcat/src/main/java/com/example/websocket/CLR.java @@ -25,8 +25,10 @@ class CLR implements CommandLineRunner { @Override public void run(String... args) throws Exception { - WebSocketSession session = this.webSocketClient.doHandshake(new MyWebsocketHandler(), null, - URI.create("ws://localhost:%d/echo".formatted(getServerPort()))).get(5, TimeUnit.SECONDS); + WebSocketSession session = this.webSocketClient + .doHandshake(new MyWebsocketHandler(), null, + URI.create("ws://localhost:%d/echo".formatted(getServerPort()))) + .get(5, TimeUnit.SECONDS); TextMessage message = new TextMessage("Hello Websocket"); session.sendMessage(message); System.out.printf("Client: Sent '%s'%n", message.getPayload()); diff --git a/framework/websocket-undertow/src/main/java/com/example/websocket/undertow/CLR.java b/framework/websocket-undertow/src/main/java/com/example/websocket/undertow/CLR.java index a8ebedf1..b12863e1 100644 --- a/framework/websocket-undertow/src/main/java/com/example/websocket/undertow/CLR.java +++ b/framework/websocket-undertow/src/main/java/com/example/websocket/undertow/CLR.java @@ -26,8 +26,8 @@ class CLR implements CommandLineRunner { @Override public void run(String... args) throws Exception { URI uri = URI.create("ws://localhost:%d/echo".formatted(getServerPort())); - WebSocketSession session = this.webSocketClient.execute(new MyWebsocketHandler(), null, uri).get(5, - TimeUnit.SECONDS); + WebSocketSession session = this.webSocketClient.execute(new MyWebsocketHandler(), null, uri) + .get(5, TimeUnit.SECONDS); TextMessage message = new TextMessage("Hello Websocket"); session.sendMessage(message); System.out.printf("Client: Sent '%s'%n", message.getPayload()); diff --git a/gradle.properties b/gradle.properties index 2f26a641..f7983399 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,6 @@ org.gradle.jvmargs=-Xmx2g #reachabilityMetadataVersion=0.2.5 #reachabilityMetadataUrl= kotlinVersion=1.7.22 -javaFormatVersion=0.0.34 +javaFormatVersion=0.0.38 nbtVersion=0.9.20 springBootVersion=3.0.5-SNAPSHOT diff --git a/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java b/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java index 881f969e..2d52d40a 100644 --- a/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java +++ b/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java @@ -32,8 +32,11 @@ class GraphQlTesterTests { @Test void getProject() { - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } } diff --git a/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/TcpTests.java b/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/TcpTests.java index 92b10e91..13d27655 100644 --- a/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/TcpTests.java +++ b/graphql/graphql-webflux-rsocket/src/test/java/com/example/graphql/webflux/TcpTests.java @@ -31,8 +31,11 @@ class TcpTests { void getProject() { TcpClientTransport transport = TcpClientTransport.create(9090); RSocketGraphQlTester graphQlTester = RSocketGraphQlTester.builder().clientTransport(transport).build(); - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } } \ No newline at end of file diff --git a/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java b/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java index 881f969e..2d52d40a 100644 --- a/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java +++ b/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/GraphQlTesterTests.java @@ -32,8 +32,11 @@ class GraphQlTesterTests { @Test void getProject() { - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } } diff --git a/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/RandomPortTests.java b/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/RandomPortTests.java index ccca6fdf..2189bc34 100644 --- a/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/RandomPortTests.java +++ b/graphql/graphql-webflux/src/test/java/com/example/graphql/webflux/RandomPortTests.java @@ -40,8 +40,11 @@ class RandomPortTests { @Test void getProjectUsingHttp(@Autowired HttpGraphQlTester graphQlTester) { - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } @Test @@ -49,8 +52,11 @@ class RandomPortTests { WebSocketClient webClient = new ReactorNettyWebSocketClient(); URI uri = URI.create("http://localhost:" + localPort + "/graphql"); WebSocketGraphQlTester graphQlTester = WebSocketGraphQlTester.create(uri, webClient); - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } } \ No newline at end of file diff --git a/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/GraphQlTesterTests.java b/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/GraphQlTesterTests.java index 7b1e702e..66697781 100644 --- a/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/GraphQlTesterTests.java +++ b/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/GraphQlTesterTests.java @@ -32,8 +32,11 @@ class GraphQlTesterTests { @Test void getProject() { - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } } diff --git a/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/RandomPortTests.java b/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/RandomPortTests.java index 1bdf474c..4d2a1fdf 100644 --- a/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/RandomPortTests.java +++ b/graphql/graphql-webmvc/src/test/java/com/example/graphql/webmvc/RandomPortTests.java @@ -40,8 +40,11 @@ class RandomPortTests { @Test void getProjectUsingHttp(@Autowired HttpGraphQlTester graphQlTester) { - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } @Test @@ -49,8 +52,11 @@ class RandomPortTests { WebSocketClient webClient = new ReactorNettyWebSocketClient(); URI uri = URI.create("http://localhost:" + localPort + "/graphql"); WebSocketGraphQlTester graphQlTester = WebSocketGraphQlTester.create(uri, webClient); - graphQlTester.documentName("project").execute().path("project.name").entity(String.class) - .isEqualTo("Spring Boot"); + graphQlTester.documentName("project") + .execute() + .path("project.name") + .entity(String.class) + .isEqualTo("Spring Boot"); } } \ No newline at end of file diff --git a/integration/integration/src/main/java/com/example/integration/IntegrationApplication.java b/integration/integration/src/main/java/com/example/integration/IntegrationApplication.java index 781f1886..d667b45a 100644 --- a/integration/integration/src/main/java/com/example/integration/IntegrationApplication.java +++ b/integration/integration/src/main/java/com/example/integration/IntegrationApplication.java @@ -62,7 +62,7 @@ public class IntegrationApplication { RedisChannelMessageStore redisChannelMessageStore(RedisConnectionFactory connectionFactory) { RedisChannelMessageStore redisChannelMessageStore = new RedisChannelMessageStore(connectionFactory); redisChannelMessageStore - .setValueSerializer(new GenericJackson2JsonRedisSerializer(JacksonJsonUtils.messagingAwareMapper())); + .setValueSerializer(new GenericJackson2JsonRedisSerializer(JacksonJsonUtils.messagingAwareMapper())); return redisChannelMessageStore; } @@ -71,11 +71,12 @@ public class IntegrationApplication { RedisChannelMessageStore redisChannelMessageStore) { return IntegrationFlow - .fromSupplier(Date::new, e -> e.id("dateSourceEndpoint").poller(p -> p.fixedDelay(1000, 1000))) - .channel(c -> c.queue("dateChannel", jdbcChannelMessageStore, "dateChannelGroup")) - .gateway(subflow -> subflow.convert(Integer.class, e -> e.advice(new RequestHandlerRetryAdvice()))) - .channel(c -> c.queue(redisChannelMessageStore, "secondsChannelGroup")) - .handle(m -> System.out.println("Current seconds: " + m.getPayload())).get(); + .fromSupplier(Date::new, e -> e.id("dateSourceEndpoint").poller(p -> p.fixedDelay(1000, 1000))) + .channel(c -> c.queue("dateChannel", jdbcChannelMessageStore, "dateChannelGroup")) + .gateway(subflow -> subflow.convert(Integer.class, e -> e.advice(new RequestHandlerRetryAdvice()))) + .channel(c -> c.queue(redisChannelMessageStore, "secondsChannelGroup")) + .handle(m -> System.out.println("Current seconds: " + m.getPayload())) + .get(); } @Bean @@ -116,11 +117,12 @@ public class IntegrationApplication { @Bean public IntegrationFlow controlBusControllerFlow(ControlBusGateway controlBusGateway) { return IntegrationFlow - .from(WebFlux.inboundChannelAdapter("/control-bus/{endpointId}") - .payloadExpression("#pathVariables.endpointId") - .requestMapping(mapping -> mapping.methods(HttpMethod.GET))) - .wireTap(subflow -> subflow.handle(m -> System.out.println("Starting endpoint: " + m.getPayload()))) - .handle(controlBusGateway, "startEndpoint").get(); + .from(WebFlux.inboundChannelAdapter("/control-bus/{endpointId}") + .payloadExpression("#pathVariables.endpointId") + .requestMapping(mapping -> mapping.methods(HttpMethod.GET))) + .wireTap(subflow -> subflow.handle(m -> System.out.println("Starting endpoint: " + m.getPayload()))) + .handle(controlBusGateway, "startEndpoint") + .get(); } @MessagingGateway(defaultRequestChannel = "controlBus.input") diff --git a/integration/spring-kafka-avro/src/main/java/com/example/kafka/KafkaAvroApplication.java b/integration/spring-kafka-avro/src/main/java/com/example/kafka/KafkaAvroApplication.java index 11162b36..e34040df 100644 --- a/integration/spring-kafka-avro/src/main/java/com/example/kafka/KafkaAvroApplication.java +++ b/integration/spring-kafka-avro/src/main/java/com/example/kafka/KafkaAvroApplication.java @@ -154,8 +154,8 @@ class BML6 implements BatchMessageListener { @Override public void onMessage(List> records) { - System.out.println( - "++++++6:Received " + records.get(0).value().getClass().getSimpleName() + ":" + records.get(0)); + System.out + .println("++++++6:Received " + records.get(0).value().getClass().getSimpleName() + ":" + records.get(0)); } } diff --git a/integration/spring-pulsar-reactive/src/main/java/com/example/pulsar/SpringPulsarReactiveApplication.java b/integration/spring-pulsar-reactive/src/main/java/com/example/pulsar/SpringPulsarReactiveApplication.java index ae19c26d..9a2d87fd 100644 --- a/integration/spring-pulsar-reactive/src/main/java/com/example/pulsar/SpringPulsarReactiveApplication.java +++ b/integration/spring-pulsar-reactive/src/main/java/com/example/pulsar/SpringPulsarReactiveApplication.java @@ -22,8 +22,10 @@ public class SpringPulsarReactiveApplication { @Bean ApplicationRunner sendMessageToTopicOnAppStartup(ReactivePulsarTemplate reactivePulsarTemplate) { String topic = "graalvm-demo-topic-reactive"; - return args -> Flux.range(0, 100).map((i) -> MessageSpec.of("sample-message-" + i)) - .as((msgs) -> reactivePulsarTemplate.send(topic, msgs)).subscribe(); + return args -> Flux.range(0, 100) + .map((i) -> MessageSpec.of("sample-message-" + i)) + .as((msgs) -> reactivePulsarTemplate.send(topic, msgs)) + .subscribe(); } @ReactivePulsarListener(subscriptionName = "graalvm-demo-subscription-reactive", diff --git a/security/ldap-odm/src/main/java/example/ldap/odm/OdmPersonDaoImpl.java b/security/ldap-odm/src/main/java/example/ldap/odm/OdmPersonDaoImpl.java index e5d22ca4..91131946 100644 --- a/security/ldap-odm/src/main/java/example/ldap/odm/OdmPersonDaoImpl.java +++ b/security/ldap-odm/src/main/java/example/ldap/odm/OdmPersonDaoImpl.java @@ -31,7 +31,7 @@ public class OdmPersonDaoImpl implements PersonDao { public OdmPersonDaoImpl(LdapTemplate ldapTemplate) { this.ldapTemplate = ldapTemplate; this.odm = (Object ctx) -> this.ldapTemplate.getObjectDirectoryMapper() - .mapFromLdapDataEntry((DirContextOperations) ctx, Person.class); + .mapFromLdapDataEntry((DirContextOperations) ctx, Person.class); SearchControls controls = new SearchControls(); controls.setSearchScope(SearchControls.SUBTREE_SCOPE); controls.setReturningObjFlag(true); @@ -74,8 +74,13 @@ public class OdmPersonDaoImpl implements PersonDao { } private LdapName buildDn(String country, String company, String fullname) { - return LdapNameBuilder.newInstance().add("dc", "io").add("dc", "spring").add("c", country).add("ou", company) - .add("cn", fullname).build(); + return LdapNameBuilder.newInstance() + .add("dc", "io") + .add("dc", "spring") + .add("c", country) + .add("ou", company) + .add("cn", fullname) + .build(); } } diff --git a/security/security-method/src/main/java/com/example/security/method/CLR.java b/security/security-method/src/main/java/com/example/security/method/CLR.java index 199bd6bf..0ff1f039 100644 --- a/security/security-method/src/main/java/com/example/security/method/CLR.java +++ b/security/security-method/src/main/java/com/example/security/method/CLR.java @@ -62,7 +62,7 @@ public class CLR implements CommandLineRunner { impersonateAnonymous(); this.postAuthorizeProtectedService.anonymous(); System.out - .println("testPostAuthorizeAnonymous(): postAuthorizeProtectedService.anonymous() worked as anonymous"); + .println("testPostAuthorizeAnonymous(): postAuthorizeProtectedService.anonymous() worked as anonymous"); } private void testSecuredAnonymous() { @@ -286,14 +286,16 @@ public class CLR implements CommandLineRunner { private void impersonateUser() { UserDetails user = this.userDetailsManager.loadUserByUsername("user"); - SecurityContextHolder.getContext().setAuthentication( - new TestingAuthenticationToken(user, user.getPassword(), List.copyOf(user.getAuthorities()))); + SecurityContextHolder.getContext() + .setAuthentication( + new TestingAuthenticationToken(user, user.getPassword(), List.copyOf(user.getAuthorities()))); } private void impersonateAdmin() { UserDetails user = this.userDetailsManager.loadUserByUsername("admin"); - SecurityContextHolder.getContext().setAuthentication( - new TestingAuthenticationToken(user, user.getPassword(), List.copyOf(user.getAuthorities()))); + SecurityContextHolder.getContext() + .setAuthentication( + new TestingAuthenticationToken(user, user.getPassword(), List.copyOf(user.getAuthorities()))); } } diff --git a/security/security-method/src/main/java/com/example/security/method/SecurityConfiguration.java b/security/security-method/src/main/java/com/example/security/method/SecurityConfiguration.java index df295714..4afae2c1 100644 --- a/security/security-method/src/main/java/com/example/security/method/SecurityConfiguration.java +++ b/security/security-method/src/main/java/com/example/security/method/SecurityConfiguration.java @@ -14,10 +14,16 @@ class SecurityConfiguration { @Bean UserDetailsManager userDetailsManager() { - UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER") - .build(); - UserDetails admin = User.withDefaultPasswordEncoder().username("admin").password("password").roles("ADMIN") - .build(); + UserDetails user = User.withDefaultPasswordEncoder() + .username("user") + .password("password") + .roles("USER") + .build(); + UserDetails admin = User.withDefaultPasswordEncoder() + .username("admin") + .password("password") + .roles("ADMIN") + .build(); return new InMemoryUserDetailsManager(user, admin); } diff --git a/security/security-oauth2-resource-server/src/main/java/com/example/security/oauth2resourceserver/env/MockWebServerPropertySource.java b/security/security-oauth2-resource-server/src/main/java/com/example/security/oauth2resourceserver/env/MockWebServerPropertySource.java index 7d95f9f5..5224a609 100644 --- a/security/security-oauth2-resource-server/src/main/java/com/example/security/oauth2resourceserver/env/MockWebServerPropertySource.java +++ b/security/security-oauth2-resource-server/src/main/java/com/example/security/oauth2resourceserver/env/MockWebServerPropertySource.java @@ -120,7 +120,8 @@ public class MockWebServerPropertySource extends PropertySource i private static MockResponse response(String body, int status) { return new MockResponse().setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .setResponseCode(status).setBody(body); + .setResponseCode(status) + .setBody(body); } } diff --git a/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityConfig.java b/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityConfig.java index e03a2d40..6e68bb14 100644 --- a/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityConfig.java +++ b/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityConfig.java @@ -19,18 +19,26 @@ public class SecurityConfig { @Bean SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { return http - .authorizeHttpRequests( - (authorize) -> authorize.requestMatchers("/").permitAll().anyRequest().authenticated()) - .httpBasic(withDefaults()).formLogin(withDefaults()).build(); + .authorizeHttpRequests( + (authorize) -> authorize.requestMatchers("/").permitAll().anyRequest().authenticated()) + .httpBasic(withDefaults()) + .formLogin(withDefaults()) + .build(); } @Bean @SuppressWarnings("deprecation") UserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER") - .build(); - UserDetails admin = User.withDefaultPasswordEncoder().username("admin").password("password").roles("ADMIN") - .build(); + UserDetails user = User.withDefaultPasswordEncoder() + .username("user") + .password("password") + .roles("USER") + .build(); + UserDetails admin = User.withDefaultPasswordEncoder() + .username("admin") + .password("password") + .roles("ADMIN") + .build(); return new InMemoryUserDetailsManager(user, admin); } diff --git a/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityThymeleafApplication.java b/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityThymeleafApplication.java index 74732ed4..c0ae79a8 100644 --- a/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityThymeleafApplication.java +++ b/security/security-thymeleaf/src/main/java/com/example/security/thymeleaf/SecurityThymeleafApplication.java @@ -22,8 +22,8 @@ public class SecurityThymeleafApplication { @Override public void registerHints(RuntimeHints hints, ClassLoader classLoader) { - hints.reflection().registerType(UsernamePasswordAuthenticationToken.class, - MemberCategory.INVOKE_PUBLIC_METHODS); + hints.reflection() + .registerType(UsernamePasswordAuthenticationToken.class, MemberCategory.INVOKE_PUBLIC_METHODS); hints.reflection().registerType(User.class, MemberCategory.INVOKE_PUBLIC_METHODS); } diff --git a/security/security-webflux/src/main/java/com/example/security/webflux/WebSecurityConfig.java b/security/security-webflux/src/main/java/com/example/security/webflux/WebSecurityConfig.java index 8cab3a03..49b1d10a 100644 --- a/security/security-webflux/src/main/java/com/example/security/webflux/WebSecurityConfig.java +++ b/security/security-webflux/src/main/java/com/example/security/webflux/WebSecurityConfig.java @@ -17,17 +17,29 @@ public class WebSecurityConfig { @Bean public SecurityWebFilterChain securityFilterChain(ServerHttpSecurity http) { return http - .authorizeExchange((exchanges) -> exchanges.pathMatchers("/rest/anonymous").permitAll() - .pathMatchers("/rest/admin").hasRole("ADMIN").anyExchange().authenticated()) - .httpBasic().and().build(); + .authorizeExchange((exchanges) -> exchanges.pathMatchers("/rest/anonymous") + .permitAll() + .pathMatchers("/rest/admin") + .hasRole("ADMIN") + .anyExchange() + .authenticated()) + .httpBasic() + .and() + .build(); } @Bean public ReactiveUserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER") - .build(); - UserDetails admin = User.withDefaultPasswordEncoder().username("admin").password("password").roles("ADMIN") - .build(); + UserDetails user = User.withDefaultPasswordEncoder() + .username("user") + .password("password") + .roles("USER") + .build(); + UserDetails admin = User.withDefaultPasswordEncoder() + .username("admin") + .password("password") + .roles("ADMIN") + .build(); return new MapReactiveUserDetailsService(user, admin); } diff --git a/security/security-webmvc/src/main/java/com/example/security/webmvc/WebSecurityConfig.java b/security/security-webmvc/src/main/java/com/example/security/webmvc/WebSecurityConfig.java index 6719c424..733d70f1 100644 --- a/security/security-webmvc/src/main/java/com/example/security/webmvc/WebSecurityConfig.java +++ b/security/security-webmvc/src/main/java/com/example/security/webmvc/WebSecurityConfig.java @@ -17,17 +17,29 @@ public class WebSecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { return http - .authorizeHttpRequests(authorize -> authorize.requestMatchers("/rest/anonymous").permitAll() - .requestMatchers("/rest/admin").hasRole("ADMIN").anyRequest().authenticated()) - .httpBasic().and().build(); + .authorizeHttpRequests(authorize -> authorize.requestMatchers("/rest/anonymous") + .permitAll() + .requestMatchers("/rest/admin") + .hasRole("ADMIN") + .anyRequest() + .authenticated()) + .httpBasic() + .and() + .build(); } @Bean public UserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER") - .build(); - UserDetails admin = User.withDefaultPasswordEncoder().username("admin").password("password").roles("ADMIN") - .build(); + UserDetails user = User.withDefaultPasswordEncoder() + .username("user") + .password("password") + .roles("USER") + .build(); + UserDetails admin = User.withDefaultPasswordEncoder() + .username("admin") + .password("password") + .roles("ADMIN") + .build(); return new InMemoryUserDetailsManager(user, admin); }