fix conflicts

core-java/pom.xml

@@ -162,6 +162,12 @@
             <version>${avaitility.version}</version>
             <scope>test</scope>
         </dependency>
+		<dependency>
+		    <groupId>org.springframework</groupId>
+		    <artifactId>spring-core</artifactId>
+		    <version>${spring-core.version}</version>
+		    <scope>test</scope>
+		</dependency>
 
         <dependency>
             <groupId>commons-codec</groupId>
@@ -186,6 +192,16 @@
             <artifactId>fscontext</artifactId>
             <version>${fscontext.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.codepoetics</groupId>
+            <artifactId>protonpack</artifactId>
+            <version>${protonpack.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>one.util</groupId>
+            <artifactId>streamex</artifactId>
+            <version>${streamex.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -408,12 +424,16 @@
         <grep4j.version>1.8.7</grep4j.version>
         <lombok.version>1.16.12</lombok.version>
         <fscontext.version>4.6-b01</fscontext.version>
+        <protonpack.version>1.13</protonpack.version>
+        <streamex.version>0.6.5</streamex.version>
+
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.12</junit.version>
         <mockito.version>2.8.9</mockito.version>
         <assertj.version>3.6.1</assertj.version>
         <avaitility.version>1.7.0</avaitility.version>
+        <spring-core.version>4.3.10.RELEASE</spring-core.version>
 
 
         <!-- maven plugins -->

core-java/src/main/java/com/baeldung/designpatterns/adapter/AdapterPatternDriver.java

@@ -5,9 +5,16 @@ import static com.baeldung.designpatterns.util.LogerUtil.LOG;
 public class AdapterPatternDriver {
     
     public static void main(String args[]) {
-        LuxuryCarsSpeedAdapter luxuryCars = new LuxuryCarsSpeedAdapterImpl();
-        LOG.info("Bugatti Veyron Super Sport's top speed is " + luxuryCars.bugattiVeyronInKMPH() + " Kmph.");
-        LOG.info("McLaren F1 top speed is " + luxuryCars.mcLarenInKMPH() + " Kmph.");
-        LOG.info("Aston Martin One-77 top speed is " + luxuryCars.astonMartinInKMPH() + " Kmph.");
+        LuxuryCars bugattiVeyron = new BugattiVeyron();
+        LuxuryCarsAdapter bugattiVeyronAdapter = new LuxuryCarsAdapterImpl(bugattiVeyron);
+        LOG.info("Bugatti Veyron Super Sport's top speed is " + bugattiVeyronAdapter.speedInKMPH() + " Kmph.");
+
+        LuxuryCars mcLaren = new McLaren();
+        LuxuryCarsAdapter mcLarenAdapter = new LuxuryCarsAdapterImpl(mcLaren);
+        LOG.info("McLaren F1 top speed is " + mcLarenAdapter.speedInKMPH() + " Kmph.");
+
+        LuxuryCars astonMartin = new AstonMartin();
+        LuxuryCarsAdapter astonMartinAdapter = new LuxuryCarsAdapterImpl(astonMartin);
+        LOG.info("McLaren F1 top speed is " + astonMartinAdapter.speedInKMPH() + " Kmph.");
     }
 }

core-java/src/main/java/com/baeldung/designpatterns/adapter/AstonMartin.java

@@ -0,0 +1,8 @@
+package com.baeldung.designpatterns.adapter;
+
+public class AstonMartin implements LuxuryCars {
+    @Override
+    public double speedInMPH() {
+        return 220;
+    }
+}

core-java/src/main/java/com/baeldung/designpatterns/adapter/BugattiVeyron.java

@@ -0,0 +1,8 @@
+package com.baeldung.designpatterns.adapter;
+
+public class BugattiVeyron implements LuxuryCars {
+    @Override
+    public double speedInMPH() {
+        return 268;
+    }
+}

core-java/src/main/java/com/baeldung/designpatterns/adapter/LuxuryCars.java

@@ -0,0 +1,5 @@
+package com.baeldung.designpatterns.adapter;
+
+public interface LuxuryCars {
+    public double speedInMPH();
+}

core-java/src/main/java/com/baeldung/designpatterns/adapter/LuxuryCarsAdapter.java

@@ -0,0 +1,5 @@
+package com.baeldung.designpatterns.adapter;
+
+public interface LuxuryCarsAdapter {
+    public double speedInKMPH();
+}

core-java/src/main/java/com/baeldung/designpatterns/adapter/LuxuryCarsAdapterImpl.java

@@ -0,0 +1,19 @@
+package com.baeldung.designpatterns.adapter;
+
+public class LuxuryCarsAdapterImpl implements LuxuryCarsAdapter {
+    private LuxuryCars luxuryCars;
+    
+    public LuxuryCarsAdapterImpl(LuxuryCars luxuryCars) {
+        this.luxuryCars = luxuryCars;
+    }
+
+    @Override
+    public double speedInKMPH() {
+        double mph = luxuryCars.speedInMPH();
+        return convertMPHtoKMPH(mph);
+    }
+    
+    private double convertMPHtoKMPH(double mph) {
+        return mph * 1.60934;
+    }
+}

core-java/src/main/java/com/baeldung/designpatterns/adapter/LuxuryCarsSpeed.java

@@ -1,15 +0,0 @@
-package com.baeldung.designpatterns.adapter;
-
-public class LuxuryCarsSpeed {
-    public double bugattiVeyronInMPH() {
-        return 268;
-    }
-
-    public double mcLarenInMPH() {
-        return 241;
-    }
-
-    public double astonMartinInMPH() {
-        return 220;
-    }
-}

core-java/src/main/java/com/baeldung/designpatterns/adapter/LuxuryCarsSpeedAdapter.java

@@ -1,9 +0,0 @@
-package com.baeldung.designpatterns.adapter;
-
-public interface LuxuryCarsSpeedAdapter {
-    public double bugattiVeyronInKMPH();
-
-    public double mcLarenInKMPH();
-
-    public double astonMartinInKMPH();
-}

core-java/src/main/java/com/baeldung/designpatterns/adapter/LuxuryCarsSpeedAdapterImpl.java

@@ -1,26 +0,0 @@
-package com.baeldung.designpatterns.adapter;
-
-public class LuxuryCarsSpeedAdapterImpl extends LuxuryCarsSpeed implements LuxuryCarsSpeedAdapter {
-
-    @Override
-    public double bugattiVeyronInKMPH() {
-        double mph = super.bugattiVeyronInMPH();
-        return convertMPHtoKMPH(mph);
-    }
-
-    @Override
-    public double mcLarenInKMPH() {
-        double mph = super.mcLarenInMPH();
-        return convertMPHtoKMPH(mph);
-    }
-
-    @Override
-    public double astonMartinInKMPH() {
-        double mph = super.astonMartinInMPH();
-        return convertMPHtoKMPH(mph);
-    }
-
-    private double convertMPHtoKMPH(double mph) {
-        return mph * 1.60934;
-    }
-}

core-java/src/main/java/com/baeldung/designpatterns/adapter/McLaren.java

@@ -0,0 +1,8 @@
+package com.baeldung.designpatterns.adapter;
+
+public class McLaren implements LuxuryCars {
+    @Override
+    public double speedInMPH() {
+        return 241;
+    }
+}

core-java/src/main/java/com/baeldung/stream/StreamIndices.java

@@ -0,0 +1,37 @@
+package com.baeldung.stream;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import com.codepoetics.protonpack.Indexed;
+import com.codepoetics.protonpack.StreamUtils;
+
+public class StreamIndices {
+
+    public static List<String> getEvenIndexedStrings(String[] names) {
+        List<String> evenIndexedNames = IntStream.range(0, names.length)
+          .filter(i -> i % 2 == 0).mapToObj(i -> names[i])
+          .collect(Collectors.toList());
+        return evenIndexedNames;
+    }
+
+    public static List<Indexed<String>> getEvenIndexedStrings(List<String> names) {
+        List<Indexed<String>> list = StreamUtils.zipWithIndex(names.stream())
+          .filter(i -> i.getIndex() % 2 == 0).collect(Collectors.toList());
+        return list;
+    }
+
+    public static List<Indexed<String>> getOddIndexedStrings(List<String> names) {
+        List<Indexed<String>> list = StreamUtils.zipWithIndex(names.stream())
+          .filter(i -> i.getIndex() % 2 == 1).collect(Collectors.toList());
+        return list;
+    }
+
+    public static List<String> getOddIndexedStrings(String[] names) {
+        List<String> oddIndexedNames = IntStream.range(0, names.length)
+          .filter(i -> i % 2 == 1).mapToObj(i -> names[i])
+          .collect(Collectors.toList());
+        return oddIndexedNames;
+    }
+}

core-java/src/test/java/com/baeldung/designpatterns/AdapterPatternIntegrationTest.java

@@ -1,20 +1,20 @@
 package com.baeldung.designpatterns;
 
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.baeldung.designpatterns.adapter.LuxuryCarsSpeedAdapter;
-import com.baeldung.designpatterns.adapter.LuxuryCarsSpeedAdapterImpl;
+import com.baeldung.designpatterns.adapter.AstonMartin;
+import com.baeldung.designpatterns.adapter.BugattiVeyron;
+import com.baeldung.designpatterns.adapter.LuxuryCarsAdapterImpl;
+import com.baeldung.designpatterns.adapter.McLaren;
 
 public class AdapterPatternIntegrationTest {
     @Test
     public void givenLuxuryCarsAdapter_WhenConvertingMPHToKMPH_thenSuccessfullyConverted() {
-        LuxuryCarsSpeedAdapter luxuryCars = new LuxuryCarsSpeedAdapterImpl();
-        assertEquals(luxuryCars.bugattiVeyronInKMPH(), 431.30312, 0.00001);
-        assertEquals(luxuryCars.mcLarenInKMPH(), 387.85094, 0.00001);
-        assertEquals(luxuryCars.astonMartinInKMPH(), 354.0548, 0.00001);
+        assertEquals(new LuxuryCarsAdapterImpl(new BugattiVeyron()).speedInKMPH(), 431.30312, 0.00001);
+        assertEquals(new LuxuryCarsAdapterImpl(new McLaren()).speedInKMPH(), 387.85094, 0.00001);
+        assertEquals(new LuxuryCarsAdapterImpl(new AstonMartin()).speedInKMPH(), 354.0548, 0.00001);
     }
 }
 

core-java/src/test/java/com/baeldung/stream/StreamIndicesTest.java

@@ -0,0 +1,50 @@
+package com.baeldung.stream;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.codepoetics.protonpack.Indexed;
+
+public class StreamIndicesTest {
+
+    @Test
+    public void givenArray_whenGetIndexedStrings_thenReturnListOfEvenIndexedStrings() {
+        String[] names = { "Afrim", "Bashkim", "Besim", "Lulzim", "Durim", "Shpetim" };
+        List<String> expectedResult = Arrays.asList("Afrim", "Besim", "Durim");
+        List<String> actualResult = StreamIndices.getEvenIndexedStrings(names);
+
+        assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void givenArray_whenGetIndexedStrings_thenReturnListOfOddStrings() {
+        String[] names = { "Afrim", "Bashkim", "Besim", "Lulzim", "Durim", "Shpetim" };
+        List<String> expectedResult = Arrays.asList("Bashkim", "Lulzim", "Shpetim");
+        List<String> actualResult = StreamIndices.getOddIndexedStrings(names);
+
+        assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void givenList_whenGetIndexedStrings_thenReturnListOfEvenIndexedStrings() {
+        List<String> names = Arrays.asList("Afrim", "Bashkim", "Besim", "Lulzim", "Durim", "Shpetim");
+        List<Indexed<String>> expectedResult = Arrays.asList(Indexed.index(0, "Afrim"), Indexed.index(2, "Besim"), Indexed.index(4, "Durim"));
+        List<Indexed<String>> actualResult = StreamIndices.getEvenIndexedStrings(names);
+
+        assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void givenList_whenGetIndexedStrings_thenReturnListOfOddIndexedStrings() {
+        List<String> names = Arrays.asList("Afrim", "Bashkim", "Besim", "Lulzim", "Durim", "Shpetim");
+        List<Indexed<String>> expectedResult = Arrays.asList(Indexed.index(1, "Bashkim"), Indexed.index(3, "Lulzim"), Indexed.index(5, "Shpetim"));
+        List<Indexed<String>> actualResult = StreamIndices.getOddIndexedStrings(names);
+
+        assertEquals(expectedResult, actualResult);
+    }
+
+}

core-java/src/test/java/org/baeldung/java/io/JavaDirectoryDeleteUnitTest.java

@@ -0,0 +1,143 @@
+package org.baeldung.java.io;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.util.FileSystemUtils;
+
+public class JavaDirectoryDeleteUnitTest {
+    private static Path TEMP_DIRECTORY;
+    private static final String DIRECTORY_NAME = "toBeDeleted";
+
+    public static final List<String> ALL_LINES = Arrays.asList(new String[] { "This is line 1", "This is line 2", "This is line 3", "This is line 4", "This is line 5", "This is line 6" });
+
+    @BeforeClass
+    public static void initializeTempDirectory() throws IOException {
+        TEMP_DIRECTORY = Files.createTempDirectory("tmpForJUnit");
+    }
+
+    @AfterClass
+    public static void cleanTempDirectory() throws IOException {
+        FileUtils.deleteDirectory(TEMP_DIRECTORY.toFile());
+    }
+
+    @Before
+    public void setupDirectory() throws IOException {
+        Path tempPathForEachTest = Files.createDirectory(TEMP_DIRECTORY.resolve(DIRECTORY_NAME));
+
+        // Create a directory structure
+        Files.write(tempPathForEachTest.resolve("file1.txt"), ALL_LINES.subList(0, 2));
+        Files.write(tempPathForEachTest.resolve("file2.txt"), ALL_LINES.subList(2, 4));
+
+        Files.createDirectories(tempPathForEachTest.resolve("Empty"));
+
+        Path aSubDir = Files.createDirectories(tempPathForEachTest.resolve("notEmpty"));
+        Files.write(aSubDir.resolve("file3.txt"), ALL_LINES.subList(3, 5));
+        Files.write(aSubDir.resolve("file4.txt"), ALL_LINES.subList(0, 3));
+
+        aSubDir = Files.createDirectories(aSubDir.resolve("anotherSubDirectory"));
+        Files.write(aSubDir.resolve("file5.txt"), ALL_LINES.subList(4, 5));
+        Files.write(aSubDir.resolve("file6.txt"), ALL_LINES.subList(0, 2));
+    }
+
+    @After
+    public void checkAndCleanupIfRequired() throws IOException {
+        Path pathToBeDeleted = TEMP_DIRECTORY.resolve(DIRECTORY_NAME);
+        if (Files.exists(pathToBeDeleted)) {
+            FileUtils.deleteDirectory(pathToBeDeleted.toFile());
+        }
+    }
+
+    boolean deleteDirectory(File directoryToBeDeleted) {
+        File[] allContents = directoryToBeDeleted.listFiles();
+
+        for (File file : allContents) {
+            if (file.isDirectory()) {
+                deleteDirectory(file);
+            } else {
+                file.delete();
+            }
+        }
+
+        return directoryToBeDeleted.delete();
+    }
+
+    @Test
+    public void givenDirectory_whenDeletedWithRecursion_thenIsGone() throws IOException {
+        Path pathToBeDeleted = TEMP_DIRECTORY.resolve(DIRECTORY_NAME);
+
+        boolean result = deleteDirectory(pathToBeDeleted.toFile());
+
+        assertTrue("Could not delete directory", result);
+        assertFalse("Directory still exists", Files.exists(pathToBeDeleted));
+    }
+
+    @Test
+    public void givenDirectory_whenDeletedWithCommonsIOFileUtils_thenIsGone() throws IOException {
+        Path pathToBeDeleted = TEMP_DIRECTORY.resolve(DIRECTORY_NAME);
+
+        FileUtils.deleteDirectory(pathToBeDeleted.toFile());
+
+        assertFalse("Directory still exists", Files.exists(pathToBeDeleted));
+    }
+
+    @Test
+    public void givenDirectory_whenDeletedWithSpringFileSystemUtils_thenIsGone() throws IOException {
+        Path pathToBeDeleted = TEMP_DIRECTORY.resolve(DIRECTORY_NAME);
+
+        boolean result = FileSystemUtils.deleteRecursively(pathToBeDeleted.toFile());
+
+        assertTrue("Could not delete directory", result);
+        assertFalse("Directory still exists", Files.exists(pathToBeDeleted));
+    }
+
+    @Test
+    public void givenDirectory_whenDeletedWithFilesWalk_thenIsGone() throws IOException {
+        Path pathToBeDeleted = TEMP_DIRECTORY.resolve(DIRECTORY_NAME);
+
+        Files.walk(pathToBeDeleted)
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+
+        assertFalse("Directory still exists", Files.exists(pathToBeDeleted));
+    }
+
+    @Test
+    public void givenDirectory_whenDeletedWithNIO2WalkFileTree_thenIsGone() throws IOException {
+        Path pathToBeDeleted = TEMP_DIRECTORY.resolve(DIRECTORY_NAME);
+
+        Files.walkFileTree(pathToBeDeleted, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                Files.delete(dir);
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.delete(file);
+                return FileVisitResult.CONTINUE;
+            }
+        });
+
+        assertFalse("Directory still exists", Files.exists(pathToBeDeleted));
+    }
+}