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

core-java/README.md

@@ -121,4 +121,8 @@
 - [Copy a File with Java](http://www.baeldung.com/java-copy-file)
 - [Introduction to Creational Design Patterns](http://www.baeldung.com/creational-design-patterns)
 - [Quick Example - Comparator vs Comparable in Java](http://www.baeldung.com/java-comparator-comparable)
-
+- [Quick Guide to Java Stack](http://www.baeldung.com/java-stack)
+- [The Java continue and break Keywords](http://www.baeldung.com/java-continue-and-break)
+- [Java – Append Data to a File](http://www.baeldung.com/java-append-to-file)
+- [Introduction to the Java ArrayDeque](http://www.baeldung.com/java-array-deque)
+- [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter)

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

@@ -5,12 +5,12 @@ import org.openjdk.jmh.annotations.*;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
 public class SearchArrayTest {
 
     @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @Warmup(iterations = 5)
-    @OutputTimeUnit(TimeUnit.MICROSECONDS)
     public void searchArrayLoop() {
 
         int count = 1000;
@@ -21,9 +21,6 @@ public class SearchArrayTest {
     }
 
     @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @Warmup(iterations = 5)
-    @OutputTimeUnit(TimeUnit.MICROSECONDS)
     public void searchArrayAllocNewList() {
 
         int count = 1000;
@@ -35,9 +32,6 @@ public class SearchArrayTest {
     }
 
     @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @Warmup(iterations = 5)
-    @OutputTimeUnit(TimeUnit.MICROSECONDS)
     public void searchArrayAllocNewSet() {
 
         int count = 1000;
@@ -49,9 +43,6 @@ public class SearchArrayTest {
 
 
     @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @Warmup(iterations = 5)
-    @OutputTimeUnit(TimeUnit.MICROSECONDS)
     public void searchArrayReuseList() {
 
         int count = 1000;
@@ -66,9 +57,6 @@ public class SearchArrayTest {
 
 
     @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @Warmup(iterations = 5)
-    @OutputTimeUnit(TimeUnit.MICROSECONDS)
     public void searchArrayReuseSet() {
 
         int count = 1000;
@@ -81,9 +69,6 @@ public class SearchArrayTest {
 
 
     @Benchmark
-    @BenchmarkMode(Mode.AverageTime)
-    @Warmup(iterations = 5)
-    @OutputTimeUnit(TimeUnit.MICROSECONDS)
     public void searchArrayBinarySearch() {
 
         int count = 1000;

core-java/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java

@@ -0,0 +1,21 @@
+package com.baeldung.interfaces;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class CommaSeparatedCustomers implements Customer.List {
+
+    private List<Customer> customers = new ArrayList<Customer>();
+
+    @Override
+    public void Add(Customer customer) {
+        customers.add(customer);
+    }
+
+    @Override
+    public String getCustomerNames() {
+        return customers.stream().map(customer -> customer.getName()).collect(Collectors.joining(","));
+    }
+
+}

core-java/src/main/java/com/baeldung/interfaces/Customer.java

@@ -0,0 +1,19 @@
+package com.baeldung.interfaces;
+
+public class Customer {
+    public interface List {
+        void Add(Customer customer);
+
+        String getCustomerNames();
+    }
+
+    private String name;
+
+    public Customer(String name) {
+        this.name = name;
+    }
+
+    String getName() {
+        return name;
+    }
+}

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

@@ -54,7 +54,7 @@ public class GenericFile {
     }
 
     public String getFileInfo() {
-        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());
+        return "Generic File Impl";
     }
 
     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 String.format(" %s Height: %d\n Width: %d", super.getFileInfo(), this.getHeight(), this.getWidth());
+        return "Image File Impl";
     }
 
     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 String.format(" %s Word Count: %d", super.getFileInfo(), wordCount);
+        return "Text File Impl";
     }
 
     public String read() {

core-java/src/test/java/com/baeldung/interfaces/InnerInterfaceTests.java

@@ -0,0 +1,18 @@
+package com.baeldung.interfaces;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class InnerInterfaceTests {
+    @Test
+    public void whenCustomerListJoined_thenReturnsJoinedNames() {
+        Customer.List customerList = new CommaSeparatedCustomers();
+        customerList.Add(new Customer("customer1"));
+        customerList.Add(new Customer("customer2"));
+        assertEquals("customer1,customer2", customerList.getCustomerNames());
+    }
+}