Merge branch 'master' into pr/720-tim-bootstrap-security

apache-cxf/cxf-introduction/pom.xml

@@ -11,6 +11,7 @@
     </parent>
     <properties>
         <cxf.version>3.1.6</cxf.version>
+        <surefire.version>2.19.1</surefire.version>        
     </properties>
     <build>
         <plugins>
@@ -26,7 +27,7 @@
                 <version>2.19.1</version>
                 <configuration>
                     <excludes>
-                        <exclude>**/StudentTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -44,4 +45,5 @@
             <version>${cxf.version}</version>
         </dependency>
     </dependencies>
+
 </project>

apache-cxf/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java

@@ -2,20 +2,16 @@ package com.baeldung.cxf.introduction;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import java.util.Map;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 import javax.xml.ws.soap.SOAPBinding;
 
-import com.baeldung.cxf.introduction.Baeldung;
+import org.junit.Before;
-import com.baeldung.cxf.introduction.Student;
+import org.junit.Test;
-import com.baeldung.cxf.introduction.StudentImpl;
 
-public class StudentTest {
+public class StudentLiveTest {
     private static QName SERVICE_NAME = new QName("http://introduction.cxf.baeldung.com/", "Baeldung");
     private static QName PORT_NAME = new QName("http://introduction.cxf.baeldung.com/", "BaeldungPort");
 
@@ -25,7 +21,7 @@ public class StudentTest {
 
     {
         service = Service.create(SERVICE_NAME);
-        String endpointAddress = "http://localhost:8080/baeldung";
+        final String endpointAddress = "http://localhost:8080/baeldung";
         service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, endpointAddress);
     }
 
@@ -37,28 +33,28 @@ public class StudentTest {
 
     @Test
     public void whenUsingHelloMethod_thenCorrect() {
-        String endpointResponse = baeldungProxy.hello("Baeldung");
+        final String endpointResponse = baeldungProxy.hello("Baeldung");
-        String localResponse = baeldungImpl.hello("Baeldung");
+        final String localResponse = baeldungImpl.hello("Baeldung");
         assertEquals(localResponse, endpointResponse);
     }
 
     @Test
     public void whenUsingHelloStudentMethod_thenCorrect() {
-        Student student = new StudentImpl("John Doe");
+        final Student student = new StudentImpl("John Doe");
-        String endpointResponse = baeldungProxy.helloStudent(student);
+        final String endpointResponse = baeldungProxy.helloStudent(student);
-        String localResponse = baeldungImpl.helloStudent(student);
+        final String localResponse = baeldungImpl.helloStudent(student);
         assertEquals(localResponse, endpointResponse);
     }
 
     @Test
     public void usingGetStudentsMethod_thenCorrect() {
-        Student student1 = new StudentImpl("Adam");
+        final Student student1 = new StudentImpl("Adam");
         baeldungProxy.helloStudent(student1);
 
-        Student student2 = new StudentImpl("Eve");
+        final Student student2 = new StudentImpl("Eve");
         baeldungProxy.helloStudent(student2);
 
-        Map<Integer, Student> students = baeldungProxy.getStudents();       
+        final Map<Integer, Student> students = baeldungProxy.getStudents();
         assertEquals("Adam", students.get(1).getName());
         assertEquals("Eve", students.get(2).getName());
     }

apache-cxf/cxf-jaxrs-implementation/pom.xml

@@ -13,6 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cxf.version>3.1.7</cxf.version>
         <httpclient.version>4.5.2</httpclient.version>
+        <surefire.version>2.19.1</surefire.version>        
     </properties>
     <build>
         <plugins>
@@ -28,7 +29,7 @@
                 <version>2.19.1</version>
                 <configuration>
                     <excludes>
-                        <exclude>**/ServiceTest</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>

apache-cxf/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 @Path("baeldung")
 @Produces("text/xml")
-public class Baeldung {
+public class CourseRepository {
     private Map<Integer, Course> courses = new HashMap<>();
 
     {

apache-cxf/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/RestfulServer.java

@@ -7,8 +7,8 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 public class RestfulServer {
     public static void main(String args[]) throws Exception {
         JAXRSServerFactoryBean factoryBean = new JAXRSServerFactoryBean();
-        factoryBean.setResourceClasses(Baeldung.class);
+        factoryBean.setResourceClasses(CourseRepository.class);
-        factoryBean.setResourceProvider(new SingletonResourceProvider(new Baeldung()));
+        factoryBean.setResourceProvider(new SingletonResourceProvider(new CourseRepository()));
         factoryBean.setAddress("http://localhost:8080/");
         Server server = factoryBean.create();
         

apache-cxf/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java

@@ -1,5 +1,14 @@
 package com.baeldung.cxf.jaxrs.implementation;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import javax.xml.bind.JAXB;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpPost;
@@ -11,15 +20,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.xml.bind.JAXB;
+public class ServiceLiveTest {
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import static org.junit.Assert.assertEquals;
-
-public class ServiceTest {
     private static final String BASE_URL = "http://localhost:8080/baeldung/courses/";
     private static CloseableHttpClient client;
 
@@ -35,95 +36,95 @@ public class ServiceTest {
 
     @Test
     public void whenUpdateNonExistentCourse_thenReceiveNotFoundResponse() throws IOException {
-        HttpPut httpPut = new HttpPut(BASE_URL + "3");
+        final HttpPut httpPut = new HttpPut(BASE_URL + "3");
-        InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("non_existent_course.xml");
+        final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("non_existent_course.xml");
         httpPut.setEntity(new InputStreamEntity(resourceStream));
         httpPut.setHeader("Content-Type", "text/xml");
 
-        HttpResponse response = client.execute(httpPut);
+        final HttpResponse response = client.execute(httpPut);
         assertEquals(404, response.getStatusLine().getStatusCode());
     }
 
     @Test
     public void whenUpdateUnchangedCourse_thenReceiveNotModifiedResponse() throws IOException {
-        HttpPut httpPut = new HttpPut(BASE_URL + "1");
+        final HttpPut httpPut = new HttpPut(BASE_URL + "1");
-        InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("unchanged_course.xml");
+        final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("unchanged_course.xml");
         httpPut.setEntity(new InputStreamEntity(resourceStream));
         httpPut.setHeader("Content-Type", "text/xml");
 
-        HttpResponse response = client.execute(httpPut);
+        final HttpResponse response = client.execute(httpPut);
         assertEquals(304, response.getStatusLine().getStatusCode());
     }
 
     @Test
     public void whenUpdateValidCourse_thenReceiveOKResponse() throws IOException {
-        HttpPut httpPut = new HttpPut(BASE_URL + "2");
+        final HttpPut httpPut = new HttpPut(BASE_URL + "2");
-        InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("changed_course.xml");
+        final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("changed_course.xml");
         httpPut.setEntity(new InputStreamEntity(resourceStream));
         httpPut.setHeader("Content-Type", "text/xml");
 
-        HttpResponse response = client.execute(httpPut);
+        final HttpResponse response = client.execute(httpPut);
         assertEquals(200, response.getStatusLine().getStatusCode());
 
-        Course course = getCourse(2);
+        final Course course = getCourse(2);
         assertEquals(2, course.getId());
         assertEquals("Apache CXF Support for RESTful", course.getName());
     }
 
     @Test
     public void whenCreateConflictStudent_thenReceiveConflictResponse() throws IOException {
-        HttpPost httpPost = new HttpPost(BASE_URL + "1/students");
+        final HttpPost httpPost = new HttpPost(BASE_URL + "1/students");
-        InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("conflict_student.xml");
+        final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("conflict_student.xml");
         httpPost.setEntity(new InputStreamEntity(resourceStream));
         httpPost.setHeader("Content-Type", "text/xml");
 
-        HttpResponse response = client.execute(httpPost);
+        final HttpResponse response = client.execute(httpPost);
         assertEquals(409, response.getStatusLine().getStatusCode());
     }
 
     @Test
     public void whenCreateValidStudent_thenReceiveOKResponse() throws IOException {
-        HttpPost httpPost = new HttpPost(BASE_URL + "2/students");
+        final HttpPost httpPost = new HttpPost(BASE_URL + "2/students");
-        InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("created_student.xml");
+        final InputStream resourceStream = this.getClass().getClassLoader().getResourceAsStream("created_student.xml");
         httpPost.setEntity(new InputStreamEntity(resourceStream));
         httpPost.setHeader("Content-Type", "text/xml");
 
-        HttpResponse response = client.execute(httpPost);
+        final HttpResponse response = client.execute(httpPost);
         assertEquals(200, response.getStatusLine().getStatusCode());
 
-        Student student = getStudent(2, 3);
+        final Student student = getStudent(2, 3);
         assertEquals(3, student.getId());
         assertEquals("Student C", student.getName());
     }
 
     @Test
     public void whenDeleteInvalidStudent_thenReceiveNotFoundResponse() throws IOException {
-        HttpDelete httpDelete = new HttpDelete(BASE_URL + "1/students/3");
+        final HttpDelete httpDelete = new HttpDelete(BASE_URL + "1/students/3");
-        HttpResponse response = client.execute(httpDelete);
+        final HttpResponse response = client.execute(httpDelete);
         assertEquals(404, response.getStatusLine().getStatusCode());
     }
 
     @Test
     public void whenDeleteValidStudent_thenReceiveOKResponse() throws IOException {
-        HttpDelete httpDelete = new HttpDelete(BASE_URL + "1/students/1");
+        final HttpDelete httpDelete = new HttpDelete(BASE_URL + "1/students/1");
-        HttpResponse response = client.execute(httpDelete);
+        final HttpResponse response = client.execute(httpDelete);
         assertEquals(200, response.getStatusLine().getStatusCode());
 
-        Course course = getCourse(1);
+        final Course course = getCourse(1);
         assertEquals(1, course.getStudents().size());
         assertEquals(2, course.getStudents().get(0).getId());
         assertEquals("Student B", course.getStudents().get(0).getName());
     }
 
     private Course getCourse(int courseOrder) throws IOException {
-        URL url = new URL(BASE_URL + courseOrder);
+        final URL url = new URL(BASE_URL + courseOrder);
-        InputStream input = url.openStream();
+        final InputStream input = url.openStream();
         return JAXB.unmarshal(new InputStreamReader(input), Course.class);
     }
 
     private Student getStudent(int courseOrder, int studentOrder) throws IOException {
-        URL url = new URL(BASE_URL + courseOrder + "/students/" + studentOrder);
+        final URL url = new URL(BASE_URL + courseOrder + "/students/" + studentOrder);
-        InputStream input = url.openStream();
+        final InputStream input = url.openStream();
         return JAXB.unmarshal(new InputStreamReader(input), Student.class);
     }
 }

apache-cxf/cxf-spring/pom.xml

@@ -51,7 +51,7 @@
                 <version>${surefire.version}</version>
                 <configuration>
                     <excludes>
-                        <exclude>StudentTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -60,7 +60,7 @@
     
     <profiles>
         <profile>
-            <id>integration</id>
+            <id>live</id>
             <build>
                 <plugins>
                     <plugin>

apache-cxf/cxf-spring/src/test/java/com/baeldung/cxf/spring/StudentLiveTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-public class StudentTest {
+public class StudentLiveTest {
     private ApplicationContext context = new AnnotationConfigApplicationContext(ClientConfiguration.class);
     private Baeldung baeldungProxy = (Baeldung) context.getBean("client");
 

cdi/pom.xml

@@ -45,8 +45,60 @@
 
     </dependencies>
 
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*LiveTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*IntegrationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     <properties>
         <spring.version>4.3.1.RELEASE</spring.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>        
     </properties>
 
 </project>

cdi/src/test/java/com/baeldung/test/InterceptorIntegrationTest.java

@@ -10,7 +10,7 @@ import org.junit.Test;
 import com.baeldung.interceptor.AuditedInterceptor;
 import com.baeldung.service.SuperService;
 
-public class TestInterceptor {
+public class InterceptorIntegrationTest {
     Weld weld;
     WeldContainer container;
 

cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java

@@ -16,19 +16,23 @@ import com.baeldung.spring.service.SpringSuperService;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = { AppConfig.class })
-public class TestSpringInterceptor {
+public class SpringInterceptorIntegrationTest {
     @Autowired
     SpringSuperService springSuperService;
 
     @Autowired
     private List<String> accumulator;
 
+    //
+
     @Test
     public void givenService_whenServiceAndAspectExecuted_thenOk() {
         String code = "123456";
         String result = springSuperService.getInfoFromService(code);
+
         Assert.assertThat(accumulator.size(), is(2));
         Assert.assertThat(accumulator.get(0), is("Call to getInfoFromService"));
         Assert.assertThat(accumulator.get(1), is("Method called successfully: getInfoFromService"));
     }
+
 }

core-java-8/README.md

@@ -1,24 +0,0 @@
-=========
-
-## Core Java 8 Cookbooks and Examples
-
-### Relevant Articles: 
-- [Java 8 – Powerful Comparison with Lambdas](http://www.baeldung.com/java-8-sort-lambda)
-- [Java – Directory Size](http://www.baeldung.com/java-folder-size)
-- [Java – Try with Resources](http://www.baeldung.com/java-try-with-resources)
-- [A Guide to the Java ExecutorService](http://www.baeldung.com/java-executor-service-tutorial)
-- [Java 8 New Features](http://www.baeldung.com/java-8-new-features)
-- [Lambda Expressions and Functional Interfaces: Tips and Best Practices](http://www.baeldung.com/java-8-lambda-expressions-tips)
-- [The Double Colon Operator in Java 8](http://www.baeldung.com/java-8-double-colon-operator)
-- [Java 8 Streams Advanced](http://www.baeldung.com/java-8-streams)
-- [Java 8 Collectors](http://www.baeldung.com/java-8-collectors)
-- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
-- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
-- [Guide to Java 8’s Functional Interfaces](http://www.baeldung.com/java-8-functional-interfaces)
-- [Guide To CompletableFuture](http://www.baeldung.com/java-completablefuture)
-- [Introduction to Thread Pools in Java](http://www.baeldung.com/thread-pool-java-and-guava)
-- [Guide to Java 8 Collectors](http://www.baeldung.com/java-8-collectors)
-- [The Java 8 Stream API Tutorial](http://www.baeldung.com/java-8-streams)
-- [New Features in Java 8](http://www.baeldung.com/java-8-new-features)
-- [Introduction to Java 8 Streams](http://www.baeldung.com/java-8-streams-introduction)
-- [Guide to the Fork/Join Framework in Java](http://www.baeldung.com/java-fork-join)

core-java-8/pom.xml

@@ -1,142 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-    <artifactId>core-java8</artifactId>
-
-    <name>core-java8</name>
-
-    <dependencies>
-
-        <!-- utils -->
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-
-        <!-- test scoped -->
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.5.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>core-java-8</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
-    <properties>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-        <!-- logging -->
-        <org.slf4j.version>1.7.13</org.slf4j.version>
-        <logback.version>1.0.13</logback.version>
-
-        <!-- various -->
-        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
-
-        <!-- util -->
-        <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.4</commons-lang3.version>
-
-        <!-- testing -->
-        <org.hamcrest.version>1.3</org.hamcrest.version>
-        <junit.version>4.12</junit.version>
-        <mockito.version>1.10.19</mockito.version>
-
-        <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-        <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-
-    </properties>
-
-</project>

core-java-8/src/main/java/.gitignore

@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear

core-java-8/src/main/java/com/baeldung/enums/Pizza.java

@@ -1,91 +0,0 @@
-package com.baeldung.enums;
-
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class Pizza {
-
-    private static EnumSet<PizzaStatusEnum> deliveredPizzaStatuses =
-            EnumSet.of(PizzaStatusEnum.DELIVERED);
-
-    private PizzaStatusEnum status;
-
-    public enum PizzaStatusEnum {
-        ORDERED(5) {
-            @Override
-            public boolean isOrdered() {
-                return true;
-            }
-        },
-        READY(2) {
-            @Override
-            public boolean isReady() {
-                return true;
-            }
-        },
-        DELIVERED(0) {
-            @Override
-            public boolean isDelivered() {
-                return true;
-            }
-        };
-
-        private int timeToDelivery;
-
-        public boolean isOrdered() {
-            return false;
-        }
-
-        public boolean isReady() {
-            return false;
-        }
-
-        public boolean isDelivered() {
-            return false;
-        }
-
-        public int getTimeToDelivery() {
-            return timeToDelivery;
-        }
-
-        PizzaStatusEnum(int timeToDelivery) {
-            this.timeToDelivery = timeToDelivery;
-        }
-    }
-
-    public PizzaStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(PizzaStatusEnum status) {
-        this.status = status;
-    }
-
-    public boolean isDeliverable() {
-        return this.status.isReady();
-    }
-
-    public void printTimeToDeliver() {
-        System.out.println("Time to delivery is " + this.getStatus().getTimeToDelivery() + " days");
-    }
-
-    public static List<Pizza> getAllUndeliveredPizzas(List<Pizza> input) {
-        return input.stream().filter((s) -> !deliveredPizzaStatuses.contains(s.getStatus())).collect(Collectors.toList());
-    }
-
-    public static EnumMap<PizzaStatusEnum, List<Pizza>> groupPizzaByStatus(List<Pizza> pzList) {
-        return pzList.stream().collect(
-                Collectors.groupingBy(Pizza::getStatus,
-                        () -> new EnumMap<>(PizzaStatusEnum.class), Collectors.toList()));
-    }
-
-    public void deliver() {
-        if (isDeliverable()) {
-            PizzaDeliverySystemConfiguration.getInstance().getDeliveryStrategy().deliver(this);
-            this.setStatus(PizzaStatusEnum.DELIVERED);
-        }
-    }
-
-}

core-java-8/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java

@@ -1,18 +0,0 @@
-package com.baeldung.enums;
-
-public enum PizzaDeliveryStrategy {
-    EXPRESS {
-        @Override
-        public void deliver(Pizza pz) {
-            System.out.println("Pizza will be delivered in express mode");
-        }
-    },
-    NORMAL {
-        @Override
-        public void deliver(Pizza pz) {
-            System.out.println("Pizza will be delivered in normal mode");
-        }
-    };
-
-    public abstract void deliver(Pizza pz);
-}

core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java

@@ -1,22 +0,0 @@
-package com.baeldung.enums;
-
-
-public enum PizzaDeliverySystemConfiguration {
-    INSTANCE;
-
-    PizzaDeliverySystemConfiguration() {
-        // Do the configuration initialization which
-        // involves overriding defaults like delivery strategy
-    }
-
-    private PizzaDeliveryStrategy deliveryStrategy = PizzaDeliveryStrategy.NORMAL;
-
-    public static PizzaDeliverySystemConfiguration getInstance() {
-        return INSTANCE;
-    }
-
-    public PizzaDeliveryStrategy getDeliveryStrategy() {
-        return deliveryStrategy;
-    }
-
-}

core-java-8/src/main/resources/logback.xml

@@ -1,16 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <!-- <logger name="org.springframework" level="WARN" /> -->
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>

core-java-8/src/main/resources/unzipTest/test1.txt

@@ -1 +0,0 @@
-Hello World!

core-java-8/src/main/resources/zipTest/test1.txt

@@ -1 +0,0 @@
-Hello World!

core-java-8/src/main/resources/zipTest/test2.txt

@@ -1 +0,0 @@
-My Name is John

core-java-8/src/main/resources/zipTest/testFolder/test3.txt

@@ -1 +0,0 @@
-My Name is Tom

core-java-8/src/main/resources/zipTest/testFolder/test4.txt

@@ -1 +0,0 @@
-My Name is Jane

core-java-8/src/test/resources/test.txt

@@ -1 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse facilisis neque sed turpis venenatis, non dignissim risus volutpat.

core-java/README.md

@@ -18,3 +18,21 @@
 - [MD5 Hashing in Java](http://www.baeldung.com/java-md5)
 - [Guide to the Java ArrayList](http://www.baeldung.com/java-arraylist)
 - [Guide to Java Reflection](http://www.baeldung.com/java-reflection)
+- [A Guide to Java Sockets](http://www.baeldung.com/a-guide-to-java-sockets)
+- [Java 8 Collectors](http://www.baeldung.com/java-8-collectors)
+- [Guide To CompletableFuture](http://www.baeldung.com/java-completablefuture)
+- [Guide to Java 8’s Functional Interfaces](http://www.baeldung.com/java-8-functional-interfaces)
+- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
+- [Random List Element](http://www.baeldung.com/java-random-list-element)
+- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
+- [Java 8 – Powerful Comparison with Lambdas](http://www.baeldung.com/java-8-sort-lambda)
+- [Java – Directory Size](http://www.baeldung.com/java-folder-size)
+- [Java – Try with Resources](http://www.baeldung.com/java-try-with-resources)
+- [A Guide to the Java ExecutorService](http://www.baeldung.com/java-executor-service-tutorial)
+- [Java 8 New Features](http://www.baeldung.com/java-8-new-features)
+- [Lambda Expressions and Functional Interfaces: Tips and Best Practices](http://www.baeldung.com/java-8-lambda-expressions-tips)
+- [The Double Colon Operator in Java 8](http://www.baeldung.com/java-8-double-colon-operator)
+- [Java 8 Streams Advanced](http://www.baeldung.com/java-8-streams)
+- [Introduction to Thread Pools in Java](http://www.baeldung.com/thread-pool-java-and-guava)
+- [Introduction to Java 8 Streams](http://www.baeldung.com/java-8-streams-introduction)
+- [Guide to the Fork/Join Framework in Java](http://www.baeldung.com/java-fork-join)

core-java/pom.xml

@@ -162,6 +162,8 @@
 				<configuration>
 					<excludes>
 						<exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
 					</excludes>
 				</configuration>
 			</plugin>
@@ -278,6 +280,41 @@
 
 	</build>
 	
+	<profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*ManualTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*IntegrationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 	<properties>
 		<!-- persistence -->
 		<hibernate.version>4.3.11.Final</hibernate.version>

core-java/src/main/java/com/baeldung/datetime/UseDuration.java

@@ -6,11 +6,11 @@ import java.time.Period;
 
 public class UseDuration {
 
-    public LocalTime modifyDates(LocalTime localTime,Duration duration){
+    public LocalTime modifyDates(LocalTime localTime, Duration duration) {
         return localTime.plus(duration);
     }
 
-    public Duration getDifferenceBetweenDates(LocalTime localTime1,LocalTime localTime2){
+    public Duration getDifferenceBetweenDates(LocalTime localTime1, LocalTime localTime2) {
         return Duration.between(localTime1, localTime2);
     }
 }

core-java/src/main/java/com/baeldung/datetime/UseLocalDate.java

@@ -8,38 +8,38 @@ import java.time.temporal.TemporalAdjusters;
 
 public class UseLocalDate {
 
-    public LocalDate getLocalDateUsingFactoryOfMethod(int year, int month, int dayOfMonth){        
+    public LocalDate getLocalDateUsingFactoryOfMethod(int year, int month, int dayOfMonth) {
         return LocalDate.of(year, month, dayOfMonth);
     }
 
-    public LocalDate getLocalDateUsingParseMethod(String representation){        
+    public LocalDate getLocalDateUsingParseMethod(String representation) {
         return LocalDate.parse(representation);
     }
 
-    public LocalDate getLocalDateFromClock(){        
+    public LocalDate getLocalDateFromClock() {
         LocalDate localDate = LocalDate.now();
         return localDate;
     }
 
-    public LocalDate getNextDay(LocalDate localDate){       
+    public LocalDate getNextDay(LocalDate localDate) {
         return localDate.plusDays(1);
     }
 
-    public LocalDate getPreviousDay(LocalDate localDate){        
+    public LocalDate getPreviousDay(LocalDate localDate) {
         return localDate.minus(1, ChronoUnit.DAYS);
     }
 
-    public DayOfWeek getDayOfWeek(LocalDate localDate){        
+    public DayOfWeek getDayOfWeek(LocalDate localDate) {
         DayOfWeek day = localDate.getDayOfWeek();
         return day;
     }
 
-    public LocalDate getFirstDayOfMonth(){        
+    public LocalDate getFirstDayOfMonth() {
         LocalDate firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
         return firstDayOfMonth;
     }
 
-    public LocalDateTime getStartOfDay(LocalDate localDate){        
+    public LocalDateTime getStartOfDay(LocalDate localDate) {
         LocalDateTime startofDay = localDate.atStartOfDay();
         return startofDay;
     }

core-java/src/main/java/com/baeldung/datetime/UseLocalDateTime.java

@@ -4,7 +4,7 @@ import java.time.LocalDateTime;
 
 public class UseLocalDateTime {
 
-    public LocalDateTime getLocalDateTimeUsingParseMethod(String representation){        
+    public LocalDateTime getLocalDateTimeUsingParseMethod(String representation) {
         return LocalDateTime.parse(representation);
     }
 

core-java/src/main/java/com/baeldung/datetime/UseLocalTime.java

@@ -5,31 +5,31 @@ import java.time.temporal.ChronoUnit;
 
 public class UseLocalTime {
 
-    public LocalTime getLocalTimeUsingFactoryOfMethod(int hour, int min, int seconds){        
+    public LocalTime getLocalTimeUsingFactoryOfMethod(int hour, int min, int seconds) {
         LocalTime localTime = LocalTime.of(hour, min, seconds);
         return localTime;
     }
 
-    public LocalTime getLocalTimeUsingParseMethod(String timeRepresentation){        
+    public LocalTime getLocalTimeUsingParseMethod(String timeRepresentation) {
         LocalTime localTime = LocalTime.parse(timeRepresentation);
         return localTime;
     }
 
-    public LocalTime getLocalTimeFromClock(){        
+    public LocalTime getLocalTimeFromClock() {
         LocalTime localTime = LocalTime.now();
         return localTime;
     }
 
-    public LocalTime addAnHour(LocalTime localTime){
+    public LocalTime addAnHour(LocalTime localTime) {
-        LocalTime newTime = localTime.plus(1,ChronoUnit.HOURS);
+        LocalTime newTime = localTime.plus(1, ChronoUnit.HOURS);
         return newTime;
     }
 
-    public int getHourFromLocalTime(LocalTime localTime){        
+    public int getHourFromLocalTime(LocalTime localTime) {
         return localTime.getHour();
     }
 
-    public LocalTime getLocalTimeWithMinuteSetToValue(LocalTime localTime, int minute){        
+    public LocalTime getLocalTimeWithMinuteSetToValue(LocalTime localTime, int minute) {
         return localTime.withMinute(minute);
     }
 }

core-java/src/main/java/com/baeldung/datetime/UsePeriod.java

@@ -5,11 +5,11 @@ import java.time.Period;
 
 public class UsePeriod {
 
-    public LocalDate modifyDates(LocalDate localDate,Period period){
+    public LocalDate modifyDates(LocalDate localDate, Period period) {
         return localDate.plus(period);
     }
 
-    public Period getDifferenceBetweenDates(LocalDate localDate1,LocalDate localDate2){
+    public Period getDifferenceBetweenDates(LocalDate localDate1, LocalDate localDate2) {
         return Period.between(localDate1, localDate2);
     }
 }

core-java/src/main/java/com/baeldung/datetime/UseToInstant.java

@@ -7,12 +7,12 @@ import java.util.Date;
 
 public class UseToInstant {
 
-    public LocalDateTime convertDateToLocalDate(Date date){
+    public LocalDateTime convertDateToLocalDate(Date date) {
         LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
         return localDateTime;
     }
 
-    public LocalDateTime convertDateToLocalDate(Calendar calendar){
+    public LocalDateTime convertDateToLocalDate(Calendar calendar) {
         LocalDateTime localDateTime = LocalDateTime.ofInstant(calendar.toInstant(), ZoneId.systemDefault());
         return localDateTime;
     }

core-java/src/main/java/com/baeldung/datetime/UseZonedDateTime.java

@@ -6,7 +6,7 @@ import java.time.ZonedDateTime;
 
 public class UseZonedDateTime {
 
-    public ZonedDateTime getZonedDateTime(LocalDateTime localDateTime,ZoneId zoneId){        
+    public ZonedDateTime getZonedDateTime(LocalDateTime localDateTime, ZoneId zoneId) {
         ZonedDateTime zonedDateTime = ZonedDateTime.of(localDateTime, zoneId);
         return zonedDateTime;
     }

core-java/src/main/java/com/baeldung/enums/Pizza.java

@@ -1,11 +1,5 @@
 package com.baeldung.enums;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.collections15.Predicate;
-
-import java.io.IOException;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
@@ -13,13 +7,11 @@ import java.util.stream.Collectors;
 
 public class Pizza {
 
-    private static EnumSet<PizzaStatus> undeliveredPizzaStatuses =
+    private static EnumSet<PizzaStatusEnum> deliveredPizzaStatuses = EnumSet.of(PizzaStatusEnum.DELIVERED);
-            EnumSet.of(PizzaStatus.ORDERED, PizzaStatus.READY);
 
-    private PizzaStatus status;
+    private PizzaStatusEnum status;
 
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PizzaStatusEnum {
-    public enum PizzaStatus {
         ORDERED(5) {
             @Override
             public boolean isOrdered() {
@@ -53,21 +45,20 @@ public class Pizza {
             return false;
         }
 
-        @JsonProperty("timeToDelivery")
         public int getTimeToDelivery() {
             return timeToDelivery;
         }
 
-        PizzaStatus(int timeToDelivery) {
+        PizzaStatusEnum(int timeToDelivery) {
             this.timeToDelivery = timeToDelivery;
         }
     }
 
-    public PizzaStatus getStatus() {
+    public PizzaStatusEnum getStatus() {
         return status;
     }
 
-    public void setStatus(PizzaStatus status) {
+    public void setStatus(PizzaStatusEnum status) {
         this.status = status;
     }
 
@@ -80,31 +71,18 @@ public class Pizza {
     }
 
     public static List<Pizza> getAllUndeliveredPizzas(List<Pizza> input) {
-        return input.stream().filter(
+        return input.stream().filter((s) -> !deliveredPizzaStatuses.contains(s.getStatus())).collect(Collectors.toList());
-                (s) -> undeliveredPizzaStatuses.contains(s.getStatus()))
-                .collect(Collectors.toList());
     }
 
-    public static EnumMap<PizzaStatus, List<Pizza>>
+    public static EnumMap<PizzaStatusEnum, List<Pizza>> groupPizzaByStatus(List<Pizza> pzList) {
-    groupPizzaByStatus(List<Pizza> pzList) {
+        return pzList.stream().collect(Collectors.groupingBy(Pizza::getStatus, () -> new EnumMap<>(PizzaStatusEnum.class), Collectors.toList()));
-        return pzList.stream().collect(
-                Collectors.groupingBy(Pizza::getStatus,
-                        () -> new EnumMap<>(PizzaStatus.class), Collectors.toList()));
     }
 
     public void deliver() {
         if (isDeliverable()) {
             PizzaDeliverySystemConfiguration.getInstance().getDeliveryStrategy().deliver(this);
-            this.setStatus(PizzaStatus.DELIVERED);
+            this.setStatus(PizzaStatusEnum.DELIVERED);
         }
     }
 
-    public static String getJsonString(Pizza pz) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(pz);
-    }
-
-    private static Predicate<Pizza> thatAreNotDelivered() {
-        return entry -> undeliveredPizzaStatuses.contains(entry.getStatus());
-    }
 }

core-java/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java

@@ -30,8 +30,7 @@ public class CustomRecursiveAction extends RecursiveAction {
 
     private Collection<CustomRecursiveAction> createSubtasks() {
 
-        List<CustomRecursiveAction> subtasks =
+        List<CustomRecursiveAction> subtasks = new ArrayList<>();
-                new ArrayList<>();
 
         String partOne = workLoad.substring(0, workLoad.length() / 2);
         String partTwo = workLoad.substring(workLoad.length() / 2, workLoad.length());

core-java/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java

@@ -1,6 +1,5 @@
 package com.baeldung.forkjoin;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,10 +22,7 @@ public class CustomRecursiveTask extends RecursiveTask<Integer> {
 
         if (arr.length > THRESHOLD) {
 
-            return ForkJoinTask.invokeAll(createSubtasks())
+            return ForkJoinTask.invokeAll(createSubtasks()).stream().mapToInt(ForkJoinTask::join).sum();
-                    .stream()
-                    .mapToInt(ForkJoinTask::join)
-                    .sum();
 
         } else {
             return processing(arr);
@@ -35,17 +31,12 @@ public class CustomRecursiveTask extends RecursiveTask<Integer> {
 
     private Collection<CustomRecursiveTask> createSubtasks() {
         List<CustomRecursiveTask> dividedTasks = new ArrayList<>();
-        dividedTasks.add(new CustomRecursiveTask(
+        dividedTasks.add(new CustomRecursiveTask(Arrays.copyOfRange(arr, 0, arr.length / 2)));
-                Arrays.copyOfRange(arr, 0, arr.length / 2)));
+        dividedTasks.add(new CustomRecursiveTask(Arrays.copyOfRange(arr, arr.length / 2, arr.length)));
-        dividedTasks.add(new CustomRecursiveTask(
-                Arrays.copyOfRange(arr, arr.length / 2, arr.length)));
         return dividedTasks;
     }
 
     private Integer processing(int[] arr) {
-        return Arrays.stream(arr)
+        return Arrays.stream(arr).filter(a -> a > 10 && a < 27).map(a -> a * 10).sum();
-                .filter(a -> a > 10 && a < 27)
-                .map(a -> a * 10)
-                .sum();
     }
 }

core-java/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java

@@ -1,6 +1,5 @@
 package com.baeldung.forkjoin.util;
 
-
 import java.util.concurrent.ForkJoinPool;
 
 public class PoolUtil {

core-java/src/main/java/com/baeldung/java/networking/cookies/PersistentCookieStore.java

@@ -0,0 +1,56 @@
+package com.baeldung.java.networking.cookies;
+
+import java.net.*;
+import java.util.List;
+
+public class PersistentCookieStore implements CookieStore, Runnable {
+    CookieStore store;
+
+    public PersistentCookieStore() {
+        store = new CookieManager().getCookieStore();
+        // deserialize cookies into store
+        Runtime.getRuntime().addShutdownHook(new Thread(this));
+    }
+
+    @Override
+    public void run() {
+        // serialize cookies to persistent storage
+    }
+
+    @Override
+    public void add(URI uri, HttpCookie cookie) {
+        store.add(uri, cookie);
+
+    }
+
+    @Override
+    public List<HttpCookie> get(URI uri) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<HttpCookie> getCookies() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<URI> getURIs() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean remove(URI uri, HttpCookie cookie) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean removeAll() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+}

core-java/src/main/java/com/baeldung/java/networking/cookies/ProxyAcceptCookiePolicy.java

@@ -0,0 +1,26 @@
+package com.baeldung.java.networking.cookies;
+
+import java.net.*;
+
+public class ProxyAcceptCookiePolicy implements CookiePolicy {
+    String acceptedProxy;
+
+    public ProxyAcceptCookiePolicy(String acceptedProxy) {
+        this.acceptedProxy = acceptedProxy;
+    }
+
+    public boolean shouldAccept(URI uri, HttpCookie cookie) {
+        String host;
+        try {
+            host = InetAddress.getByName(uri.getHost()).getCanonicalHostName();
+        } catch (UnknownHostException e) {
+            host = uri.getHost();
+        }
+
+        if (!HttpCookie.domainMatches(acceptedProxy, host)) {
+            return false;
+        }
+
+        return CookiePolicy.ACCEPT_ORIGINAL_SERVER.shouldAccept(uri, cookie);
+    }
+}

core-java/src/main/java/com/baeldung/java/networking/udp/EchoClient.java

@@ -0,0 +1,42 @@
+package com.baeldung.java.networking.udp;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+
+public class EchoClient {
+    private DatagramSocket socket;
+    private InetAddress address;
+
+    private byte[] buf;
+
+    public EchoClient() {
+        try {
+            socket = new DatagramSocket();
+            address = InetAddress.getByName("localhost");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public String sendEcho(String msg) {
+        DatagramPacket packet = null;
+        try {
+            buf=msg.getBytes();
+            packet = new DatagramPacket(buf, buf.length, address, 4445);
+            socket.send(packet);
+            packet = new DatagramPacket(buf, buf.length);
+            socket.receive(packet);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        String received = new String(packet.getData(), 0, packet.getLength());
+        return received;
+    }
+
+    public void close() {
+        socket.close();
+    }
+}

core-java/src/main/java/com/baeldung/java/networking/udp/EchoServer.java

@@ -0,0 +1,42 @@
+package com.baeldung.java.networking.udp;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+
+public class EchoServer extends Thread {
+
+    protected DatagramSocket socket = null;
+    protected boolean running;
+    protected byte[] buf = new byte[256];
+
+    public EchoServer() throws IOException {
+        socket = new DatagramSocket(4445);
+    }
+
+    public void run() {
+        running = true;
+
+        while (running) {
+            try {
+
+                DatagramPacket packet = new DatagramPacket(buf, buf.length);
+                socket.receive(packet);
+                InetAddress address = packet.getAddress();
+                int port = packet.getPort();
+                packet = new DatagramPacket(buf, buf.length, address, port);
+                String received = new String(packet.getData(), 0, packet.getLength());
+                if (received.equals("end")) {
+                    running = false;
+                    continue;
+                }
+                socket.send(packet);
+            } catch (IOException e) {
+                e.printStackTrace();
+                running = false;
+            }
+        }
+        socket.close();
+    }
+}

core-java/src/main/java/com/baeldung/java/nio/selector/EchoServer.java

@@ -1,21 +1,21 @@
 package com.baeldung.java.nio.selector;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.util.Iterator;
+import java.nio.channels.Selector;
+import java.nio.channels.SelectionKey;
+import java.nio.ByteBuffer;
+import java.io.IOException;
 import java.util.Set;
+import java.util.Iterator;
+import java.net.InetSocketAddress;
+import java.io.File;
 
 public class EchoServer {
 
     public static void main(String[] args)
 
-    throws IOException {
+            throws IOException {
         Selector selector = Selector.open();
         ServerSocketChannel serverSocket = ServerSocketChannel.open();
         serverSocket.bind(new InetSocketAddress("localhost", 5454));
@@ -49,6 +49,7 @@ public class EchoServer {
         }
     }
 
+
     public static Process start() throws IOException, InterruptedException {
         String javaHome = System.getProperty("java.home");
         String javaBin = javaHome + File.separator + "bin" + File.separator + "java";

core-java/src/main/java/com/baeldung/java_8_features/Vehicle.java

@@ -9,7 +9,7 @@ public interface Vehicle {
     }
 
     default long[] startPosition() {
-        return new long[]{23, 15};
+        return new long[] { 23, 15 };
     }
 
     default String getOverview() {

core-java/src/main/java/com/baeldung/java_8_features/VehicleImpl.java

@@ -1,9 +1,9 @@
 package com.baeldung.java_8_features;
 
-public class VehicleImpl implements  Vehicle {
+public class VehicleImpl implements Vehicle {
 
     @Override
     public void moveTo(long altitude, long longitude) {
-        //do nothing
+        // do nothing
     }
 }

core-java/src/main/java/com/baeldung/printscreen/Screenshot.java

@@ -14,7 +14,6 @@ public class Screenshot {
     }
 
     public void getScreenshot(int timeToWait) throws Exception {
-        Thread.sleep(timeToWait);
         Rectangle rectangle = new Rectangle(Toolkit.getDefaultToolkit().getScreenSize());
         Robot robot = new Robot();
         BufferedImage img = robot.createScreenCapture(rectangle);

core-java/src/main/java/com/baeldung/socket/EchoClient.java

@@ -0,0 +1,41 @@
+package com.baeldung.socket;
+
+import java.io.*;
+import java.net.*;
+
+public class EchoClient {
+    private Socket clientSocket;
+    private PrintWriter out;
+    private BufferedReader in;
+
+    public void startConnection(String ip, int port) {
+        try {
+            clientSocket = new Socket(ip, port);
+            out = new PrintWriter(clientSocket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+        } catch (IOException e) {
+            System.out.print(e);
+        }
+
+    }
+
+    public String sendMessage(String msg) {
+        try {
+            out.println(msg);
+            return in.readLine();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public void stopConnection() {
+        try {
+            in.close();
+            out.close();
+            clientSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+}

core-java/src/main/java/com/baeldung/socket/EchoMultiServer.java

@@ -0,0 +1,70 @@
+package com.baeldung.socket;
+
+import java.net.*;
+import java.io.*;
+
+public class EchoMultiServer {
+    private ServerSocket serverSocket;
+
+    public void start(int port) {
+        try {
+            serverSocket = new ServerSocket(port);
+            while (true)
+                new EchoClientHandler(serverSocket.accept()).run();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            stop();
+        }
+
+    }
+
+    public void stop() {
+        try {
+
+            serverSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private static class EchoClientHandler extends Thread {
+        private Socket clientSocket;
+        private PrintWriter out;
+        private BufferedReader in;
+
+        public EchoClientHandler(Socket socket) {
+            this.clientSocket = socket;
+        }
+
+        public void run() {
+            try {
+                out = new PrintWriter(clientSocket.getOutputStream(), true);
+                in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+                String inputLine;
+                while ((inputLine = in.readLine()) != null) {
+                    if (".".equals(inputLine)) {
+                        out.println("bye");
+                        break;
+                    }
+                    out.println(inputLine);
+                }
+
+                in.close();
+                out.close();
+                clientSocket.close();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        EchoMultiServer server = new EchoMultiServer();
+        server.start(5555);
+    }
+
+}

core-java/src/main/java/com/baeldung/socket/EchoServer.java

@@ -0,0 +1,49 @@
+package com.baeldung.socket;
+
+import java.net.*;
+import java.io.*;
+
+public class EchoServer {
+    private ServerSocket serverSocket;
+    private Socket clientSocket;
+    private PrintWriter out;
+    private BufferedReader in;
+
+    public void start(int port) {
+        try {
+            serverSocket = new ServerSocket(port);
+            clientSocket = serverSocket.accept();
+            out = new PrintWriter(clientSocket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+            String inputLine;
+            while ((inputLine = in.readLine()) != null) {
+                if (".".equals(inputLine)) {
+                    out.println("good bye");
+                    break;
+                }
+                out.println(inputLine);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public void stop() {
+        try {
+            in.close();
+            out.close();
+            clientSocket.close();
+            serverSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public static void main(String[] args) {
+        EchoServer server = new EchoServer();
+        server.start(4444);
+    }
+
+}

core-java/src/main/java/com/baeldung/socket/GreetClient.java

@@ -0,0 +1,44 @@
+package com.baeldung.socket;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.Socket;
+
+public class GreetClient {
+    private Socket clientSocket;
+    private PrintWriter out;
+    private BufferedReader in;
+
+    public void startConnection(String ip, int port) {
+        try {
+            clientSocket = new Socket(ip, port);
+            out = new PrintWriter(clientSocket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+        } catch (IOException e) {
+
+        }
+
+    }
+
+    public String sendMessage(String msg) {
+        try {
+            out.println(msg);
+            return in.readLine();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public void stopConnection() {
+        try {
+            in.close();
+            out.close();
+            clientSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

core-java/src/main/java/com/baeldung/socket/GreetServer.java

@@ -0,0 +1,46 @@
+package com.baeldung.socket;
+
+import java.net.*;
+import java.io.*;
+
+public class GreetServer {
+    private ServerSocket serverSocket;
+    private Socket clientSocket;
+    private PrintWriter out;
+    private BufferedReader in;
+
+    public void start(int port) {
+        try {
+            serverSocket = new ServerSocket(port);
+            clientSocket = serverSocket.accept();
+            out = new PrintWriter(clientSocket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+            String greeting = in.readLine();
+            if ("hello server".equals(greeting))
+                out.println("hello client");
+            else
+                out.println("unrecognised greeting");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public void stop() {
+        try {
+            in.close();
+            out.close();
+            clientSocket.close();
+            serverSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public static void main(String[] args) {
+        GreetServer server = new GreetServer();
+        server.start(6666);
+    }
+
+}

core-java/src/main/java/com/baeldung/streamApi/Product.java

@@ -44,7 +44,6 @@ public class Product {
         this.name = name;
     }
 
-
     public static Stream<String> streamOf(List<String> list) {
         return (list == null || list.isEmpty()) ? Stream.empty() : list.stream();
     }

core-java/src/main/java/com/baeldung/threadpool/CountingTask.java

@@ -14,9 +14,7 @@ public class CountingTask extends RecursiveTask<Integer> {
 
     @Override
     protected Integer compute() {
-        return node.value + node.children.stream()
+        return node.value + node.children.stream().map(childNode -> new CountingTask(childNode).fork()).collect(Collectors.summingInt(ForkJoinTask::join));
-                .map(childNode -> new CountingTask(childNode).fork())
-                .collect(Collectors.summingInt(ForkJoinTask::join));
     }
 
 }

core-java/src/main/java/org/baeldung/equalshashcode/entities/ComplexClass.java

@@ -1,7 +1,5 @@
 package org.baeldung.equalshashcode.entities;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -10,7 +8,7 @@ public class ComplexClass {
     private List<?> genericList;
     private Set<Integer> integerSet;
 
-    public ComplexClass(ArrayList<?> genericArrayList, HashSet<Integer> integerHashSet) {
+    public ComplexClass(List<?> genericArrayList, Set<Integer> integerHashSet) {
         super();
         this.genericList = genericArrayList;
         this.integerSet = integerHashSet;

core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java

@@ -4,8 +4,8 @@ import javax.swing.JOptionPane;
 
 public class ExecutableMavenJar {
 
-	public static void main(String[] args) {
+    public static void main(String[] args) {
-		JOptionPane.showMessageDialog(null, "It worked!", "Executable Jar with Maven", 1);
+        JOptionPane.showMessageDialog(null, "It worked!", "Executable Jar with Maven", 1);
-	}
+    }
 
 }

core-java/src/main/resources/targetFile.tmp

@@ -0,0 +1,2 @@
+line 1
+a second line

core-java/src/test/java/com/baeldung/CharToStringUnitTest.java

@@ -4,10 +4,10 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CharToStringTest {
+public class CharToStringUnitTest {
 
     @Test
-    public void givenChar_whenCallingStringValueOf_shouldConvertToString(){
+    public void givenChar_whenCallingStringValueOf_shouldConvertToString() {
         final char givenChar = 'x';
 
         final String result = String.valueOf(givenChar);
@@ -16,7 +16,7 @@ public class CharToStringTest {
     }
 
     @Test
-    public void givenChar_whenCallingToStringOnCharacter_shouldConvertToString(){
+    public void givenChar_whenCallingToStringOnCharacter_shouldConvertToString() {
         final char givenChar = 'x';
 
         final String result = Character.toString(givenChar);
@@ -25,7 +25,7 @@ public class CharToStringTest {
     }
 
     @Test
-    public void givenChar_whenCallingCharacterConstructor_shouldConvertToString3(){
+    public void givenChar_whenCallingCharacterConstructor_shouldConvertToString3() {
         final char givenChar = 'x';
 
         final String result = new Character(givenChar).toString();
@@ -34,7 +34,7 @@ public class CharToStringTest {
     }
 
     @Test
-    public void givenChar_whenConcatenated_shouldConvertToString4(){
+    public void givenChar_whenConcatenated_shouldConvertToString4() {
         final char givenChar = 'x';
 
         final String result = givenChar + "";
@@ -43,7 +43,7 @@ public class CharToStringTest {
     }
 
     @Test
-    public void givenChar_whenFormated_shouldConvertToString5(){
+    public void givenChar_whenFormated_shouldConvertToString5() {
         final char givenChar = 'x';
 
         final String result = String.format("%c", givenChar);

core-java/src/test/java/com/baeldung/RandomListElementUnitTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
-public class RandomListElementTest {
+public class RandomListElementUnitTest {
 
     @Test
     public void givenList_whenRandomIndexChosen_shouldReturnARandomElementUsingRandom() {
@@ -20,7 +20,7 @@ public class RandomListElementTest {
     public void givenList_whenRandomIndexChosen_shouldReturnARandomElementUsingMathRandom() {
         List<Integer> givenList = Lists.newArrayList(1, 2, 3);
 
-        givenList.get((int)(Math.random() * givenList.size()));
+        givenList.get((int) (Math.random() * givenList.size()));
     }
 
     @Test

core-java/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java

@@ -1,11 +1,12 @@
 package com.baeldung;
 
-import com.google.common.primitives.Ints;
-import org.junit.Test;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class StringToIntOrIntegerTest {
+import org.junit.Test;
+
+import com.google.common.primitives.Ints;
+
+public class StringToIntOrIntegerUnitTest {
 
     @Test
     public void givenString_whenParsingInt_shouldConvertToInt() {
@@ -16,7 +17,6 @@ public class StringToIntOrIntegerTest {
         assertThat(result).isEqualTo(42);
     }
 
-
     @Test
     public void givenString_whenCallingIntegerValueOf_shouldConvertToInt() {
         String givenString = "42";

core-java/src/test/java/com/baeldung/collectors/Java8CollectorsUnitTest.java

@@ -36,198 +36,143 @@ import static java.util.stream.Collectors.toSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class Java8CollectorsTest {
+public class Java8CollectorsUnitTest {
 
     private final List<String> givenList = Arrays.asList("a", "bb", "ccc", "dd");
 
     @Test
     public void whenCollectingToList_shouldCollectToList() throws Exception {
-        final List<String> result = givenList.stream()
+        final List<String> result = givenList.stream().collect(toList());
-          .collect(toList());
 
-        assertThat(result)
+        assertThat(result).containsAll(givenList);
-          .containsAll(givenList);
     }
 
     @Test
     public void whenCollectingToList_shouldCollectToSet() throws Exception {
-        final Set<String> result = givenList.stream()
+        final Set<String> result = givenList.stream().collect(toSet());
-          .collect(toSet());
 
-        assertThat(result)
+        assertThat(result).containsAll(givenList);
-          .containsAll(givenList);
     }
 
     @Test
     public void whenCollectingToCollection_shouldCollectToCollection() throws Exception {
-        final List<String> result = givenList.stream()
+        final List<String> result = givenList.stream().collect(toCollection(LinkedList::new));
-          .collect(toCollection(LinkedList::new));
 
-        assertThat(result)
+        assertThat(result).containsAll(givenList).isInstanceOf(LinkedList.class);
-          .containsAll(givenList)
-          .isInstanceOf(LinkedList.class);
     }
 
     @Test
     public void whenCollectingToImmutableCollection_shouldThrowException() throws Exception {
         assertThatThrownBy(() -> {
-            givenList.stream()
+            givenList.stream().collect(toCollection(ImmutableList::of));
-              .collect(toCollection(ImmutableList::of));
         }).isInstanceOf(UnsupportedOperationException.class);
 
     }
 
     @Test
     public void whenCollectingToMap_shouldCollectToMap() throws Exception {
-        final Map<String, Integer> result = givenList.stream()
+        final Map<String, Integer> result = givenList.stream().collect(toMap(Function.identity(), String::length));
-          .collect(toMap(Function.identity(), String::length));
 
-        assertThat(result)
+        assertThat(result).containsEntry("a", 1).containsEntry("bb", 2).containsEntry("ccc", 3).containsEntry("dd", 2);
-          .containsEntry("a", 1)
-          .containsEntry("bb", 2)
-          .containsEntry("ccc", 3)
-          .containsEntry("dd", 2);
     }
 
     @Test
     public void whenCollectingToMap_shouldCollectToMapMerging() throws Exception {
-        final Map<String, Integer> result = givenList.stream()
+        final Map<String, Integer> result = givenList.stream().collect(toMap(Function.identity(), String::length, (i1, i2) -> i1));
-          .collect(toMap(Function.identity(), String::length, (i1, i2) -> i1));
 
-        assertThat(result)
+        assertThat(result).containsEntry("a", 1).containsEntry("bb", 2).containsEntry("ccc", 3).containsEntry("dd", 2);
-          .containsEntry("a", 1)
-          .containsEntry("bb", 2)
-          .containsEntry("ccc", 3)
-          .containsEntry("dd", 2);
     }
 
     @Test
     public void whenCollectingAndThen_shouldCollect() throws Exception {
-        final List<String> result = givenList.stream()
+        final List<String> result = givenList.stream().collect(collectingAndThen(toList(), ImmutableList::copyOf));
-          .collect(collectingAndThen(toList(), ImmutableList::copyOf));
 
-        assertThat(result)
+        assertThat(result).containsAll(givenList).isInstanceOf(ImmutableList.class);
-          .containsAll(givenList)
-          .isInstanceOf(ImmutableList.class);
     }
 
     @Test
     public void whenJoining_shouldJoin() throws Exception {
-        final String result = givenList.stream()
+        final String result = givenList.stream().collect(joining());
-          .collect(joining());
 
-        assertThat(result)
+        assertThat(result).isEqualTo("abbcccdd");
-          .isEqualTo("abbcccdd");
     }
 
     @Test
     public void whenJoiningWithSeparator_shouldJoinWithSeparator() throws Exception {
-        final String result = givenList.stream()
+        final String result = givenList.stream().collect(joining(" "));
-          .collect(joining(" "));
 
-        assertThat(result)
+        assertThat(result).isEqualTo("a bb ccc dd");
-          .isEqualTo("a bb ccc dd");
     }
 
     @Test
     public void whenJoiningWithSeparatorAndPrefixAndPostfix_shouldJoinWithSeparatorPrePost() throws Exception {
-        final String result = givenList.stream()
+        final String result = givenList.stream().collect(joining(" ", "PRE-", "-POST"));
-          .collect(joining(" ", "PRE-", "-POST"));
 
-        assertThat(result)
+        assertThat(result).isEqualTo("PRE-a bb ccc dd-POST");
-          .isEqualTo("PRE-a bb ccc dd-POST");
     }
 
     @Test
     public void whenPartitioningBy_shouldPartition() throws Exception {
-        final Map<Boolean, List<String>> result = givenList.stream()
+        final Map<Boolean, List<String>> result = givenList.stream().collect(partitioningBy(s -> s.length() > 2));
-          .collect(partitioningBy(s -> s.length() > 2));
 
-        assertThat(result)
+        assertThat(result).containsKeys(true, false).satisfies(booleanListMap -> {
-          .containsKeys(true, false)
+            assertThat(booleanListMap.get(true)).contains("ccc");
-          .satisfies(booleanListMap -> {
-              assertThat(booleanListMap.get(true))
-                .contains("ccc");
 
-              assertThat(booleanListMap.get(false))
+            assertThat(booleanListMap.get(false)).contains("a", "bb", "dd");
-                .contains("a", "bb", "dd");
+        });
-          });
     }
 
     @Test
     public void whenCounting_shouldCount() throws Exception {
-        final Long result = givenList.stream()
+        final Long result = givenList.stream().collect(counting());
-          .collect(counting());
 
-        assertThat(result)
+        assertThat(result).isEqualTo(4);
-          .isEqualTo(4);
     }
 
     @Test
     public void whenSummarizing_shouldSummarize() throws Exception {
-        final DoubleSummaryStatistics result = givenList.stream()
+        final DoubleSummaryStatistics result = givenList.stream().collect(summarizingDouble(String::length));
-          .collect(summarizingDouble(String::length));
 
-        assertThat(result.getAverage())
+        assertThat(result.getAverage()).isEqualTo(2);
-          .isEqualTo(2);
+        assertThat(result.getCount()).isEqualTo(4);
-        assertThat(result.getCount())
+        assertThat(result.getMax()).isEqualTo(3);
-          .isEqualTo(4);
+        assertThat(result.getMin()).isEqualTo(1);
-        assertThat(result.getMax())
+        assertThat(result.getSum()).isEqualTo(8);
-          .isEqualTo(3);
-        assertThat(result.getMin())
-          .isEqualTo(1);
-        assertThat(result.getSum())
-          .isEqualTo(8);
     }
 
     @Test
     public void whenAveraging_shouldAverage() throws Exception {
-        final Double result = givenList.stream()
+        final Double result = givenList.stream().collect(averagingDouble(String::length));
-          .collect(averagingDouble(String::length));
 
-        assertThat(result)
+        assertThat(result).isEqualTo(2);
-          .isEqualTo(2);
     }
 
     @Test
     public void whenSumming_shouldSum() throws Exception {
-        final Double result = givenList.stream()
+        final Double result = givenList.stream().collect(summingDouble(String::length));
-          .collect(summingDouble(String::length));
 
-        assertThat(result)
+        assertThat(result).isEqualTo(8);
-          .isEqualTo(8);
     }
 
     @Test
     public void whenMaxingBy_shouldMaxBy() throws Exception {
-        final Optional<String> result = givenList.stream()
+        final Optional<String> result = givenList.stream().collect(maxBy(Comparator.naturalOrder()));
-          .collect(maxBy(Comparator.naturalOrder()));
 
-        assertThat(result)
+        assertThat(result).isPresent().hasValue("dd");
-          .isPresent()
-          .hasValue("dd");
     }
 
     @Test
     public void whenGroupingBy_shouldGroupBy() throws Exception {
-        final Map<Integer, Set<String>> result = givenList.stream()
+        final Map<Integer, Set<String>> result = givenList.stream().collect(groupingBy(String::length, toSet()));
-          .collect(groupingBy(String::length, toSet()));
 
-        assertThat(result)
+        assertThat(result).containsEntry(1, newHashSet("a")).containsEntry(2, newHashSet("bb", "dd")).containsEntry(3, newHashSet("ccc"));
-          .containsEntry(1, newHashSet("a"))
-          .containsEntry(2, newHashSet("bb", "dd"))
-          .containsEntry(3, newHashSet("ccc"));
     }
 
-
     @Test
     public void whenCreatingCustomCollector_shouldCollect() throws Exception {
-        final ImmutableSet<String> result = givenList.stream()
+        final ImmutableSet<String> result = givenList.stream().collect(toImmutableSet());
-          .collect(toImmutableSet());
 
-        assertThat(result)
+        assertThat(result).isInstanceOf(ImmutableSet.class).contains("a", "bb", "ccc", "dd");
-          .isInstanceOf(ImmutableSet.class)
-          .contains("a", "bb", "ccc", "dd");
 
     }
 

core-java/src/test/java/com/baeldung/completablefuture/CompletableFutureUnitTest.java

@@ -1,24 +1,26 @@
 package com.baeldung.completablefuture;
 
-import java.util.concurrent.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+public class CompletableFutureUnitTest {
-import static org.junit.Assert.assertTrue;
-
-public class CompletableFutureTest {
 
     @Test
     public void whenRunningCompletableFutureAsynchronously_thenGetMethodWaitsForResult() throws InterruptedException, ExecutionException {
-
         Future<String> completableFuture = calculateAsync();
 
         String result = completableFuture.get();
         assertEquals("Hello", result);
-
     }
 
     public Future<String> calculateAsync() throws InterruptedException {
@@ -35,15 +37,12 @@ public class CompletableFutureTest {
 
     @Test
     public void whenRunningCompletableFutureWithResult_thenGetMethodReturnsImmediately() throws InterruptedException, ExecutionException {
-
         Future<String> completableFuture = CompletableFuture.completedFuture("Hello");
 
         String result = completableFuture.get();
         assertEquals("Hello", result);
-
     }
 
-
     public Future<String> calculateAsyncWithCancellation() throws InterruptedException {
         CompletableFuture<String> completableFuture = new CompletableFuture<>();
 
@@ -56,90 +55,67 @@ public class CompletableFutureTest {
         return completableFuture;
     }
 
-
     @Test(expected = CancellationException.class)
     public void whenCancelingTheFuture_thenThrowsCancellationException() throws ExecutionException, InterruptedException {
-
         Future<String> future = calculateAsyncWithCancellation();
         future.get();
-
     }
 
     @Test
     public void whenCreatingCompletableFutureWithSupplyAsync_thenFutureReturnsValue() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> "Hello");
 
         assertEquals("Hello", future.get());
-
     }
 
     @Test
     public void whenAddingThenAcceptToFuture_thenFunctionExecutesAfterComputationIsFinished() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello");
 
         CompletableFuture<Void> future = completableFuture.thenAccept(s -> System.out.println("Computation returned: " + s));
 
         future.get();
-
     }
 
     @Test
     public void whenAddingThenRunToFuture_thenFunctionExecutesAfterComputationIsFinished() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello");
 
         CompletableFuture<Void> future = completableFuture.thenRun(() -> System.out.println("Computation finished."));
 
         future.get();
-
     }
 
     @Test
     public void whenAddingThenApplyToFuture_thenFunctionExecutesAfterComputationIsFinished() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello");
 
         CompletableFuture<String> future = completableFuture.thenApply(s -> s + " World");
 
         assertEquals("Hello World", future.get());
-
     }
 
     @Test
     public void whenUsingThenCompose_thenFuturesExecuteSequentially() throws ExecutionException, InterruptedException {
-
+        CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello").thenCompose(s -> CompletableFuture.supplyAsync(() -> s + " World"));
-        CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello")
-                .thenCompose(s -> CompletableFuture.supplyAsync(() -> s + " World"));
 
         assertEquals("Hello World", completableFuture.get());
-
     }
 
     @Test
     public void whenUsingThenCombine_thenWaitForExecutionOfBothFutures() throws ExecutionException, InterruptedException {
-
+        CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello").thenCombine(CompletableFuture.supplyAsync(() -> " World"), (s1, s2) -> s1 + s2);
-        CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello")
-                .thenCombine(CompletableFuture.supplyAsync(() -> " World"),
-                        (s1, s2) -> s1 + s2);
 
         assertEquals("Hello World", completableFuture.get());
-
     }
 
     @Test
     public void whenUsingThenAcceptBoth_thenWaitForExecutionOfBothFutures() throws ExecutionException, InterruptedException {
-
+        CompletableFuture.supplyAsync(() -> "Hello").thenAcceptBoth(CompletableFuture.supplyAsync(() -> " World"), (s1, s2) -> System.out.println(s1 + s2));
-        CompletableFuture.supplyAsync(() -> "Hello")
-                .thenAcceptBoth(CompletableFuture.supplyAsync(() -> " World"),
-                        (s1, s2) -> System.out.println(s1 + s2));
-
     }
 
     @Test
     public void whenFutureCombinedWithAllOfCompletes_thenAllFuturesAreDone() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> future1 = CompletableFuture.supplyAsync(() -> "Hello");
         CompletableFuture<String> future2 = CompletableFuture.supplyAsync(() -> "Beautiful");
         CompletableFuture<String> future3 = CompletableFuture.supplyAsync(() -> "World");
@@ -154,17 +130,13 @@ public class CompletableFutureTest {
         assertTrue(future2.isDone());
         assertTrue(future3.isDone());
 
-        String combined = Stream.of(future1, future2, future3)
+        String combined = Stream.of(future1, future2, future3).map(CompletableFuture::join).collect(Collectors.joining(" "));
-                .map(CompletableFuture::join)
-                .collect(Collectors.joining(" "));
 
         assertEquals("Hello Beautiful World", combined);
-
     }
 
     @Test
     public void whenFutureThrows_thenHandleMethodReceivesException() throws ExecutionException, InterruptedException {
-
         String name = null;
 
         // ...
@@ -177,12 +149,10 @@ public class CompletableFutureTest {
         }).handle((s, t) -> s != null ? s : "Hello, Stranger!");
 
         assertEquals("Hello, Stranger!", completableFuture.get());
-
     }
 
     @Test(expected = ExecutionException.class)
     public void whenCompletingFutureExceptionally_thenGetMethodThrows() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> completableFuture = new CompletableFuture<>();
 
         // ...
@@ -192,18 +162,15 @@ public class CompletableFutureTest {
         // ...
 
         completableFuture.get();
-
     }
 
     @Test
     public void whenAddingThenApplyAsyncToFuture_thenFunctionExecutesAfterComputationIsFinished() throws ExecutionException, InterruptedException {
-
         CompletableFuture<String> completableFuture = CompletableFuture.supplyAsync(() -> "Hello");
 
         CompletableFuture<String> future = completableFuture.thenApplyAsync(s -> s + " World");
 
         assertEquals("Hello World", future.get());
-
     }
 
 }