Rebasing from master

asciidoctor/pom.xml

@@ -35,7 +35,12 @@
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>
                     <outputDirectory>target/docs/asciidoc</outputDirectory>
+                    <attributes>
+                        <pdf-stylesdir>${project.basedir}/src/themes</pdf-stylesdir>
+                        <pdf-style>custom</pdf-style>
+                    </attributes>
                     <backend>pdf</backend>
+                    <doctype>book</doctype>
                 </configuration>
             </plugin>
         </plugins>

asciidoctor/src/docs/asciidoc/test.adoc

@@ -1,3 +1,13 @@
-== Introduction Section
+:icons: font
 
-Hi. I'm a simple test to see if this Maven build is working. If you see me in a nice PDF, then it means everything is [red]#working#.
+
+= Generating book with AsciiDoctorj
+Baeldung
+
+[abstract]
+This is the actual content.
+
+== First Section
+
+This is first section of the book where you can include some nice icons like icon:comment[].
+You can also create http://www.baeldung.com[links]

asciidoctor/src/themes/custom-theme.yml

@@ -0,0 +1,29 @@
+title_page:
+  align: left
+
+page:
+  layout: portrait
+  margin: [0.75in, 1in, 0.75in, 1in]
+  size: A4
+base:
+  font_color: #333333
+  line_height_length: 17
+  line_height: $base_line_height_length / $base_font_size
+link:
+  font_color: #009900
+
+header:
+  height: 0.5in
+  line_height: 1
+  recto_content:
+    center: '{document-title}'
+  verso_content:
+    center: '{document-title}'
+
+footer:
+  height: 0.5in
+  line_height: 1
+  recto_content:
+    right: '{chapter-title} | *{page-number}*'
+  verso_content:
+    left: '*{page-number}* | {chapter-title}'

aws/src/main/java/com/baeldung/s3/S3Application.java

@@ -1,9 +1,10 @@
 package com.baeldung.s3;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
+import org.apache.commons.io.FileUtils;
+
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
@@ -28,7 +29,7 @@ public class S3Application {
           "<AWS accesskey>", 
           "<AWS secretkey>"
         );
-    }  
+    }
 
     public static void main(String[] args) throws IOException {
         //set-up the client
@@ -74,15 +75,7 @@ public static void main(String[] args) throws IOException {
         //downloading an object
         S3Object s3object = awsService.getObject(bucketName, "Document/hello.txt");
         S3ObjectInputStream inputStream = s3object.getObjectContent();
-        FileOutputStream fos = new FileOutputStream(new File("/Users/user/Desktop/hello.txt"));
-
-        int read = 0;
-        byte[] bytes = new byte[1024];
-        while ((read = inputStream.read(bytes)) != -1) {
-            fos.write(bytes, 0, read);
-        }
-        inputStream.close();
-        fos.close();
+        FileUtils.copyInputStreamToFile(inputStream, new File("/Users/user/Desktop/hello.txt"));
 
         //copying an object
         awsService.copyObject(

camel-api/src/main/java/com/baeldung/camel/Application.java

@@ -13,14 +13,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;
 
 @SpringBootApplication
 @ComponentScan(basePackages="com.baeldung.camel")
-public class Application extends SpringBootServletInitializer {
+public class Application{
 
     @Value("${server.port}")
     String serverPort;
@@ -62,10 +61,12 @@ public void configure() {
                 .bindingMode(RestBindingMode.json)
                 .dataFormatProperty("prettyPrint", "true");
 /** 
-The Rest DSL supports automatic binding json/xml contents to/from POJOs using Camels Data Format.
-By default the binding mode is off, meaning there is no automatic binding happening for incoming and outgoing messages.
-You may want to use binding if you develop POJOs that maps to your REST services request and response types. 
-This allows you, as a developer, to work with the POJOs in Java code.
+The Rest DSL supports automatic binding json/xml contents to/from 
+POJOs using Camels Data Format.
+By default the binding mode is off, meaning there is no automatic 
+binding happening for incoming and outgoing messages.
+You may want to use binding if you develop POJOs that maps to 
+your REST services request and response types. 
 */         
 
             rest("/api/").description("Teste REST Service")

core-java/hashcode/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.hashcode</groupId>
+    <artifactId>hashcode</artifactId>
+    <version>1.0</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+    </dependencies>
+</project>

core-java/hashcode/src/main/java/com/baeldung/application/Application.java

@@ -0,0 +1,23 @@
+package com.baeldung.application;
+
+import com.baeldung.entities.User;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Application {
+
+    public static void main(String[] args) {
+        Map<User, User> users = new HashMap<>();
+        User user1 = new User(1L, "John", "john@domain.com");
+        User user2 = new User(2L, "Jennifer", "jennifer@domain.com");
+        User user3 = new User(3L, "Mary", "mary@domain.com");
+
+        users.put(user1, user1);
+        users.put(user2, user2);
+        users.put(user3, user3);
+
+        if (users.containsKey(user1)) {
+            System.out.print("User found in the collection");
+        }
+    }
+}

core-java/hashcode/src/main/java/com/baeldung/entities/User.java

@@ -0,0 +1,38 @@
+package com.baeldung.entities;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class User {
+
+    private final Logger logger = LoggerFactory.getLogger(User.class);
+    private long id;
+    private String name;
+    private String email;
+
+    public User(long id, String name, String email) {
+        this.id = id;
+        this.name = name;
+        this.email = email;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null) return false;
+        if (this.getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id != user.id && (!name.equals(user.name) && !email.equals(user.email));
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 31 * hash + (int) id;
+        hash = 31 * hash + (name == null ? 0 : name.hashCode());
+        hash = 31 * hash + (email == null ? 0 : email.hashCode());
+        logger.info("hashCode() method called - Computed hash: " + hash);
+        return hash;
+    }
+    // getters and setters here
+}

core-java/hashcode/src/test/java/com/baeldung/application/ApplicationTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.application;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import static org.junit.Assert.assertEquals;
+
+public class ApplicationTest {
+
+    private ByteArrayOutputStream outContent;
+
+    @Before
+    public void setUpPrintStreamInstance() throws Exception {
+        this.outContent = new ByteArrayOutputStream();
+        System.setOut(new PrintStream(outContent));
+    }
+
+    @After
+    public void tearDownByteArrayOutputStream() throws Exception {
+        outContent = null;
+    }
+
+    @Test
+    public void main_NoInputState_TextPrintedToConsole() throws Exception {
+        Application.main(new String[]{});
+        assertEquals("User found in the collection", outContent.toString());
+    }
+}

core-java/hashcode/src/test/java/com/baeldung/entities/UserTest.java

@@ -0,0 +1,34 @@
+package com.baeldung.entities;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class UserTest {
+
+    private User user;
+    private User comparisonUser;
+
+    @Before
+    public void setUpUserInstances() {
+        this.user = new User(1L, "test", "test@domain.com");
+        this.comparisonUser = this.user;
+    }
+
+    @After
+    public void tearDownUserInstances() {
+        user = null;
+        comparisonUser = null;
+    }
+
+    @Test
+    public void equals_EqualUserInstance_TrueAssertion(){
+        Assert.assertTrue(user.equals(comparisonUser));
+    }
+
+    @Test
+    public void hashCode_UserHash_TrueAssertion() {
+        Assert.assertEquals(1792276941, user.hashCode());
+    }
+}

core-java/pom.xml

@@ -382,7 +382,7 @@
         </profile>
     </profiles>
 
-    <properties>
+    <properties>    	
         <!-- marshalling -->
         <jackson.version>2.8.5</jackson.version>
 
@@ -391,7 +391,7 @@
         <logback.version>1.1.7</logback.version>
 
         <!-- util -->
-        <guava.version>21.0</guava.version>
+        <guava.version>22.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
         <bouncycastle.version>1.55</bouncycastle.version>
         <commons-codec.version>1.10</commons-codec.version>
@@ -408,7 +408,7 @@
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.12</junit.version>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.8.9</mockito.version>
         <assertj.version>3.6.1</assertj.version>
         <avaitility.version>1.7.0</avaitility.version>
 

core-java/src/main/java/com/baeldung/concurrent/Scheduledexecutorservice/ScheduledExecutorServiceDemo.java

@@ -1,6 +1,5 @@
 package com.baeldung.concurrent.Scheduledexecutorservice;
 
-import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
@@ -12,32 +11,21 @@ public class ScheduledExecutorServiceDemo {
 	public void execute() {
 		ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
 
-		ScheduledFuture<?> scheduledFuture = executorService.schedule(new Runnable() {
-			@Override
-			public void run() {
-				// task details
-			}
+		ScheduledFuture<?> scheduledFuture = executorService.schedule(() -> {
+			// Task
 		}, 1, TimeUnit.SECONDS);
 
-		executorService.scheduleAtFixedRate(new Runnable() {
-			@Override
-			public void run() {
-				// task details
-			}
+		executorService.scheduleAtFixedRate(() -> {
+			// Task
 		}, 1, 10, TimeUnit.SECONDS);
 
-		executorService.scheduleWithFixedDelay(new Runnable() {
-			@Override
-			public void run() {
-				// task details
-			}
+		executorService.scheduleWithFixedDelay(() -> {
+			// Task
 		}, 1, 10, TimeUnit.SECONDS);
 
-		Future<String> future = executorService.schedule(new Callable<String>() {
-			@Override
-			public String call() throws Exception {
-				return "Hello World";
-			}
+		Future<String> future = executorService.schedule(() -> {
+			// Task
+			return "Hellow world";
 		}, 1, TimeUnit.SECONDS);
 
 		executorService.shutdown();

core-java/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithLock.java

@@ -1,7 +1,7 @@
 package com.baeldung.concurrent.atomic;
 
 public class SafeCounterWithLock {
-    int counter;
+    private volatile int counter;
 
     public int getValue() {
         return counter;

core-java/src/main/java/com/baeldung/concurrent/atomic/SafeCounterWithoutLock.java

@@ -3,7 +3,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class SafeCounterWithoutLock {
-    AtomicInteger counter = new AtomicInteger(0);
+    private final AtomicInteger counter = new AtomicInteger(0);
 
     public int getValue() {
         return counter.get();