Merge remote-tracking branch 'upstream/master' into tutorials/binaryTreeJava

core-java/src/main/java/com/baeldung/array/ArrayInverter.java

@@ -0,0 +1,41 @@
+package com.baeldung.array;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import com.google.common.collect.Lists;
+
+public class ArrayInverter {
+
+    public void invertUsingFor(Object[] array) {
+        for (int i = 0; i < array.length / 2; i++) {
+            Object temp = array[i];
+            array[i] = array[array.length - 1 - i];
+            array[array.length - 1 - i] = temp;
+        }
+    }
+
+    public void invertUsingCollectionsReverse(Object[] array) {
+        List<Object> list = Arrays.asList(array);
+        Collections.reverse(list);
+    }
+
+    public Object[] invertUsingStreams(final Object[] array) {
+        return IntStream.range(1, array.length + 1).mapToObj(i -> array[array.length - i]).toArray();
+    }
+
+    public void invertUsingCommonsLang(Object[] array) {
+        ArrayUtils.reverse(array);
+    }
+
+    public Object[] invertUsingGuava(Object[] array) {
+        List<Object> list = Arrays.asList(array);
+        List<Object> reverted = Lists.reverse(list);
+        return reverted.toArray();
+    }
+
+}

core-java/src/main/java/com/baeldung/polymorphism/GenericFile.java

@@ -54,7 +54,7 @@ public class GenericFile {
     }
 
     public String getFileInfo() {
-        return "File Name: " + this.getName() + "\n" + "Extension: " + this.getExtension() + "\n" + "Date Created: " + this.getDateCreated() + "\n" + "Version: " + this.getVersion() + "\n";
+        return String.format("File Name: %s\n" + " Extension: %s\n" + " Date Created: %s\n" + " Version: %s\n", this.getName(), this.getExtension(), this.getDateCreated(), this.getVersion());
     }
 
     public Object read() {

core-java/src/main/java/com/baeldung/polymorphism/ImageFile.java

@@ -30,7 +30,7 @@ public class ImageFile extends GenericFile {
     }
 
     public String getFileInfo() {
-        return super.getFileInfo() + "Height: " + this.getHeight() + "\n" + "Width: " + this.getWidth();
+        return String.format(" %s Height: %d\n Width: %d", super.getFileInfo(), this.getHeight(), this.getWidth());
     }
 
     public String read() {

core-java/src/main/java/com/baeldung/polymorphism/TextFile.java

@@ -21,7 +21,7 @@ public class TextFile extends GenericFile {
     }
 
     public String getFileInfo() {
-        return super.getFileInfo() + "Word Count: " + wordCount;
+        return String.format(" %s Word Count: %d", super.getFileInfo(), wordCount);
     }
 
     public String read() {

core-java/src/main/resources/countries.properties

@@ -1,3 +1,3 @@
-UK
-US
-Germany
+UK
+US
+Germany

core-java/src/test/java/com/baeldung/array/ArrayInverterUnitTest.java

@@ -0,0 +1,49 @@
+package com.baeldung.array;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+public class ArrayInverterUnitTest {
+
+    private String[] fruits = { "apples", "tomatoes", "bananas", "guavas", "pineapples", "oranges" };
+
+    @Test
+    public void invertArrayWithForLoop() {
+        ArrayInverter inverter = new ArrayInverter();
+        inverter.invertUsingFor(fruits);
+
+        assertThat(new String[] { "oranges", "pineapples", "guavas", "bananas", "tomatoes", "apples" }).isEqualTo(fruits);
+    }
+
+    @Test
+    public void invertArrayWithCollectionsReverse() {
+        ArrayInverter inverter = new ArrayInverter();
+        inverter.invertUsingCollectionsReverse(fruits);
+
+        assertThat(new String[] { "oranges", "pineapples", "guavas", "bananas", "tomatoes", "apples" }).isEqualTo(fruits);
+    }
+
+    @Test
+    public void invertArrayWithStreams() {
+        ArrayInverter inverter = new ArrayInverter();
+
+        assertThat(new String[] { "oranges", "pineapples", "guavas", "bananas", "tomatoes", "apples" }).isEqualTo(inverter.invertUsingStreams(fruits));
+    }
+
+    @Test
+    public void invertArrayWithCommonsLang() {
+        ArrayInverter inverter = new ArrayInverter();
+        inverter.invertUsingCommonsLang(fruits);
+
+        assertThat(new String[] { "oranges", "pineapples", "guavas", "bananas", "tomatoes", "apples" }).isEqualTo(fruits);
+    }
+
+    @Test
+    public void invertArrayWithGuava() {
+        ArrayInverter inverter = new ArrayInverter();
+
+        assertThat(new String[] { "oranges", "pineapples", "guavas", "bananas", "tomatoes", "apples" }).isEqualTo(inverter.invertUsingGuava(fruits));
+    }
+
+}

core-java/src/test/java/com/baeldung/file/FilesTest.java

@@ -91,4 +91,4 @@ public class FilesTest {
             new FileInputStream(fileName)))
           .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain\n");
     }
-}
+}

core-java/src/test/java/com/baeldung/nestedclass/NewOuter.java

@@ -14,9 +14,9 @@ public class NewOuter {
         public void run() {
             System.out.println("a = " + a);
             System.out.println("b = " + b);
-            System.out.println("NewOuterTest.this.a = " + NewOuter.this.a);
-            System.out.println("NewOuterTest.b = " + NewOuter.b);
-            System.out.println("NewOuterTest.this.b = " + NewOuter.this.b);
+            System.out.println("NewOuter.this.a = " + NewOuter.this.a);
+            System.out.println("NewOuter.b = " + NewOuter.b);
+            System.out.println("NewOuter.this.b = " + NewOuter.this.b);
         }
     }
 

core-java/src/test/java/com/baeldung/polymorphism/PolymorphismUnitTest.java

@@ -3,8 +3,6 @@ package com.baeldung.polymorphism;
 import static org.junit.Assert.*;
 
 import java.awt.image.BufferedImage;
-
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class PolymorphismUnitTest {