Merge remote-tracking branch 'upstream/master'

core-java/README.md

@@ -104,3 +104,11 @@
 - [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue)
 - [Comparing getPath(), getAbsolutePath(), and getCanonicalPath() in Java](http://www.baeldung.com/java-path)
 - [How to Add a Single Element to a Stream](http://www.baeldung.com/java-stream-append-prepend)
+- [A Guide to Java SynchronousQueue](http://www.baeldung.com/java-synchronous-queue)
+- [Guide to the Java TransferQueue](http://www.baeldung.com/java-transfer-queue)
+- [Kotlin Java Interoperability](http://www.baeldung.com/kotlin-java-interoperability)
+- [Guide to the ConcurrentSkipListMap](http://www.baeldung.com/java-concurrent-skip-list-map)
+- [Difference Between Wait and Sleep in Java](http://www.baeldung.com/java-wait-and-sleep)
+- [LongAdder and LongAccumulator in Java](http://www.baeldung.com/java-longadder-and-longaccumulator)
+- [Using Java MappedByteBuffer](http://www.baeldung.com/java-mapped-byte-buffer)
+

guava21/README.md

@@ -1,2 +1,3 @@
 ### Relevant articles:
 - [New Stream, Comparator and Collector Functionality in Guava 21](http://www.baeldung.com/guava-21-new)
+- [New in Guava 21 common.util.concurrent](http://www.baeldung.com/guava-21-util-concurrent)

jee7/README.md

@@ -3,3 +3,4 @@
 - [JSON Processing in Java EE 7](http://www.baeldung.com/jee7-json)
 - [Converters, Listeners and Validators in Java EE 7](http://www.baeldung.com/java-ee7-converter-listener-validator)
 - [Introduction to JAX-WS](http://www.baeldung.com/jax-ws)
+- [A Guide to Java EE Web-Related Annotations](http://www.baeldung.com/javaee-web-annotations)

junit5/src/test/java/com/baeldung/DynamicTestsExample.java

@@ -18,6 +18,9 @@ import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.ThrowingConsumer;
 
+import com.baeldung.helpers.Employee;
+import com.baeldung.helpers.EmployeeDao;
+
 public class DynamicTestsExample {
 
     @TestFactory
@@ -111,6 +114,29 @@ public class DynamicTestsExample {
         
     }
 
+    @TestFactory
+    Stream<DynamicTest> dynamicTestsForEmployeeWorkflows() {
+        List<Employee> inputList =
+            Arrays.asList(new Employee(1, "Fred"), new Employee(2), new Employee(3, "John"));
+        
+        EmployeeDao dao = new EmployeeDao();
+        Stream<DynamicTest> saveEmployeeStream = inputList.stream().map(emp -> 
+            DynamicTest.dynamicTest("saveEmployee: " + emp.toString(), () -> {
+            Employee returned = dao.save(emp.getId());
+            assertEquals(returned.getId(), emp.getId());
+        }));
+        
+        Stream<DynamicTest> saveEmployeeWithFirstNameStream 
+            = inputList.stream().filter(emp -> !emp.getFirstName().isEmpty())
+            .map(emp -> DynamicTest.dynamicTest("saveEmployeeWithName" + emp.toString(), () -> {
+            Employee returned = dao.save(emp.getId(), emp.getFirstName());
+            assertEquals(returned.getId(), emp.getId());
+            assertEquals(returned.getFirstName(), emp.getFirstName());
+        }));
+        
+        return Stream.concat(saveEmployeeStream, saveEmployeeWithFirstNameStream);
+    }
+    
     class DomainNameResolver {
         
         private Map<String, String> ipByDomainName = new HashMap<>();

junit5/src/test/java/com/baeldung/helpers/Employee.java

@@ -0,0 +1,38 @@
+package com.baeldung.helpers;
+
+public class Employee {
+
+    private long id;
+    private String firstName;
+
+    public Employee(long id) {
+        this.id = id;
+        this.firstName = "";
+    }
+
+    public Employee(long id, String firstName) {
+        this.id = id;
+        this.firstName = firstName;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    @Override
+    public String toString() {
+        return "Employee [id=" + id + ", firstName=" + firstName + "]";
+    }
+}

junit5/src/test/java/com/baeldung/helpers/EmployeeDao.java

@@ -0,0 +1,16 @@
+package com.baeldung.helpers;
+
+public class EmployeeDao {
+
+    public Employee save(long id) {
+        return new Employee(id);
+    }
+
+    public Employee save(long id, String firstName) {
+        return new Employee(id, firstName);
+    }
+
+    public Employee update(Employee employee) {
+        return employee;
+    }
+}

kotlin/README.md

@@ -5,3 +5,4 @@
 - [Comprehensive Guide to Null Safety in Kotlin](http://www.baeldung.com/kotlin-null-safety)
 - [Kotlin Java Interoperability](http://www.baeldung.com/kotlin-java-interoperability)
 - [Difference Between “==” and “===” in Kotlin]()
+- [Generics in Kotlin](http://www.baeldung.com/kotlin-generics)

libraries/README.md

@@ -9,7 +9,8 @@
 - [Introduction to Apache Flink with Java](http://www.baeldung.com/apache-flink)
 - [Introduction to JSONassert](http://www.baeldung.com/jsonassert)
 - [Intro to JaVer](http://www.baeldung.com/javers)
-
+- [Introduction to Apache Commons Math](http://www.baeldung.com/apache-commons-math)
+- [Intro to JaVer](http://www.baeldung.com/serenity-bdd)
 
 The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
 

libraries/pom.xml

@@ -226,11 +226,6 @@
             <artifactId>datanucleus-maven-plugin</artifactId>
             <version>5.0.2</version>
 	    </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.194</version>
-        </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-xml</artifactId>
@@ -269,6 +264,18 @@
             <artifactId>h2</artifactId>
             <version>1.4.195</version>
         </dependency>
+        <dependency>
+    		    <groupId>pl.pragmatists</groupId>
+		        <artifactId>JUnitParams</artifactId>
+			      <version>${jUnitParams.version}</version>
+			      <scope>test</scope>
+		    </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
     </dependencies>
     <properties>
         <multiverse.version>0.7.0</multiverse.version>
@@ -292,6 +299,7 @@
         <serenity.jbehave.version>1.24.0</serenity.jbehave.version>
         <serenity.jira.version>1.1.3-rc.5</serenity.jira.version>
         <serenity.plugin.version>1.4.0</serenity.plugin.version>
+        <jUnitParams.version>1.1.0</jUnitParams.version>
     </properties>
 
 </project>

libraries/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java

@@ -0,0 +1,15 @@
+package com.baeldung.junitparams;
+
+public class SafeAdditionUtil {
+
+    public int safeAdd(int a, int b) {
+        long result = ((long) a) + b;
+        if (result > Integer.MAX_VALUE) {
+            return Integer.MAX_VALUE;
+        } else if (result < Integer.MIN_VALUE) {
+            return Integer.MIN_VALUE;
+        }
+        return (int) result;
+    }
+
+}

libraries/src/main/java/com/baeldung/quartz/QuartzExample.java

@@ -0,0 +1,42 @@
+package com.baeldung.quartz;
+
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SchedulerFactory;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.impl.StdSchedulerFactory;
+
+public class QuartzExample {
+
+    public static void main(String args[]) {
+
+        SchedulerFactory schedFact = new StdSchedulerFactory();
+        try {
+
+            Scheduler sched = schedFact.getScheduler();
+
+            JobDetail job = JobBuilder.newJob(SimpleJob.class)
+                .withIdentity("myJob", "group1")
+                .build();
+
+            Trigger trigger = TriggerBuilder.newTrigger()
+                .withIdentity("myTrigger", "group1")
+                .startNow()
+                .withSchedule(SimpleScheduleBuilder.simpleSchedule()
+                    .withIntervalInSeconds(40)
+                    .repeatForever())
+                .build();
+
+            sched.scheduleJob(job, trigger);
+            sched.start();
+
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

libraries/src/main/java/com/baeldung/quartz/SimpleJob.java

@@ -0,0 +1,13 @@
+package com.baeldung.quartz;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+public class SimpleJob implements Job {
+
+    public void execute(JobExecutionContext arg0) throws JobExecutionException {
+        System.out.println("This is a quartz job!");
+    }
+
+}

libraries/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java

@@ -0,0 +1,55 @@
+package com.baeldung.junitparams;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import junitparams.FileParameters;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
+@RunWith(JUnitParamsRunner.class)
+public class SafeAdditionUtilTest {
+
+    private SafeAdditionUtil serviceUnderTest = new SafeAdditionUtil();
+
+    @Test
+    @Parameters({ "1, 2, 3", "-10, 30, 20", "15, -5, 10", "-5, -10, -15" })
+    public void whenCalledWithAnnotationProvidedParams_thenSafeAddAndReturn(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    @Test
+    @Parameters(method = "parametersToTestAdd")
+    public void whenCalledWithNamedMethod_thendSafeAddAndReturn(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    private Object[] parametersToTestAdd() {
+        return new Object[] { new Object[] { 1, 2, 3 }, new Object[] { -10, 30, 20 }, new Object[] { Integer.MAX_VALUE, 2, Integer.MAX_VALUE }, new Object[] { Integer.MIN_VALUE, -8, Integer.MIN_VALUE } };
+    }
+
+    @Test
+    @Parameters
+    public void whenCalledWithnoParam_thenLoadByNameSafeAddAndReturn(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    private Object[] parametersForWhenCalledWithnoParam_thenLoadByNameSafeAddAndReturn() {
+        return new Object[] { new Object[] { 1, 2, 3 }, new Object[] { -10, 30, 20 }, new Object[] { Integer.MAX_VALUE, 2, Integer.MAX_VALUE }, new Object[] { Integer.MIN_VALUE, -8, Integer.MIN_VALUE } };
+    }
+
+    @Test
+    @Parameters(source = TestDataProvider.class)
+    public void whenCalledWithNamedClass_thenSafeAddAndReturn(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    @Test
+    @FileParameters("src/test/resources/JunitParamsTestParameters.csv")
+    public void whenCalledWithCsvFile_thenSafeAddAndReturn(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+}

libraries/src/test/java/com/baeldung/junitparams/TestDataProvider.java

@@ -0,0 +1,13 @@
+package com.baeldung.junitparams;
+
+public class TestDataProvider {
+
+    public static Object[] provideBasicData() {
+        return new Object[] { new Object[] { 1, 2, 3 }, new Object[] { -10, 30, 20 }, new Object[] { 15, -5, 10 }, new Object[] { -5, -10, -15 } };
+    }
+
+    public static Object[] provideEdgeCaseData() {
+        return new Object[] { new Object[] { Integer.MAX_VALUE, 2, Integer.MAX_VALUE }, new Object[] { Integer.MIN_VALUE, -2, Integer.MIN_VALUE }, };
+    }
+
+}

libraries/src/test/resources/JunitParamsTestParameters.csv

@@ -0,0 +1,4 @@
+1,2,3
+-10, 30, 20
+15, -5, 10
+-5, -10, -15

mybatis/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles: 
+- [Quick Guide to MyBatis](http://www.baeldung.com/mybatis)

spring-5/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <version>2.0.0.M1</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 

spring-amqp-simple/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles: 
+- [RabbitMQ Message Dispatching with Spring AMQP](http://www.baeldung.com/rabbitmq-spring-amqp)

spring-boot-custom-starter/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles: 
+- [Creating a Custom Starter with Spring Boot](http://www.baeldung.com/spring-boot-custom-starter)

spring-boot/README.MD

@@ -21,3 +21,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Custom Information in Spring Boot Info Endpoint](http://www.baeldung.com/spring-boot-info-actuator-custom)
 - [Using @JsonComponent in Spring Boot](http://www.baeldung.com/spring-boot-jsoncomponent)
 - [Create a Custom Auto-Configuration with Spring Boot](http://www.baeldung.com/spring-boot-custom-auto-configuration)
+- [Testing in Spring Boot](http://www.baeldung.com/spring-boot-testing)
+- [Guide to @ConfigurationProperties in Spring Boot](http://www.baeldung.com/configuration-properties-in-spring-boot)

spring-cloud/README.md

@@ -18,3 +18,4 @@
 
 ### Relevant Articles:
 - [Introduction to Spring Cloud Rest Client with Netflix Ribbon](http://www.baeldung.com/spring-cloud-rest-client-with-netflix-ribbon)
+ [An Introduction to Spring Cloud Zookeeper](http://www.baeldung.com/spring-cloud-zookeeper)

spring-security-mvc-boot/README.MD

@@ -7,3 +7,4 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
 - [Spring Security: Authentication with a Database-backed UserDetailsService](http://www.baeldung.com/spring-security-authentication-with-a-database)
 - [Two Login Pages with Spring Security](http://www.baeldung.com/spring-security-two-login-pages)
 - [Multiple Entry Points in Spring Security](http://www.baeldung.com/spring-security-multiple-entry-points)
+- [Multiple Authentication Providers in Spring Security](http://www.baeldung.com/spring-security-multiple-auth-providers)

testing/pom.xml

@@ -64,6 +64,12 @@
             <version>${truth.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>pl.pragmatists</groupId>
+            <artifactId>JUnitParams</artifactId>
+            <version>${jUnitParams.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -130,5 +136,6 @@
         <assertj-guava.version>3.1.0</assertj-guava.version>
         <assertj-core.version>3.6.1</assertj-core.version>
         <truth.version>0.32</truth.version>
+        <jUnitParams.version>1.1.0</jUnitParams.version>
     </properties>
 </project>

testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java

@@ -0,0 +1,15 @@
+package com.baeldung.junitparams;
+
+public class SafeAdditionUtil {
+
+    public int safeAdd(int a, int b) {
+        long result = ((long) a) + b;
+        if (result > Integer.MAX_VALUE) {
+            return Integer.MAX_VALUE;
+        } else if (result < Integer.MIN_VALUE) {
+            return Integer.MIN_VALUE;
+        }
+        return (int) result;
+    }
+
+}

testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java

@@ -0,0 +1,54 @@
+package com.baeldung.junitparams;
+
+import static org.junit.Assert.assertEquals;
+
+import junitparams.FileParameters;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitParamsRunner.class)
+public class SafeAdditionUtilTest {
+
+    private SafeAdditionUtil serviceUnderTest = new SafeAdditionUtil();
+
+    @Test
+    @Parameters({ "1, 2, 3", "-10, 30, 20", "15, -5, 10", "-5, -10, -15" })
+    public void whenWithAnnotationProvidedParams_thenSafeAdd(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    @Test
+    @Parameters(method = "parametersToTestAdd")
+    public void whenWithNamedMethod_thendSafeAdd(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    private Object[] parametersToTestAdd() {
+        return new Object[] { new Object[] { 1, 2, 3 }, new Object[] { -10, 30, 20 }, new Object[] { Integer.MAX_VALUE, 2, Integer.MAX_VALUE }, new Object[] { Integer.MIN_VALUE, -8, Integer.MIN_VALUE } };
+    }
+
+    @Test
+    @Parameters
+    public void whenWithnoParam_thenLoadByNameSafeAdd(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    private Object[] parametersForWhenWithnoParam_thenLoadByNameSafeAdd() {
+        return new Object[] { new Object[] { 1, 2, 3 }, new Object[] { -10, 30, 20 }, new Object[] { Integer.MAX_VALUE, 2, Integer.MAX_VALUE }, new Object[] { Integer.MIN_VALUE, -8, Integer.MIN_VALUE } };
+    }
+
+    @Test
+    @Parameters(source = TestDataProvider.class)
+    public void whenWithNamedClass_thenSafeAdd(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+    @Test
+    @FileParameters("src/test/resources/JunitParamsTestParameters.csv")
+    public void whenWithCsvFile_thenSafeAdd(int a, int b, int expectedValue) {
+        assertEquals(expectedValue, serviceUnderTest.safeAdd(a, b));
+    }
+
+}

testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java

@@ -0,0 +1,13 @@
+package com.baeldung.junitparams;
+
+public class TestDataProvider {
+
+    public static Object[] provideBasicData() {
+        return new Object[] { new Object[] { 1, 2, 3 }, new Object[] { -10, 30, 20 }, new Object[] { 15, -5, 10 }, new Object[] { -5, -10, -15 } };
+    }
+
+    public static Object[] provideEdgeCaseData() {
+        return new Object[] { new Object[] { Integer.MAX_VALUE, 2, Integer.MAX_VALUE }, new Object[] { Integer.MIN_VALUE, -2, Integer.MIN_VALUE }, };
+    }
+
+}

testing/src/test/resources/JunitParamsTestParameters.csv

@@ -0,0 +1,4 @@
+1,2,3
+-10, 30, 20
+15, -5, 10
+-5, -10, -15