Build opt 22 06 (#2132)

* Drools reformat

* Further refactor

* Further refactor

* Refactor

spring-5/src/test/java/com/baeldung/ParallelIntegrationTest.java

@@ -9,14 +9,14 @@ public class ParallelIntegrationTest {
 
     @Test
     public void runTests() {
-        final Class<?>[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class };
+        final Class<?>[] classes = {Example1IntegrationTest.class, Example2IntegrationTest.class};
 
         JUnitCore.runClasses(new Computer(), classes);
     }
 
     @Test
     public void runTestsInParallel() {
-        final Class<?>[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class };
+        final Class<?>[] classes = {Example1IntegrationTest.class, Example2IntegrationTest.class};
 
         JUnitCore.runClasses(new ParallelComputer(true, true), classes);
     }

spring-5/src/test/java/com/baeldung/Spring5JUnit4ConcurrentIntegrationTest.java

@@ -15,9 +15,6 @@ import java.util.concurrent.TimeUnit;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-/**
- * @author aiet
- */
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = Spring5JUnit4ConcurrentIntegrationTest.SimpleConfiguration.class)
 public class Spring5JUnit4ConcurrentIntegrationTest implements ApplicationContextAware, InitializingBean {

spring-5/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java

@@ -8,7 +8,6 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.reactive.server.WebTestClient;
-
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.BodyInserters;

spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java

@@ -16,10 +16,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 class Spring5JUnit5ComposedAnnotationIntegrationTest {
 
     @Autowired
-    Task task;
+    private Task task;
 
     @Autowired
-    List<Task> tasks;
+    private List<Task> tasks;
 
     @Test
     @DisplayName("ApplicationContext injected into method")

spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java

@@ -1,7 +1,7 @@
 package com.baeldung.jupiter;
 
 import com.baeldung.web.reactive.Task;
-
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -10,14 +10,12 @@ import org.springframework.test.context.ContextConfiguration;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.jupiter.api.Test;
-
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = TestConfig.class)
 class Spring5JUnit5IntegrationTest {
 
     @Autowired
-    Task task;
+    private Task task;
 
     @Test
     void givenAMethodName_whenInjecting_thenApplicationContextInjectedIntoMetho(ApplicationContext applicationContext) {

spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java

@@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test;
 import org.junit.runner.Computer;
 import org.junit.runner.JUnitCore;
 
-public class Spring5JUnit5ParallelIntegrationTest {
+class Spring5JUnit5ParallelIntegrationTest {
 
     @Test
-    public void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingParallel() {
+    void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingParallel() {
         final Class<?>[] classes = {
           Example1IntegrationTest.class, Example2IntegrationTest.class
         };
@@ -19,7 +19,7 @@ public class Spring5JUnit5ParallelIntegrationTest {
     }
 
     @Test
-    public void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingLinear() {
+    void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingLinear() {
         final Class<?>[] classes = {
           Example1IntegrationTest.class, Example2IntegrationTest.class
         };

spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesIntegrationTest.java

@@ -1,25 +1,25 @@
 package com.baeldung.jupiter;
 
 import org.junit.jupiter.api.Test;
+
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class Spring5Java8NewFeaturesIntegrationTest {
+class Spring5Java8NewFeaturesIntegrationTest {
 
     @FunctionalInterface
     public interface FunctionalInterfaceExample<Input, Result> {
         Result reverseString(Input input);
     }
 
-    public class StringUtils{
-        public FunctionalInterfaceExample<String, String>
-          functionLambdaString = s -> {
-          return Pattern.compile(" +").splitAsStream(s)
-          .map(word->new StringBuilder(word).reverse())
+    public class StringUtils {
+        FunctionalInterfaceExample<String, String>
+          functionLambdaString = s -> Pattern.compile(" +").splitAsStream(s)
+          .map(word -> new StringBuilder(word).reverse())
           .collect(Collectors.joining(" "));
-        };
     }
 
     @Test

spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java

@@ -3,16 +3,8 @@ package com.baeldung.jupiter;
 import com.baeldung.web.reactive.Task;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.ClientRequest;
-import org.springframework.web.reactive.function.client.ExchangeFunction;
-import org.springframework.web.reactive.function.client.ExchangeFunctions;
-import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -21,10 +13,8 @@ import reactor.core.publisher.Mono;
 import reactor.ipc.netty.NettyContext;
 import reactor.ipc.netty.http.server.HttpServer;
 
-import java.net.URI;
 import java.time.Duration;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
 

spring-5/src/test/java/com/baeldung/web/PathPatternsUsingHandlerMethodIntegrationTest.java

@@ -1,6 +1,5 @@
 package com.baeldung.web;
 
-import com.baeldung.web.PathPatternController;
 import com.baeldung.Spring5Application;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -11,92 +10,92 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Spring5Application.class)
-public class PathPatternsUsingHandlerMethodTest {
+public class PathPatternsUsingHandlerMethodIntegrationTest {
 
     private static WebTestClient client;
 
     @BeforeClass
     public static void setUp() {
         client = WebTestClient.bindToController(new PathPatternController())
-            .build();
+          .build();
     }
 
     @Test
     public void givenHandlerMethod_whenMultipleURIVariablePattern_then200() {
 
         client.get()
-            .uri("/spring5/ab/cd")
-            .exchange()
-            .expectStatus()
-            .is2xxSuccessful()
-            .expectBody()
-            .equals("/ab/cd");
+          .uri("/spring5/ab/cd")
+          .exchange()
+          .expectStatus()
+          .is2xxSuccessful()
+          .expectBody()
+          .equals("/ab/cd");
     }
 
     @Test
     public void givenHandlerMethod_whenURLWithWildcardTakingZeroOrMoreChar_then200() {
 
         client.get()
-            .uri("/spring5/userid")
-            .exchange()
-            .expectStatus()
-            .is2xxSuccessful()
-            .expectBody()
-            .equals("/spring5/*id");
+          .uri("/spring5/userid")
+          .exchange()
+          .expectStatus()
+          .is2xxSuccessful()
+          .expectBody()
+          .equals("/spring5/*id");
     }
 
     @Test
     public void givenHandlerMethod_whenURLWithWildcardTakingExactlyOneChar_then200() {
 
         client.get()
-            .uri("/string5")
-            .exchange()
-            .expectStatus()
-            .is2xxSuccessful()
-            .expectBody()
-            .equals("/s?ring5");
+          .uri("/string5")
+          .exchange()
+          .expectStatus()
+          .is2xxSuccessful()
+          .expectBody()
+          .equals("/s?ring5");
     }
 
     @Test
     public void givenHandlerMethod_whenURLWithWildcardTakingZeroOrMorePathSegments_then200() {
 
         client.get()
-            .uri("/resources/baeldung")
-            .exchange()
-            .expectStatus()
-            .is2xxSuccessful()
-            .expectBody()
-            .equals("/resources/**");
+          .uri("/resources/baeldung")
+          .exchange()
+          .expectStatus()
+          .is2xxSuccessful()
+          .expectBody()
+          .equals("/resources/**");
     }
 
     @Test
     public void givenHandlerMethod_whenURLWithRegexInPathVariable_thenExpectedOutput() {
 
         client.get()
-            .uri("/abc")
-            .exchange()
-            .expectStatus()
-            .is2xxSuccessful()
-            .expectBody()
-            .equals("abc");
+          .uri("/abc")
+          .exchange()
+          .expectStatus()
+          .is2xxSuccessful()
+          .expectBody()
+          .equals("abc");
 
         client.get()
-            .uri("/123")
-            .exchange()
-            .expectStatus()
-            .is4xxClientError();
+          .uri("/123")
+          .exchange()
+          .expectStatus()
+          .is4xxClientError();
     }
 
     @Test
     public void givenHandlerMethod_whenURLWithMultiplePathVariablesInSameSegment_then200() {
 
         client.get()
-            .uri("/baeldung_tutorial")
-            .exchange()
-            .expectStatus()
-            .is2xxSuccessful()
-            .expectBody()
-            .equals("Two variables are var1=baeldung and var2=tutorial");
+          .uri("/baeldung_tutorial")
+          .exchange()
+          .expectStatus()
+          .is2xxSuccessful()
+          .expectBody()
+          .equals("Two variables are var1=baeldung and var2=tutorial");
     }
 
 }