Merge remote-tracking branch 'eugenp/master'

aws/pom.xml

@@ -137,7 +137,7 @@
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
         <aws-java-sdk.version>1.11.290</aws-java-sdk.version>
-        <mockito-core.version>2.8.9</mockito-core.version>
+        <mockito-core.version>2.21.0</mockito-core.version>
         <assertj-core.version>3.8.0</assertj-core.version>
         <dynamodblocal.version>1.11.86</dynamodblocal.version>
         <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>

core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java

@@ -18,7 +18,7 @@ public class FilenameFilterManualTest {
     @BeforeClass
     public static void setupClass() {
         directory = new File(FilenameFilterManualTest.class.getClassLoader()
-            .getResource("testFolder")
+            .getResource("fileNameFilterManualTestFolder")
             .getFile());
     }
 

core-java-persistence/pom.xml

@@ -39,6 +39,16 @@
             <artifactId>c3p0</artifactId>
             <version>${c3p0.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.spring-web.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${springframework.boot.spring-boot-starter.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>core-java-persistence</finalName>
@@ -55,5 +65,7 @@
         <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
         <HikariCP.version>3.2.0</HikariCP.version>
         <c3p0.version>0.9.5.2</c3p0.version>
+        <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
+        <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
     </properties>
 </project>

core-java/pom.xml

@@ -127,11 +127,6 @@
             <artifactId>spring-web</artifactId>
             <version>${springframework.spring-web.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>${springframework.boot.spring-boot-starter.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -532,7 +527,6 @@
         <!-- maven plugins -->
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
-        <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
         
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
         <h2database.version>1.4.197</h2database.version>

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

@@ -0,0 +1,12 @@
+package com.baeldung.constructorsstaticfactorymethods.application;
+
+import com.baeldung.constructorsstaticfactorymethods.entities.User;
+ 
+public class Application {
+
+    public static void main(String[] args) {
+        User user1 = User.createWithDefaultCountry("John", "john@domain.com");
+        User user2 = User.createWithLoggedInstantiationTime("John", "john@domain.com", "Argentina");
+        User user3 = User.getSingletonInstance("John", "john@domain.com", "Argentina");
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.baeldung.constructorsstaticfactorymethods.entities;
+
+import java.time.LocalTime;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+public class User {
+
+    private static User instance = null;
+    private static final Logger LOGGER = Logger.getLogger(User.class.getName());
+    private final String name;
+    private final String email;
+    private final String country;
+    
+    public static User createWithDefaultCountry(String name, String email) {
+        return new User(name, email, "Argentina");
+    }
+
+    public static User createWithLoggedInstantiationTime(String name, String email, String country) {
+        setLoggerProperties();
+        LOGGER.log(Level.INFO, "Creating User instance at : {0}", LocalTime.now());
+        return new User(name, email, country);
+    }
+
+    public static User getSingletonInstance(String name, String email, String country) {
+        if (instance == null) {
+            synchronized (User.class) {
+                if (instance == null) {
+                    instance = new User(name, email, country);
+                }
+            }
+        }
+        return instance;
+
+    }
+
+    private User(String name, String email, String country) {
+        this.name = name;
+        this.email = email;
+        this.country = country;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+    
+    private static void setLoggerProperties() {
+        ConsoleHandler handler = new ConsoleHandler();
+        handler.setLevel(Level.INFO);
+        handler.setFormatter(new SimpleFormatter());
+        LOGGER.addHandler(handler);
+    }
+}

core-java/src/main/java/com/baeldung/exceptionhandling/Exceptions.java

@@ -25,11 +25,7 @@ public class Exceptions {
     }
 
     public List<Player> loadAllPlayers(String playersFile) throws IOException{
-        try {
+        throw new IOException();
-            throw new IOException();
-        } catch(IOException ex) {
-            throw new IllegalStateException();
-        }
     }
 
     public int getPlayerScoreThrows(String playerFile) throws FileNotFoundException {		 
@@ -163,14 +159,8 @@ public class Exceptions {
         }
     }
 
-    public void throwAsGotoAntiPattern() {
+    public void throwAsGotoAntiPattern() throws MyException {
-        try {
+    	throw new MyException();
-            // bunch of code
-            throw new MyException();
-            // second bunch of code
-        } catch ( MyException e ) {
-            // third bunch of code
-        }
     }
 
     public int getPlayerScoreSwallowingExceptionAntiPattern(String playerFile) {

core-java/src/test/java/com/baeldung/binding/AnimalUnitTest.java

@@ -16,8 +16,11 @@ import org.slf4j.LoggerFactory;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import java.util.List;
+
 /**
  * Created by madhumita.g on 01-08-2018.
  */
@@ -66,20 +69,18 @@ public class AnimalUnitTest {
         int testValue = 3;
         animal.makeNoise(testValue);
 
-        verify(mockAppender).doAppend(captorLoggingEvent.capture());
+        verify(mockAppender,times(3)).doAppend(captorLoggingEvent.capture());
 
-        final LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+        final List<LoggingEvent> loggingEvents = captorLoggingEvent.getAllValues();
 
-        while (testValue != 0) {
+        for(LoggingEvent loggingEvent : loggingEvents)
+        {
             assertThat(loggingEvent.getLevel(), is(Level.INFO));
 
             assertThat(loggingEvent.getFormattedMessage(),
-                    is("generic animal noise countdown 3\n"
+                    is("generic animal noise countdown "+testValue));
-                            + "generic animal noise countdown 2\n"
-                            + "generic animal noise countdown 1\n"));
-
-            testValue-=1;
 
+            testValue--;
         }
     }
 

core-java/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java

@@ -0,0 +1,43 @@
+package com.baeldung.constructorsstaticfactorymethods;
+
+import com.baeldung.constructorsstaticfactorymethods.entities.User;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class UserUnitTest {
+    
+    @Test
+    public void givenUserClass_whenCalledcreateWithDefaultCountry_thenCorrect() {
+        assertThat(User.createWithDefaultCountry("John", "john@domain.com")).isInstanceOf(User.class);
+    }
+    
+    @Test
+    public void givenUserIntanceCreatedWithcreateWithDefaultCountry_whenCalledgetName_thenCorrect() {
+        User user = User.createWithDefaultCountry("John", "john@domain.com");
+        assertThat(user.getName()).isEqualTo("John");
+    }
+    
+    @Test
+    public void givenUserIntanceCreatedWithcreateWithDefaultCountry_whenCalledgetEmail_thenCorrect() {
+        User user = User.createWithDefaultCountry("John", "john@domain.com");
+        assertThat(user.getEmail()).isEqualTo("john@domain.com");
+    }
+    
+    @Test
+    public void givenUserIntanceCreatedWithcreateWithDefaultCountry_whenCalledgetCountry_thenCorrect() {
+        User user = User.createWithDefaultCountry("John", "john@domain.com");
+        assertThat(user.getCountry()).isEqualTo("Argentina");
+    }
+    
+    @Test
+    public void givenUserInstanceCreatedWithcreateWithInstantiationTime_whenCalledcreateWithInstantiationTime_thenCorrect() {
+        assertThat(User.createWithLoggedInstantiationTime("John", "john@domain.com", "Argentina")).isInstanceOf(User.class);
+    }
+    
+    @Test
+    public void givenUserInstanceCreatedWithgetSingletonIntance_whenCalledgetSingletonInstance_thenCorrect() {
+        User user1 = User.getSingletonInstance("John", "john@domain.com", "Argentina");
+        User user2 = User.getSingletonInstance("John", "john@domain.com", "Argentina");
+        assertThat(user1).isEqualTo(user2);
+    }
+}

core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt

@@ -103,7 +103,7 @@ class CoroutinesTest {
             //given
             val job = launch(CommonPool) {
                 while (isActive) {
-                    println("is working")
+                    //println("is working")
                 }
             }
 

data-structures/src/main/java/com/baeldung/tree/BinaryTree.java

@@ -57,7 +57,7 @@ public class BinaryTree {
     }
 
     public void delete(int value) {
-        deleteRecursive(root, value);
+        root = deleteRecursive(root, value);
     }
 
     private Node deleteRecursive(Node current, int value) {

data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java

@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class BinaryTreeTest {
+public class BinaryTreeUnitTest {
 
     @Test
     public void givenABinaryTree_WhenAddingElements_ThenTreeNotEmpty() {
@@ -70,6 +70,17 @@ public class BinaryTreeTest {
         assertEquals(initialSize, bt.getSize());
     }
 
+    @Test
+    public void it_deletes_the_root() {
+        int value = 12;
+        BinaryTree bt = new BinaryTree();
+        bt.add(value);
+
+        assertTrue(bt.containsNode(value));
+        bt.delete(value);
+        assertFalse(bt.containsNode(value));
+    }
+
     @Test
     public void givenABinaryTree_WhenTraversingInOrder_ThenPrintValues() {
 

data-structures/src/test/java/com/baeldung/trie/TrieUnitTest.java

@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class TrieTest {
+public class TrieUnitTest {
 
     @Test
     public void whenEmptyTrie_thenNoElements() {

ethereum/pom.xml

@@ -213,7 +213,7 @@
         <web3j.core.version>3.3.1</web3j.core.version>
         <springframework.version>5.0.5.RELEASE</springframework.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <jackson-databind.version>2.5.0</jackson-databind.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jackson.version>2.9.3</jackson.version>

guest/core-kotlin/.gitignore

@@ -0,0 +1,14 @@
+/bin/
+
+#ignore gradle
+.gradle/
+
+
+#ignore build and generated files
+build/
+node/
+out/
+
+#ignore installed node modules and package lock file
+node_modules/
+package-lock.json

guest/core-kotlin/pom.xml

@@ -0,0 +1,199 @@
+<?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>
+    <artifactId>core-kotlin</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <groupId>com.stackify</groupId>
+    <packaging>jar</packaging>
+
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <url>http://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin-stdlib.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin-stdlib.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin-test-junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin-reflect.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.spek</groupId>
+            <artifactId>spek-api</artifactId>
+            <version>1.1.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.spek</groupId>
+            <artifactId>spek-subject-extension</artifactId>
+            <version>1.1.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.spek</groupId>
+            <artifactId>spek-junit-platform-engine</artifactId>
+            <version>1.1.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nhaarman</groupId>
+            <artifactId>mockito-kotlin</artifactId>
+            <version>${mockito-kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>${maven-compiler-plugin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${maven-failsafe-plugin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-plugin</artifactId>
+            <version>${kotlin-maven-plugin.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially 
+                        by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially 
+                        by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>${junit.platform.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>junit5</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*Test5.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <kotlin-maven-plugin.version>1.2.60</kotlin-maven-plugin.version>
+        <kotlin-test-junit.version>1.2.51</kotlin-test-junit.version>
+        <kotlin-stdlib.version>1.2.51</kotlin-stdlib.version>
+        <kotlin-reflect.version>1.2.51</kotlin-reflect.version>
+        <kotlinx.version>0.22.5</kotlinx.version>
+        <mockito-kotlin.version>1.5.0</mockito-kotlin.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <junit.platform.version>1.0.0</junit.platform.version>
+        <junit.vintage.version>5.2.0</junit.vintage.version>
+        <assertj.version>3.10.0</assertj.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+    </properties>
+
+</project>

guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt

@@ -24,7 +24,7 @@ class ExceptionsTest {
     fun givenANullString_whenUsingElvisOperator_thenExceptionIsThrown() {
         val sampleString: String? = null
 
-        val length: Int = sampleString?.length ?: throw IllegalArgumentException("String must not be null")
+        sampleString?.length ?: throw IllegalArgumentException("String must not be null")
     }
 
     private fun funThrowingException(): Nothing {

javax-servlets/pom.xml

@@ -84,7 +84,7 @@
         <spring-test.version>5.0.5.RELEASE</spring-test.version>
         <gson.version>2.8.2</gson.version>
         <assertj.version>3.9.1</assertj.version>
-        <mockito.version>2.18.3</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <commons-io.version>2.6</commons-io.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>

maven/pom.xml

@@ -1,127 +1,151 @@
 <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">
+	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>
+	<modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
-    <artifactId>maven</artifactId>
+	<artifactId>maven</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
-    <parent>
+	<parent>
-        <artifactId>parent-modules</artifactId>
+		<artifactId>parent-modules</artifactId>
-        <groupId>com.baeldung</groupId>
+		<groupId>com.baeldung</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
-    </parent>
+	</parent>
 
-    <build>
+	<build>
-        <plugins>
+		<plugins>
-            <plugin>
+			<plugin>
-                <artifactId>maven-resources-plugin</artifactId>
+				<artifactId>maven-resources-plugin</artifactId>
-                <version>${maven.resources.version}</version>
+				<version>${maven.resources.version}</version>
-                <configuration>
+				<configuration>
-                    <outputDirectory>output-resources</outputDirectory>
+					<outputDirectory>output-resources</outputDirectory>
-                    <resources>
+					<resources>
-                        <resource>
+						<resource>
-                            <directory>input-resources</directory>
+							<directory>input-resources</directory>
-                            <excludes>
+							<excludes>
-                                <exclude>*.png</exclude>
+								<exclude>*.png</exclude>
-                            </excludes>
+							</excludes>
-                            <filtering>true</filtering>
+							<filtering>true</filtering>
-                        </resource>
+						</resource>
-                    </resources>
+					</resources>
-                </configuration>
+				</configuration>
-            </plugin>
+			</plugin>
-            <plugin>
+			<plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+				<version>${maven-compiler-plugin.version}</version>
-                <configuration>
+				<configuration>
-                    <source>${java.version}</source>
+					<source>${java.version}</source>
-                    <target>${java.version}</target>
+					<target>${java.version}</target>
-                    <compilerArgs>
+					<compilerArgs>
-                        <arg>-Xlint:unchecked</arg>
+						<arg>-Xlint:unchecked</arg>
-                    </compilerArgs>
+					</compilerArgs>
-                </configuration>
+				</configuration>
-            </plugin>
+			</plugin>
-            <plugin>
+			<plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+				<artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
+				<version>${maven-surefire-plugin.version}</version>
-                <configuration>
+				<configuration>
-                    <excludes>
+					<excludes>
-                        <exclude>DataTest.java</exclude>
+						<exclude>DataTest.java</exclude>
-                    </excludes>
+					</excludes>
-                    <includes>
+					<includes>
-                        <include>TestFail.java</include>
+						<include>TestFail.java</include>
-                        <include>DataCheck.java</include>
+						<include>DataCheck.java</include>
-                    </includes>
+					</includes>
-                    <testFailureIgnore>true</testFailureIgnore>
+					<testFailureIgnore>true</testFailureIgnore>
-                </configuration>
+				</configuration>
-            </plugin>
+			</plugin>
-            <plugin>
+			<plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
+				<artifactId>maven-failsafe-plugin</artifactId>
-                <version>${maven.failsafe.version}</version>
+				<version>${maven.failsafe.version}</version>
-                <executions>
+				<executions>
-                    <execution>
+					<execution>
-                        <goals>
+						<goals>
-                            <goal>integration-test</goal>
+							<goal>integration-test</goal>
-                            <goal>verify</goal>
+							<goal>verify</goal>
-                        </goals>
+						</goals>
-                        <configuration>
+						<configuration>
-                            <!-- configuration similar to surefire -->
+							<!-- configuration similar to surefire -->
-                        </configuration>
+						</configuration>
-                    </execution>
+					</execution>
-                </executions>
+				</executions>
-            </plugin>
+			</plugin>
-            <plugin>
+			<plugin>
-                <artifactId>maven-verifier-plugin</artifactId>
+				<artifactId>maven-verifier-plugin</artifactId>
-                <version>${maven.verifier.version}</version>
+				<version>${maven.verifier.version}</version>
-                <configuration>
+				<configuration>
-                    <verificationFile>input-resources/verifications.xml</verificationFile>
+					<verificationFile>input-resources/verifications.xml</verificationFile>
-                </configuration>
+				</configuration>
-                <executions>
+				<executions>
-                    <execution>
+					<execution>
-                        <goals>
+						<goals>
-                            <goal>verify</goal>
+							<goal>verify</goal>
-                        </goals>
+						</goals>
-                    </execution>
+					</execution>
-                </executions>
+				</executions>
-            </plugin>
+			</plugin>
-            <plugin>
+			<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
+				<artifactId>maven-clean-plugin</artifactId>
-                <version>${maven.clean.version}</version>
+				<version>${maven.clean.version}</version>
-                <configuration>
+				<configuration>
-                    <filesets>
+					<filesets>
-                        <fileset>
+						<fileset>
-                            <directory>output-resources</directory>
+							<directory>output-resources</directory>
-                        </fileset>
+						</fileset>
-                    </filesets>
+					</filesets>
-                </configuration>
+				</configuration>
-            </plugin>
+			</plugin>
-            <plugin>
+			<plugin>
-                <groupId>org.codehaus.mojo</groupId>
+				<groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
+				<artifactId>build-helper-maven-plugin</artifactId>
-                <version>${maven.build.helper.version}</version>
+				<version>${maven.build.helper.version}</version>
-                <executions>
+				<executions>
-                    <execution>
+					<execution>
-                        <phase>generate-sources</phase>
+						<phase>generate-sources</phase>
-                        <goals>
+						<goals>
-                            <goal>add-source</goal>
+							<goal>add-source</goal>
-                        </goals>
+						</goals>
-                        <configuration>
+						<configuration>
-                            <sources>
+							<sources>
-                                <source>src/main/another-src</source>
+								<source>src/main/another-src</source>
-                            </sources>
+							</sources>
-                        </configuration>
+						</configuration>
-                    </execution>
+					</execution>
-                </executions>
+				</executions>
-            </plugin>
+			</plugin>
-        </plugins>
+		</plugins>
-    </build>
+	</build>
 
-    <properties>
+	<profiles>
-        <maven.resources.version>3.0.2</maven.resources.version>
+		<profile>
-        <maven.failsafe.version>2.21.0</maven.failsafe.version>
+			<id>default</id>
-        <maven.verifier.version>1.1</maven.verifier.version>
+			<build>
-        <maven.clean.version>3.0.0</maven.clean.version>
+				<plugins>
-        <maven.build.helper.version>3.0.0</maven.build.helper.version>
+					<plugin>
-        <resources.name>Baeldung</resources.name>
+						<artifactId>maven-surefire-plugin</artifactId>
-    </properties>
+						<version>${maven-surefire-plugin.version}</version>
+						<configuration>
+							<excludes>
+								<exclude>DataTest.java</exclude>
+							</excludes>
+							<includes>
+								<include>TestFail.java</include>
+								<include>DataCheck.java</include>
+							</includes>
+							<testFailureIgnore>true</testFailureIgnore>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<properties>
+		<maven.resources.version>3.0.2</maven.resources.version>
+		<maven.failsafe.version>2.21.0</maven.failsafe.version>
+		<maven.verifier.version>1.1</maven.verifier.version>
+		<maven.clean.version>3.0.0</maven.clean.version>
+		<maven.build.helper.version>3.0.0</maven.build.helper.version>
+		<resources.name>Baeldung</resources.name>
+	</properties>
 
 </project>

pom.xml

@@ -1238,7 +1238,7 @@
 		<!-- <gib.enabled>false</gib.enabled> -->
 		<junit.version>4.12</junit.version>
 		<org.hamcrest.version>1.3</org.hamcrest.version>
-		<mockito.version>2.8.9</mockito.version>
+		<mockito.version>2.21.0</mockito.version>
 		<!-- logging -->
 		<org.slf4j.version>1.7.21</org.slf4j.version>
 		<logback.version>1.1.7</logback.version>

spring-core/pom.xml

@@ -16,11 +16,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>${mockito.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -82,15 +77,7 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>https://maven.java.net/content/repositories/releases/</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <mockito.version>1.10.19</mockito.version>
         <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
         <javax.inject.version>1</javax.inject.version>
         <guava.version>20.0</guava.version>

spring-mockito/pom.xml

@@ -24,13 +24,13 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
     </properties>
 
 </project>

spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java

@@ -3,7 +3,7 @@ package com.baeldung.domain.util;
 import com.baeldung.domain.model.Message;
 import org.mockito.ArgumentMatcher;
 
-public class MessageMatcher extends ArgumentMatcher<Message> {
+public class MessageMatcher implements ArgumentMatcher<Message> {
 
     private Message left;
 
@@ -12,16 +12,11 @@ public class MessageMatcher extends ArgumentMatcher<Message> {
     }
 
     @Override
-    public boolean matches(Object object) {
+    public boolean matches(Message right) {
-        if (object instanceof Message) {
+        return left.getFrom().equals(right.getFrom()) &&
-            Message right = (Message) object;
+          left.getTo().equals(right.getTo()) &&
-            return left.getFrom().equals(right.getFrom()) &&
+          left.getText().equals(right.getText()) &&
-                    left.getTo().equals(right.getTo()) &&
+          right.getDate() != null &&
-                    left.getText().equals(right.getText()) &&
+          right.getId() != null;
-                    right.getDate() != null &&
-                    right.getId() != null;
-        }
-
-        return false;
     }
 }

spring-rest-full/README.md

@@ -41,5 +41,5 @@ mysql -u root -p
 ### Use the REST Service
 
 ```
-curl http://localhost:8080/spring-rest-full/foos
+curl http://localhost:8082/spring-rest-full/auth/foos
 ```

testing-modules/mockito-2/pom.xml

@@ -15,6 +15,6 @@
     </parent>
 
     <properties>
-        <mockito.version>2.8.9</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
     </properties>
 </project>

testing-modules/mocks/mock-comparisons/pom.xml

@@ -46,7 +46,7 @@
     </build>
 
     <properties>
-        <mockito.version>2.9.0</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <easymock.version>3.5.1</easymock.version>
         <jmockit.version>1.34</jmockit.version>
     </properties>

testing-modules/test-containers/pom.xml

@@ -104,7 +104,7 @@
         <junit.vintage.version>4.12.1</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <h2.version>1.4.196</h2.version>
-        <mockito.version>2.11.0</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <spring.version>5.0.1.RELEASE</spring.version>
         <testcontainers.version>1.7.2</testcontainers.version>
         <postgresql.version>42.2.2</postgresql.version>