list = new ArrayList<>();
+
+ public void populateList() {
+ for (int i = 0; i < 10000000; i++) {
+ list.add(Math.random());
+ }
+ System.out.println("Debug Point 2");
+ }
+
+ public static void main(String[] args) {
+ System.out.println("Debug Point 1");
+ new StaticFieldsDemo().populateList();
+ System.out.println("Debug Point 3");
+ }
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java b/core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
new file mode 100644
index 0000000000..e2259e4249
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
@@ -0,0 +1,149 @@
+package com.baeldung.passwordhashing;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+
+/**
+ * Hash passwords for storage, and test passwords against password tokens.
+ *
+ * Instances of this class can be used concurrently by multiple threads.
+ *
+ * @author erickson
+ * @see StackOverflow
+ */
+public final class PBKDF2Hasher
+{
+
+ /**
+ * Each token produced by this class uses this identifier as a prefix.
+ */
+ public static final String ID = "$31$";
+
+ /**
+ * The minimum recommended cost, used by default
+ */
+ public static final int DEFAULT_COST = 16;
+
+ private static final String ALGORITHM = "PBKDF2WithHmacSHA1";
+
+ private static final int SIZE = 128;
+
+ private static final Pattern layout = Pattern.compile("\\$31\\$(\\d\\d?)\\$(.{43})");
+
+ private final SecureRandom random;
+
+ private final int cost;
+
+ public PBKDF2Hasher()
+ {
+ this(DEFAULT_COST);
+ }
+
+ /**
+ * Create a password manager with a specified cost
+ *
+ * @param cost the exponential computational cost of hashing a password, 0 to 30
+ */
+ public PBKDF2Hasher(int cost)
+ {
+ iterations(cost); /* Validate cost */
+ this.cost = cost;
+ this.random = new SecureRandom();
+ }
+
+ private static int iterations(int cost)
+ {
+ if ((cost < 0) || (cost > 30))
+ throw new IllegalArgumentException("cost: " + cost);
+ return 1 << cost;
+ }
+
+ /**
+ * Hash a password for storage.
+ *
+ * @return a secure authentication token to be stored for later authentication
+ */
+ public String hash(char[] password)
+ {
+ byte[] salt = new byte[SIZE / 8];
+ random.nextBytes(salt);
+ byte[] dk = pbkdf2(password, salt, 1 << cost);
+ byte[] hash = new byte[salt.length + dk.length];
+ System.arraycopy(salt, 0, hash, 0, salt.length);
+ System.arraycopy(dk, 0, hash, salt.length, dk.length);
+ Base64.Encoder enc = Base64.getUrlEncoder().withoutPadding();
+ return ID + cost + '$' + enc.encodeToString(hash);
+ }
+
+ /**
+ * Authenticate with a password and a stored password token.
+ *
+ * @return true if the password and token match
+ */
+ public boolean checkPassword(char[] password, String token)
+ {
+ Matcher m = layout.matcher(token);
+ if (!m.matches())
+ throw new IllegalArgumentException("Invalid token format");
+ int iterations = iterations(Integer.parseInt(m.group(1)));
+ byte[] hash = Base64.getUrlDecoder().decode(m.group(2));
+ byte[] salt = Arrays.copyOfRange(hash, 0, SIZE / 8);
+ byte[] check = pbkdf2(password, salt, iterations);
+ int zero = 0;
+ for (int idx = 0; idx < check.length; ++idx)
+ zero |= hash[salt.length + idx] ^ check[idx];
+ return zero == 0;
+ }
+
+ private static byte[] pbkdf2(char[] password, byte[] salt, int iterations)
+ {
+ KeySpec spec = new PBEKeySpec(password, salt, iterations, SIZE);
+ try {
+ SecretKeyFactory f = SecretKeyFactory.getInstance(ALGORITHM);
+ return f.generateSecret(spec).getEncoded();
+ }
+ catch (NoSuchAlgorithmException ex) {
+ throw new IllegalStateException("Missing algorithm: " + ALGORITHM, ex);
+ }
+ catch (InvalidKeySpecException ex) {
+ throw new IllegalStateException("Invalid SecretKeyFactory", ex);
+ }
+ }
+
+ /**
+ * Hash a password in an immutable {@code String}.
+ *
+ * Passwords should be stored in a {@code char[]} so that it can be filled
+ * with zeros after use instead of lingering on the heap and elsewhere.
+ *
+ * @deprecated Use {@link #hash(char[])} instead
+ */
+ @Deprecated
+ public String hash(String password)
+ {
+ return hash(password.toCharArray());
+ }
+
+ /**
+ * Authenticate with a password in an immutable {@code String} and a stored
+ * password token.
+ *
+ * @deprecated Use {@link #checkPassword(char[],String)} instead.
+ * @see #hash(String)
+ */
+ @Deprecated
+ public boolean checkPassword(String password, String token)
+ {
+ return checkPassword(password.toCharArray(), token);
+ }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java b/core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
new file mode 100644
index 0000000000..4f5337f963
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
@@ -0,0 +1,35 @@
+package com.baeldung.passwordhashing;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+
+/** A really simple SHA_512 Encryption example.
+ *
+ */
+public class SHA512Hasher {
+
+ public String hash(String passwordToHash, byte[] salt){
+ String generatedPassword = null;
+ try {
+ MessageDigest md = MessageDigest.getInstance("SHA-512");
+ md.update(salt);
+ byte[] bytes = md.digest(passwordToHash.getBytes(StandardCharsets.UTF_8));
+ StringBuilder sb = new StringBuilder();
+ for(int i=0; i< bytes.length ;i++){
+ sb.append(Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1));
+ }
+ generatedPassword = sb.toString();
+ }
+ catch (NoSuchAlgorithmException e){
+ e.printStackTrace();
+ }
+ return generatedPassword;
+ }
+
+ public boolean checkPassword(String hash, String attempt, byte[] salt){
+ String generatedHash = hash(attempt, salt);
+ return hash.equals(generatedHash);
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java b/core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
new file mode 100644
index 0000000000..36c9b65070
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
@@ -0,0 +1,18 @@
+package com.baeldung.passwordhashing;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import java.security.spec.KeySpec;
+
+/** A really simple SimplePBKDF2 Encryption example.
+ *
+ */
+public class SimplePBKDF2Hasher {
+
+ public static String hashSimple(String password, byte[] salt) throws Exception{
+ KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 128);
+ SecretKeyFactory f = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+ byte[] hash = f.generateSecret(spec).getEncoded();
+ return String.valueOf(hash);
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java b/core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
new file mode 100644
index 0000000000..69e151bfcb
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
@@ -0,0 +1,70 @@
+package com.baeldung.switchstatement;
+
+public class SwitchStatement {
+
+ public String exampleOfIF(String animal) {
+
+ String result;
+
+ if (animal.equals("DOG") || animal.equals("CAT")) {
+ result = "domestic animal";
+ } else if (animal.equals("TIGER")) {
+ result = "wild animal";
+ } else {
+ result = "unknown animal";
+ }
+ return result;
+ }
+
+ public String exampleOfSwitch(String animal) {
+
+ String result;
+
+ switch (animal) {
+ case "DOG":
+ case "CAT":
+ result = "domestic animal";
+ break;
+ case "TIGER":
+ result = "wild animal";
+ break;
+ default:
+ result = "unknown animal";
+ break;
+ }
+ return result;
+ }
+
+ public String forgetBreakInSwitch(String animal) {
+
+ String result;
+
+ switch (animal) {
+
+ case "DOG":
+ System.out.println("domestic animal");
+ result = "domestic animal";
+
+ default:
+ System.out.println("unknown animal");
+ result = "unknown animal";
+
+ }
+ return result;
+ }
+
+ public String constantCaseValue(String animal) {
+
+ String result = "";
+
+ final String dog = "DOG";
+
+ switch (animal) {
+
+ case dog:
+ result = "domestic animal";
+ }
+ return result;
+ }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
new file mode 100644
index 0000000000..fb92eb8d0d
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
@@ -0,0 +1,13 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+public class OffsetDateTimeExample {
+
+ public OffsetDateTime getCurrentTimeByZoneOffset(String offset) {
+ ZoneOffset zoneOffSet= ZoneOffset.of(offset);
+ OffsetDateTime date = OffsetDateTime.now(zoneOffSet);
+ return date;
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
new file mode 100644
index 0000000000..58e2d4d5ad
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
@@ -0,0 +1,13 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
+
+public class OffsetTimeExample {
+
+ public OffsetTime getCurrentTimeByZoneOffset(String offset) {
+ ZoneOffset zoneOffSet = ZoneOffset.of(offset);
+ OffsetTime time = OffsetTime.now(zoneOffSet);
+ return time;
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
new file mode 100644
index 0000000000..b54b8c5225
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
@@ -0,0 +1,21 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+public class ZoneDateTimeExample {
+
+ public ZonedDateTime getCurrentTimeByZoneId(String region) {
+ ZoneId zone = ZoneId.of(region);
+ ZonedDateTime date = ZonedDateTime.now(zone);
+ return date;
+ }
+
+ public ZonedDateTime convertZonedDateTime(ZonedDateTime sourceDate, String destZone) {
+
+ ZoneId destZoneId = ZoneId.of(destZone);
+ ZonedDateTime destDate = sourceDate.withZoneSameInstant(destZoneId);
+
+ return destDate;
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java b/core-java/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java
new file mode 100644
index 0000000000..3fa1db18d2
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/memoryleaks/equalshashcode/PersonMemoryLeakUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.memoryleaks.equalshashcode;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class PersonMemoryLeakUnitTest {
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenMap_whenEqualsAndHashCodeNotOverridden_thenMemoryLeak() {
+ Map map = new HashMap();
+ for(int i=0; i<10000000; i++) {
+ map.put(new Person("jon"), 1);
+ }
+ assertTrue(map.size() > 1);
+ System.out.print("Debug Point - VisuaLVM");
+ }
+
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenMap_whenEqualsAndHashCodeOverridden_thenNoMemoryLeak() {
+ Map map = new HashMap();
+ for(int i=0; i<10000; i++) {
+ map.put(new PersonOptimized("jon"), 1);
+ }
+ assertTrue(map.size() == 1);
+ System.out.print("Debug Point - VisuaLVM");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java b/core-java/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java
new file mode 100644
index 0000000000..b6d81a8968
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/memoryleaks/finalize/FinalizeMemoryLeakUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.memoryleaks.finalize;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class FinalizeMemoryLeakUnitTest {
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenObjectWithFinalizer_whenCreatingAndDestroyingThisObject_thenMemoryLeak() {
+ BulkyObject[] stock = new BulkyObject[100000];
+
+ for(int i=0; i<100000; i++) {
+ stock[i] = new BulkyObject();
+ }
+ System.out.print("Debug Point - VisuaLVM");
+ }
+
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenObjectWithoutFinalizer_whenCreatingAndDestroyingThisObject_thenNoMemoryLeak() {
+ BulkyObjectOptimized[] stock = new BulkyObjectOptimized[100000];
+
+ for(int i=0; i<100000; i++) {
+ stock[i] = new BulkyObjectOptimized();
+ }
+ System.out.print("Debug Point - VisuaLVM");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java b/core-java/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java
new file mode 100644
index 0000000000..0854e4a38a
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/memoryleaks/innerclass/StaticInnerClassMemoryLeakUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.memoryleaks.innerclass;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class StaticInnerClassMemoryLeakUnitTest {
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenUsingInnerClass_whenInitializingInnerClass_thenInnerClassHoldsReferenceOfOuterObject() {
+ InnerClassWrapper.SimpleInnerClass simpleInnerClassObj = new InnerClassWrapper().new SimpleInnerClass();
+ System.out.print("Debug Point - VisuaLVM");
+ }
+
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenUsingStaticNestedClass_whenInitializingInnerClass_thenStaticNestedClassDoesntReferenceOuterObject() {
+ StaticNestedClassWrapper.StaticNestedClass staticNestedClassObj = new StaticNestedClassWrapper.StaticNestedClass();
+ System.out.print("Debug Point - VisuaLVM");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java b/core-java/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java
new file mode 100644
index 0000000000..6d363e0bdc
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/memoryleaks/internedstrings/StringInternMemoryLeakUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.memoryleaks.internedstrings;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class StringInternMemoryLeakUnitTest {
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenJava6OrBelow_whenInterningLargeStrings_thenPermgenIncreases() {
+ new InternedString().readString();
+ System.out.print("Debug Point - VisuaLVM");
+ }
+
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenJava6OrBelow_whenNotInterningLargeStrings_thenPermgenDoesntIncrease() {
+ new StringObject().readString();
+ System.out.print("Debug Point - VisuaLVM");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java b/core-java/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java
new file mode 100644
index 0000000000..e64fdb73e0
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/memoryleaks/staticfields/NonStaticFieldsMemoryLeakUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.memoryleaks.staticfields;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class NonStaticFieldsMemoryLeakUnitTest {
+ public List list = new ArrayList<>();
+
+ public void populateList() {
+ for (int i = 0; i < 10000000; i++) {
+ list.add(Math.random());
+ }
+ System.out.println("Debug Point 2");
+ }
+
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenNonStaticLargeList_whenPopulatingList_thenListGarbageCollected() {
+ System.out.println("Debug Point 1");
+ new NonStaticFieldsMemoryLeakUnitTest().populateList();
+ System.out.println("Debug Point 3");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java b/core-java/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java
new file mode 100644
index 0000000000..1765f0cf0d
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/memoryleaks/staticfields/StaticFieldsMemoryLeakUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.memoryleaks.staticfields;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class StaticFieldsMemoryLeakUnitTest {
+ public static List list = new ArrayList<>();
+
+ public void populateList() {
+ for (int i = 0; i < 10000000; i++) {
+ list.add(Math.random());
+ }
+ System.out.println("Debug Point 2");
+ }
+
+ @Test
+ @Ignore // Test deliberately ignored as memory leak tests consume lots of resources
+ public void givenStaticLargeList_whenPopulatingList_thenListIsNotGarbageCollected() {
+ System.out.println("Debug Point 1");
+ new StaticFieldsDemo().populateList();
+ System.out.println("Debug Point 3");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java b/core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
new file mode 100644
index 0000000000..8e90725c77
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.passwordhashing;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+public class PBKDF2HasherUnitTest {
+
+ private PBKDF2Hasher mPBKDF2Hasher;
+
+ @Before
+ public void setUp() throws Exception {
+ mPBKDF2Hasher = new PBKDF2Hasher();
+ }
+
+ @Test
+ public void givenCorrectMessageAndHash_whenAuthenticated_checkAuthenticationSucceeds() throws Exception {
+ String message1 = "password123";
+
+ String hash1 = mPBKDF2Hasher.hash(message1.toCharArray());
+
+ assertTrue(mPBKDF2Hasher.checkPassword(message1.toCharArray(), hash1));
+
+ }
+
+ @Test
+ public void givenWrongMessage_whenAuthenticated_checkAuthenticationFails() throws Exception {
+ String message1 = "password123";
+
+ String hash1 = mPBKDF2Hasher.hash(message1.toCharArray());
+
+ String wrongPasswordAttempt = "IamWrong";
+
+ assertFalse(mPBKDF2Hasher.checkPassword(wrongPasswordAttempt.toCharArray(), hash1));
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java b/core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
new file mode 100644
index 0000000000..3acfb0ba9d
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.passwordhashing;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.security.SecureRandom;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by PhysicsSam on 06-Sep-18.
+ */
+public class SHA512HasherUnitTest {
+
+ private SHA512Hasher hasher;
+ private SecureRandom secureRandom;
+
+ @Before
+ public void setUp() throws Exception {
+ hasher = new SHA512Hasher();
+ secureRandom = new SecureRandom();
+ }
+
+ @Test
+ public void givenSamePasswordAndSalt_whenHashed_checkResultingHashesAreEqual() throws Exception {
+
+ byte[] salt = new byte[16];
+ secureRandom.nextBytes(salt);
+
+ String hash1 = hasher.hash("password", salt);
+ String hash2 = hasher.hash("password", salt);
+
+ assertEquals(hash1, hash2);
+
+ }
+
+ @Test
+ public void givenSamePasswordAndDifferentSalt_whenHashed_checkResultingHashesNotEqual() throws Exception {
+
+ byte[] salt = new byte[16];
+ secureRandom.nextBytes(salt);
+ String hash1 = hasher.hash("password", salt);
+ //generate a second salt
+ byte[] secondSalt = new byte[16];
+ String hash2 = hasher.hash("password", secondSalt);
+
+ assertNotEquals(hash1, hash2);
+
+ }
+
+ @Test
+ public void givenPredefinedHash_whenCorrectAttemptGiven_checkAuthenticationSucceeds() throws Exception {
+ byte[] salt = new byte[16];
+ secureRandom.nextBytes(salt);
+
+ String originalHash = hasher.hash("password123", salt);
+
+ assertTrue(hasher.checkPassword(originalHash, "password123", salt));
+ }
+
+ @Test
+ public void givenPredefinedHash_whenIncorrectAttemptGiven_checkAuthenticationFails() throws Exception {
+ byte[] salt = new byte[16];
+ secureRandom.nextBytes(salt);
+
+ String originalHash = hasher.hash("password123", salt);
+
+ assertFalse(hasher.checkPassword(originalHash, "password124", salt));
+ }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
new file mode 100644
index 0000000000..8dbfcaf5e7
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
@@ -0,0 +1,100 @@
+package com.baeldung.removingdecimals;
+
+import org.junit.Test;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This benchmark compares some of the approaches to formatting a floating-point
+ * value into a {@link String} while removing the decimal part.
+ *
+ * To run, simply run the {@link RemovingDecimalsManualTest#runBenchmarks()} test
+ * at the end of this class.
+ *
+ * The benchmark takes about 15 minutes to run. Since it is using {@link Mode#Throughput},
+ * higher numbers mean better performance.
+ */
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 20)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+public class RemovingDecimalsManualTest {
+ @Param(value = {"345.56", "345345345.56", "345345345345345345.56"}) double doubleValue;
+
+ NumberFormat nf;
+ DecimalFormat df;
+
+ @Setup
+ public void readyFormatters() {
+ nf = NumberFormat.getInstance();
+ nf.setMaximumFractionDigits(0);
+ df = new DecimalFormat("#,###");
+ }
+
+ @Benchmark
+ public String whenCastToInt_thenValueIsTruncated() {
+ return String.valueOf((int) doubleValue);
+ }
+
+ @Benchmark
+ public String whenUsingStringFormat_thenValueIsRounded() {
+ return String.format("%.0f", doubleValue);
+ }
+
+ @Benchmark
+ public String whenUsingNumberFormat_thenValueIsRounded() {
+ nf.setRoundingMode(RoundingMode.HALF_UP);
+ return nf.format(doubleValue);
+ }
+
+ @Benchmark
+ public String whenUsingNumberFormatWithFloor_thenValueIsTruncated() {
+ nf.setRoundingMode(RoundingMode.FLOOR);
+ return nf.format(doubleValue);
+ }
+
+ @Benchmark
+ public String whenUsingDecimalFormat_thenValueIsRounded() {
+ df.setRoundingMode(RoundingMode.HALF_UP);
+ return df.format(doubleValue);
+ }
+
+ @Benchmark
+ public String whenUsingDecimalFormatWithFloor_thenValueIsTruncated() {
+ df.setRoundingMode(RoundingMode.FLOOR);
+ return df.format(doubleValue);
+ }
+
+ @Benchmark
+ public String whenUsingBigDecimalDoubleValue_thenValueIsTruncated() {
+ BigDecimal big = new BigDecimal(doubleValue);
+ big = big.setScale(0, RoundingMode.FLOOR);
+ return big.toString();
+ }
+
+ @Benchmark
+ public String whenUsingBigDecimalDoubleValueWithHalfUp_thenValueIsRounded() {
+ BigDecimal big = new BigDecimal(doubleValue);
+ big = big.setScale(0, RoundingMode.HALF_UP);
+ return big.toString();
+ }
+
+ @Test
+ public void runBenchmarks() throws Exception {
+ Options options = new OptionsBuilder()
+ .include(this.getClass().getSimpleName()).threads(1)
+ .forks(1).shouldFailOnError(true).shouldDoGC(true)
+ .jvmArgs("-server").build();
+
+ new Runner(options).run();
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
new file mode 100644
index 0000000000..2f634b553b
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
@@ -0,0 +1,95 @@
+package com.baeldung.removingdecimals;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * Tests that demonstrate some different approaches for formatting a
+ * floating-point value into a {@link String} while removing the decimal part.
+ */
+public class RemovingDecimalsUnitTest {
+ private final double doubleValue = 345.56;
+
+ @Test
+ public void whenCastToInt_thenValueIsTruncated() {
+ String truncated = String.valueOf((int) doubleValue);
+ assertEquals("345", truncated);
+ }
+
+ @Test
+ public void givenALargeDouble_whenCastToInt_thenValueIsNotTruncated() {
+ double outOfIntRange = 6_000_000_000.56;
+ String truncationAttempt = String.valueOf((int) outOfIntRange);
+ assertNotEquals("6000000000", truncationAttempt);
+ }
+
+ @Test
+ public void whenUsingStringFormat_thenValueIsRounded() {
+ String rounded = String.format("%.0f", doubleValue);
+ assertEquals("346", rounded);
+ }
+
+ @Test
+ public void givenALargeDouble_whenUsingStringFormat_thenValueIsStillRounded() {
+ double outOfIntRange = 6_000_000_000.56;
+ String rounded = String.format("%.0f", outOfIntRange);
+ assertEquals("6000000001", rounded);
+ }
+
+ @Test
+ public void whenUsingNumberFormat_thenValueIsRounded() {
+ NumberFormat nf = NumberFormat.getInstance();
+ nf.setMaximumFractionDigits(0);
+ nf.setRoundingMode(RoundingMode.HALF_UP);
+ String rounded = nf.format(doubleValue);
+ assertEquals("346", rounded);
+ }
+
+ @Test
+ public void whenUsingNumberFormatWithFloor_thenValueIsTruncated() {
+ NumberFormat nf = NumberFormat.getInstance();
+ nf.setMaximumFractionDigits(0);
+ nf.setRoundingMode(RoundingMode.FLOOR);
+ String truncated = nf.format(doubleValue);
+ assertEquals("345", truncated);
+ }
+
+ @Test
+ public void whenUsingDecimalFormat_thenValueIsRounded() {
+ DecimalFormat df = new DecimalFormat("#,###");
+ df.setRoundingMode(RoundingMode.HALF_UP);
+ String rounded = df.format(doubleValue);
+ assertEquals("346", rounded);
+ }
+
+ @Test
+ public void whenUsingDecimalFormatWithFloor_thenValueIsTruncated() {
+ DecimalFormat df = new DecimalFormat("#,###");
+ df.setRoundingMode(RoundingMode.FLOOR);
+ String truncated = df.format(doubleValue);
+ assertEquals("345", truncated);
+ }
+
+ @Test
+ public void whenUsingBigDecimalDoubleValue_thenValueIsTruncated() {
+ BigDecimal big = new BigDecimal(doubleValue);
+ big = big.setScale(0, RoundingMode.FLOOR);
+ String truncated = big.toString();
+ assertEquals("345", truncated);
+ }
+
+ @Test
+ public void whenUsingBigDecimalDoubleValueWithHalfUp_thenValueIsRounded() {
+ BigDecimal big = new BigDecimal(doubleValue);
+ big = big.setScale(0, RoundingMode.HALF_UP);
+ String truncated = big.toString();
+ assertEquals("346", truncated);
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java b/core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
new file mode 100644
index 0000000000..e8ac645531
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.switchstatement;
+
+import org.junit.Test;
+
+import org.junit.Assert;
+
+public class SwitchStatementUnitTest {
+ private SwitchStatement s = new SwitchStatement();
+
+
+ @Test
+ public void whenDog_thenDomesticAnimal() {
+
+ String animal = "DOG";
+ Assert.assertEquals("domestic animal", s.exampleOfSwitch(animal));
+ }
+
+ @Test
+ public void whenNoBreaks_thenGoThroughBlocks() {
+ String animal = "DOG";
+ Assert.assertEquals("unknown animal", s.forgetBreakInSwitch(animal));
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void whenSwitchAgumentIsNull_thenNullPointerException() {
+ String animal = null;
+ Assert.assertEquals("domestic animal", s.exampleOfSwitch(animal));
+ }
+
+
+ @Test
+ public void whenCompareStrings_thenByEqual() {
+ String animal = new String("DOG");
+ Assert.assertEquals("domestic animal", s.exampleOfSwitch(animal));
+ }
+
+
+}
diff --git a/core-java/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java b/core-java/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
new file mode 100644
index 0000000000..6b292ad8ab
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.ternaryoperator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class TernaryOperatorUnitTest {
+
+ @Test
+ public void givenACondition_whenUsingTernaryOperator_thenItEvaluatesConditionAndReturnsAValue() {
+ int number = 10;
+ String msg = number > 10 ? "Number is greater than 10" : "Number is less than or equal to 10";
+
+ assertThat(msg).isEqualTo("Number is less than or equal to 10");
+ }
+
+ @Test
+ public void givenATrueCondition_whenUsingTernaryOperator_thenOnlyExpression1IsEvaluated() {
+ int exp1 = 0, exp2 = 0;
+ int result = 12 > 10 ? ++exp1 : ++exp2;
+
+ assertThat(exp1).isEqualTo(1);
+ assertThat(exp2).isEqualTo(0);
+ assertThat(result).isEqualTo(1);
+ }
+
+ @Test
+ public void givenAFalseCondition_whenUsingTernaryOperator_thenOnlyExpression2IsEvaluated() {
+ int exp1 = 0, exp2 = 0;
+ int result = 8 > 10 ? ++exp1 : ++exp2;
+
+ assertThat(exp1).isEqualTo(0);
+ assertThat(exp2).isEqualTo(1);
+ assertThat(result).isEqualTo(1);
+ }
+
+ @Test
+ public void givenANestedCondition_whenUsingTernaryOperator_thenCorrectValueIsReturned() {
+ int number = 6;
+ String msg = number > 10 ? "Number is greater than 10" : number > 5 ? "Number is greater than 5" : "Number is less than or equal to 5";
+
+ assertThat(msg).isEqualTo("Number is greater than 5");
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
new file mode 100644
index 0000000000..a08d3737cd
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+import org.junit.Test;
+
+public class OffsetDateTimeExampleUnitTest {
+
+ OffsetDateTimeExample offsetDateTimeExample = new OffsetDateTimeExample();
+
+ @Test
+ public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
+ String offset = "+02:00";
+ OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(offset);
+
+ assertTrue(time.getOffset()
+ .equals(ZoneOffset.of(offset)));
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
new file mode 100644
index 0000000000..488f934179
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
+
+import org.junit.Test;
+
+public class OffsetTimeExampleUnitTest {
+
+ OffsetTimeExample offsetTimeExample = new OffsetTimeExample();
+
+ @Test
+ public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
+ String offset = "+02:00";
+ OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(offset);
+
+ assertTrue(time.getOffset()
+ .equals(ZoneOffset.of(offset)));
+ }
+}
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
new file mode 100644
index 0000000000..e78ff3e3fd
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+
+public class ZoneDateTimeExampleUnitTest {
+
+ ZoneDateTimeExample zoneDateTimeExample = new ZoneDateTimeExample();
+
+ @Test
+ public void givenZone_whenGetCurrentTime_thenResultHasZone() {
+ String zone = "Europe/Berlin";
+ ZonedDateTime time = zoneDateTimeExample.getCurrentTimeByZoneId(zone);
+
+ assertTrue(time.getZone()
+ .equals(ZoneId.of(zone)));
+ }
+
+ @Test
+ public void givenZones_whenConvertDateByZone_thenGetConstantDiff() {
+ String sourceZone = "Europe/Berlin";
+ String destZone = "Asia/Tokyo";
+ ZonedDateTime sourceDate = zoneDateTimeExample.getCurrentTimeByZoneId(sourceZone);
+ ZonedDateTime destDate = zoneDateTimeExample.convertZonedDateTime(sourceDate, destZone);
+
+ assertTrue(sourceDate.toInstant()
+ .compareTo(destDate.toInstant()) == 0);
+ }
+}
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index f63451bc02..7d8d5213d1 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -33,4 +33,7 @@
- [Idiomatic Logging in Kotlin](http://www.baeldung.com/kotlin-logging)
- [Kotlin Constructors](https://www.baeldung.com/kotlin-constructors)
- [Creational Design Patterns in Kotlin: Builder](https://www.baeldung.com/kotlin-builder-pattern)
-- [Kotlin Nested and Inner Classes](https://www.baeldung.com/kotlin-inner-classes)
\ No newline at end of file
+- [Kotlin Nested and Inner Classes](https://www.baeldung.com/kotlin-inner-classes)
+- [Kotlin with Ktor](https://www.baeldung.com/kotlin-ktor)
+- [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
+- [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt
new file mode 100644
index 0000000000..9c371614a4
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt
@@ -0,0 +1,48 @@
+package com.baeldung.kotlin
+
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class StringConcatenationTest {
+
+ @Test
+ fun givenTwoStrings_concatenateWithTemplates_thenEquals() {
+ val a = "Hello"
+ val b = "Baeldung"
+ val c = "$a $b"
+
+ assertEquals("Hello Baeldung", c)
+ }
+
+ @Test
+ fun givenTwoStrings_concatenateWithPlusOperator_thenEquals() {
+ val a = "Hello"
+ val b = "Baeldung"
+ val c = a + " " + b
+
+ assertEquals("Hello Baeldung", c)
+ }
+
+ @Test
+ fun givenTwoStrings_concatenateWithStringBuilder_thenEquals() {
+ val a = "Hello"
+ val b = "Baeldung"
+
+ val builder = StringBuilder()
+ builder.append(a).append(" ").append(b)
+
+ val c = builder.toString()
+
+ assertEquals("Hello Baeldung", c)
+ }
+
+ @Test
+ fun givenTwoStrings_concatenateWithPlusMethod_thenEquals() {
+ val a = "Hello"
+ val b = "Baeldung"
+ val c = a.plus(" ").plus(b)
+
+ assertEquals("Hello Baeldung", c)
+ }
+
+}
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
new file mode 100644
index 0000000000..bdf44d3b49
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
@@ -0,0 +1,30 @@
+package com.baeldung.kotlin.gson
+
+import com.google.gson.Gson
+
+import org.junit.Assert
+import org.junit.Test
+
+class GsonUnitTest {
+
+ var gson = Gson()
+
+ @Test
+ fun givenObject_thenGetJSONString() {
+ var jsonString = gson.toJson(TestModel(1,"Test"))
+ Assert.assertEquals(jsonString, "{\"id\":1,\"description\":\"Test\"}")
+ }
+
+ @Test
+ fun givenJSONString_thenGetObject() {
+ var jsonString = "{\"id\":1,\"description\":\"Test\"}";
+ var testModel = gson.fromJson(jsonString, TestModel::class.java)
+ Assert.assertEquals(testModel.id, 1)
+ Assert.assertEquals(testModel.description, "Test")
+ }
+
+ data class TestModel(
+ val id: Int,
+ val description: String
+ )
+}
\ No newline at end of file
diff --git a/ejb/ejb-remote/pom.xml b/ejb/ejb-remote/pom.xml
index fffbbdb1da..dac2fefb84 100755
--- a/ejb/ejb-remote/pom.xml
+++ b/ejb/ejb-remote/pom.xml
@@ -15,7 +15,6 @@
javax
javaee-api
- ${javaee-api.version}
provided
diff --git a/ejb/ejb-session-beans/pom.xml b/ejb/ejb-session-beans/pom.xml
index 14ab0790e7..da76169729 100644
--- a/ejb/ejb-session-beans/pom.xml
+++ b/ejb/ejb-session-beans/pom.xml
@@ -24,7 +24,6 @@
javax
javaee-api
- ${javaee-api.version}
provided
diff --git a/flyway/pom.xml b/flyway/pom.xml
index b1cc58af3d..353bbfb1ec 100644
--- a/flyway/pom.xml
+++ b/flyway/pom.xml
@@ -65,6 +65,7 @@
5.0.2
5.0.2
+ 1.4.195
diff --git a/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
similarity index 98%
rename from flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java
rename to flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
index 5e96fff64d..bf30ce604d 100644
--- a/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java
+++ b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
@ContextConfiguration(classes = FlywayCallbackTestConfig.class)
-public class FlywayApplicationTest {
+public class FlywayApplicationUnitTest {
private Log log = LogFactory.getLog(getClass());
diff --git a/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java b/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java
similarity index 98%
rename from guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java
rename to guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java
index 49e367e45b..bd08225be4 100644
--- a/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java
+++ b/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java
@@ -18,9 +18,9 @@ import org.junit.Test;
import com.stackify.models.User;
import com.stackify.services.MyService;
-public class MyServiceTest {
+public class MyServiceUnitTest {
- private static final Logger logger = LogManager.getLogger(MyServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(MyServiceUnitTest.class);
@Test
public void testService() {
diff --git a/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java b/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java
similarity index 98%
rename from guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java
rename to guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java
index 187b27e1df..a3051f7087 100644
--- a/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java
+++ b/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java
@@ -9,7 +9,7 @@ import com.stackify.models.Employee;
import ch.qos.logback.classic.Level;
-public class EmployeeServiceTest {
+public class EmployeeServiceUnitTest {
private static final Logger logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
private EmployeeService employeeService = new EmployeeService();
diff --git a/guest/spring-mvc/pom.xml b/guest/spring-mvc/pom.xml
index 42543b5be0..c0ef451605 100644
--- a/guest/spring-mvc/pom.xml
+++ b/guest/spring-mvc/pom.xml
@@ -12,7 +12,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.0.M5
+ 2.0.0.RELEASE
diff --git a/guest/spring-security/pom.xml b/guest/spring-security/pom.xml
index baca3bce85..8be42ba32b 100644
--- a/guest/spring-security/pom.xml
+++ b/guest/spring-security/pom.xml
@@ -11,7 +11,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.0.M6
+ 2.0.0.RELEASE
diff --git a/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java b/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java
similarity index 95%
rename from guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java
rename to guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java
index 064951fbbe..be3992b7f7 100644
--- a/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java
+++ b/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java
@@ -6,7 +6,7 @@ import io.restassured.RestAssured;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
-public class UserServiceTest {
+public class UserServiceLiveTest {
@Test
public void whenAddUser_thenGetUserOk() {
RestAssured.baseURI = "http://localhost:8080/rest-server";
diff --git a/hibernate5/README.md b/hibernate5/README.md
index 8f2f8eb469..b67ab7115f 100644
--- a/hibernate5/README.md
+++ b/hibernate5/README.md
@@ -14,3 +14,4 @@
- [Bootstrapping JPA Programmatically in Java](http://www.baeldung.com/java-bootstrap-jpa)
- [Optimistic Locking in JPA](http://www.baeldung.com/jpa-optimistic-locking)
- [Hibernate Entity Lifecycle](https://www.baeldung.com/hibernate-entity-lifecycle)
+- [@JoinColumn Annotation Explained](https://www.baeldung.com/jpa-join-column)
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
index 23d7d2e201..2212e736ab 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -1,5 +1,11 @@
package com.baeldung.hibernate;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import com.baeldung.hibernate.entities.DeptEmployee;
import com.baeldung.hibernate.optimisticlocking.OptimisticLockingCourse;
import com.baeldung.hibernate.optimisticlocking.OptimisticLockingStudent;
import com.baeldung.hibernate.pessimisticlocking.Individual;
@@ -16,10 +22,30 @@ import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistry;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
+import com.baeldung.hibernate.pojo.Course;
+import com.baeldung.hibernate.pojo.Employee;
+import com.baeldung.hibernate.pojo.EntityDescription;
+import com.baeldung.hibernate.pojo.OrderEntry;
+import com.baeldung.hibernate.pojo.OrderEntryIdClass;
+import com.baeldung.hibernate.pojo.OrderEntryPK;
+import com.baeldung.hibernate.pojo.Person;
+import com.baeldung.hibernate.pojo.Phone;
+import com.baeldung.hibernate.pojo.PointEntity;
+import com.baeldung.hibernate.pojo.PolygonEntity;
+import com.baeldung.hibernate.pojo.Product;
+import com.baeldung.hibernate.pojo.Student;
+import com.baeldung.hibernate.pojo.TemporalValues;
+import com.baeldung.hibernate.pojo.User;
+import com.baeldung.hibernate.pojo.UserProfile;
+import com.baeldung.hibernate.pojo.inheritance.Animal;
+import com.baeldung.hibernate.pojo.inheritance.Bag;
+import com.baeldung.hibernate.pojo.inheritance.Book;
+import com.baeldung.hibernate.pojo.inheritance.Car;
+import com.baeldung.hibernate.pojo.inheritance.MyEmployee;
+import com.baeldung.hibernate.pojo.inheritance.MyProduct;
+import com.baeldung.hibernate.pojo.inheritance.Pen;
+import com.baeldung.hibernate.pojo.inheritance.Pet;
+import com.baeldung.hibernate.pojo.inheritance.Vehicle;
public class HibernateUtil {
private static SessionFactory sessionFactory;
@@ -72,6 +98,8 @@ public class HibernateUtil {
metadataSources.addAnnotatedClass(PessimisticLockingCourse.class);
metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Customer.class);
metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Address.class);
+ metadataSources.addAnnotatedClass(DeptEmployee.class);
+ metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Department.class);
metadataSources.addAnnotatedClass(OptimisticLockingCourse.class);
metadataSources.addAnnotatedClass(OptimisticLockingStudent.class);
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
new file mode 100644
index 0000000000..ff94f4f849
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -0,0 +1,45 @@
+package com.baeldung.hibernate.entities;
+
+import java.util.List;
+
+import javax.persistence.*;
+
+@Entity
+public class Department {
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE)
+ private long id;
+
+ private String name;
+
+ @OneToMany(mappedBy="department")
+ private List employees;
+
+ public Department(String name) {
+ this.name = name;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List getEmployees() {
+ return employees;
+ }
+
+ public void setEmployees(List employees) {
+ this.employees = employees;
+ }
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
new file mode 100644
index 0000000000..7a51009b62
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
@@ -0,0 +1,65 @@
+package com.baeldung.hibernate.entities;
+
+import javax.persistence.*;
+
+@Entity
+public class DeptEmployee {
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE)
+ private long id;
+
+ private String employeeNumber;
+
+ private String designation;
+
+ private String name;
+
+ @ManyToOne
+ private Department department;
+
+ public DeptEmployee(String name, String employeeNumber, Department department) {
+ this.name = name;
+ this.employeeNumber = employeeNumber;
+ this.department = department;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getEmployeeNumber() {
+ return employeeNumber;
+ }
+
+ public void setEmployeeNumber(String employeeNumber) {
+ this.employeeNumber = employeeNumber;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Department getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(Department department) {
+ this.department = department;
+ }
+
+ public String getDesignation() {
+ return designation;
+ }
+
+ public void setDesignation(String designation) {
+ this.designation = designation;
+ }
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
new file mode 100644
index 0000000000..607269a267
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
@@ -0,0 +1,31 @@
+package com.baeldung.hibernate.pojo;
+
+public class Result {
+ private String employeeName;
+
+ private String departmentName;
+
+ public Result(String employeeName, String departmentName) {
+ this.employeeName = employeeName;
+ this.departmentName = departmentName;
+ }
+
+ public Result() {
+ }
+
+ public String getEmployeeName() {
+ return employeeName;
+ }
+
+ public void setEmployeeName(String employeeName) {
+ this.employeeName = employeeName;
+ }
+
+ public String getDepartmentName() {
+ return departmentName;
+ }
+
+ public void setDepartmentName(String departmentName) {
+ this.departmentName = departmentName;
+ }
+}
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
new file mode 100644
index 0000000000..29ae55b773
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
@@ -0,0 +1,77 @@
+package com.baeldung.hibernate;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.baeldung.hibernate.entities.DeptEmployee;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+import org.hibernate.transform.Transformers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.hibernate.entities.Department;
+import com.baeldung.hibernate.pojo.Result;
+
+public class CustomClassIntegrationTest {
+
+ private Session session;
+
+ private Transaction transaction;
+
+ @BeforeEach
+ public void setUp() throws IOException {
+ session = HibernateUtil.getSessionFactory().openSession();
+ transaction = session.beginTransaction();
+ session.createNativeQuery("delete from manager").executeUpdate();
+ session.createNativeQuery("delete from department").executeUpdate();
+ Department department = new Department("Sales");
+ DeptEmployee employee = new DeptEmployee("John Smith", "001", department);
+ session.persist(department);
+ session.persist(employee);
+ transaction.commit();
+ transaction = session.beginTransaction();
+ }
+
+ @Test
+ public void whenAllManagersAreSelected_ThenObjectGraphIsReturned() {
+ Query query = session.createQuery("from com.baeldung.hibernate.entities.DeptEmployee");
+ List deptEmployees = query.list();
+ DeptEmployee deptEmployee = deptEmployees.get(0);
+ assertEquals("John Smith", deptEmployee.getName());
+ assertEquals("Sales", deptEmployee.getDepartment().getName());
+ }
+
+ @Test
+ public void whenIndividualPropertiesAreSelected_ThenObjectArrayIsReturned() {
+ Query query = session.createQuery("select m.name, m.department.name from com.baeldung.hibernate.entities.DeptEmployee m");
+ List managers = query.list();
+ Object[] manager = (Object[]) managers.get(0);
+ assertEquals("John Smith", manager[0]);
+ assertEquals("Sales", manager[1]);
+ }
+
+ @Test
+ public void whenResultConstructorInSelect_ThenListOfResultIsReturned() {
+ Query query = session.createQuery("select new com.baeldung.hibernate.pojo.Result(m.name, m.department.name) "
+ + "from DeptEmployee m");
+ List results = query.list();
+ Result result = results.get(0);
+ assertEquals("John Smith", result.getEmployeeName());
+ assertEquals("Sales", result.getDepartmentName());
+ }
+
+ @Test
+ public void whenResultTransformerOnQuery_ThenListOfResultIsReturned() {
+ Query query = session.createQuery("select m.name as employeeName, m.department.name as departmentName "
+ + "from com.baeldung.hibernate.entities.DeptEmployee m");
+ query.setResultTransformer(Transformers.aliasToBean(Result.class));
+ List results = query.list();
+ Result result = results.get(0);
+ assertEquals("John Smith", result.getEmployeeName());
+ assertEquals("Sales", result.getDepartmentName());
+ }
+}
diff --git a/java-dates/src/main/java/com/baeldung/date/AgeCalculator.java b/java-dates/src/main/java/com/baeldung/date/AgeCalculator.java
new file mode 100644
index 0000000000..c031c97dec
--- /dev/null
+++ b/java-dates/src/main/java/com/baeldung/date/AgeCalculator.java
@@ -0,0 +1,32 @@
+package com.baeldung.date;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.util.Date;
+import org.joda.time.Years;
+
+public class AgeCalculator {
+
+ public int calculateAge(LocalDate birthDate, LocalDate currentDate) {
+ // validate inputs ...
+ return Period.between(birthDate, currentDate)
+ .getYears();
+ }
+
+ public int calculateAgeWithJodaTime(org.joda.time.LocalDate birthDate, org.joda.time.LocalDate currentDate) {
+ // validate inputs ...
+ Years age = Years.yearsBetween(birthDate, currentDate);
+ return age.getYears();
+ }
+
+ public int calculateAgeWithJava7(Date birthDate, Date currentDate) {
+ // validate inputs ...
+ DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+ int d1 = Integer.parseInt(formatter.format(birthDate));
+ int d2 = Integer.parseInt(formatter.format(currentDate));
+ int age = (d2 - d1) / 10000;
+ return age;
+ }
+}
\ No newline at end of file
diff --git a/java-dates/src/test/java/com/baeldung/date/AgeCalculatorUnitTest.java b/java-dates/src/test/java/com/baeldung/date/AgeCalculatorUnitTest.java
new file mode 100644
index 0000000000..dcd261337c
--- /dev/null
+++ b/java-dates/src/test/java/com/baeldung/date/AgeCalculatorUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.date;
+
+import static org.junit.Assert.assertEquals;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+import org.junit.jupiter.api.Test;
+
+public class AgeCalculatorUnitTest {
+ AgeCalculator ageCalculator = new AgeCalculator();
+
+ @Test
+ public void givenLocalDate_whenCalculateAge_thenOk() {
+ assertEquals(10, ageCalculator.calculateAge(LocalDate.of(2008, 5, 20), LocalDate.of(2018, 9, 20)));
+ }
+
+ @Test
+ public void givenJodaTime_whenCalculateAge_thenOk() {
+ assertEquals(10, ageCalculator.calculateAgeWithJodaTime(new org.joda.time.LocalDate(2008, 5, 20), new org.joda.time.LocalDate(2018, 9, 20)));
+ }
+
+ @Test
+ public void givenDate_whenCalculateAge_thenOk() throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
+ Date birthDate = sdf.parse("2008-05-20");
+ Date currentDate = sdf.parse("2018-09-20");
+ assertEquals(10, ageCalculator.calculateAgeWithJava7(birthDate, currentDate));
+ }
+
+}
\ No newline at end of file
diff --git a/java-difference-date/src/test/java/com/baeldung/DateDiffTest.java b/java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java
similarity index 98%
rename from java-difference-date/src/test/java/com/baeldung/DateDiffTest.java
rename to java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java
index 4203f7ef38..2c5323be6f 100644
--- a/java-difference-date/src/test/java/com/baeldung/DateDiffTest.java
+++ b/java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
-public class DateDiffTest {
+public class DateDiffUnitTest {
@Test
public void givenTwoDatesBeforeJava8_whenDifferentiating_thenWeGetSix() throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy", Locale.ENGLISH);
diff --git a/java-ee-8-security-api/pom.xml b/java-ee-8-security-api/pom.xml
index 5490cd40f7..3d235e10a8 100644
--- a/java-ee-8-security-api/pom.xml
+++ b/java-ee-8-security-api/pom.xml
@@ -3,11 +3,16 @@
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">
4.0.0
- com.baeldung
java-ee-8-security-api
1.0-SNAPSHOT
pom
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
+
@@ -53,10 +58,6 @@
- 1.8
- 1.8
- UTF-8
-
9080
9443
diff --git a/java-numbers/src/main/java/com/baeldung/percentage/PercentageCalculator.java b/java-numbers/src/main/java/com/baeldung/percentage/PercentageCalculator.java
new file mode 100644
index 0000000000..e74de2cc67
--- /dev/null
+++ b/java-numbers/src/main/java/com/baeldung/percentage/PercentageCalculator.java
@@ -0,0 +1,21 @@
+package com.baeldung.percentage;
+
+import java.util.Scanner;
+
+public class PercentageCalculator {
+
+ public double calculatePercentage(double obtained,double total){
+ return obtained*100/total;
+ }
+
+ public static void main(String[] args) {
+ PercentageCalculator pc = new PercentageCalculator();
+ Scanner in = new Scanner(System.in);
+ System.out.println("Enter obtained marks:");
+ double obtained = in.nextDouble();
+ System.out.println("Enter total marks:");
+ double total =in.nextDouble();
+ System.out.println("Percentage obtained :"+pc.calculatePercentage(obtained,total));
+ }
+
+}
diff --git a/java-numbers/src/test/java/com/baeldung/percentage/PercentageCalculatorUnitTest.java b/java-numbers/src/test/java/com/baeldung/percentage/PercentageCalculatorUnitTest.java
new file mode 100644
index 0000000000..202d4f8112
--- /dev/null
+++ b/java-numbers/src/test/java/com/baeldung/percentage/PercentageCalculatorUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.percentage;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PercentageCalculatorUnitTest {
+ private PercentageCalculator pc = new PercentageCalculator();
+
+ @Test
+ public void whenPass2Integers_thenShouldCalculatePercentage(){
+ Assert.assertEquals("Result not as expected",
+ 50.0,pc.calculatePercentage(50,100),0.1);
+ }
+
+ @Test
+ public void whenPassObtainedMarksAsDouble_thenShouldCalculatePercentage(){
+ Assert.assertEquals("Result not as expected",5.05,
+ pc.calculatePercentage(50.5,1000),0.1);
+ }
+
+ @Test
+ public void whenPassTotalMarksAsDouble_thenShouldCalculatePercentage(){
+ Assert.assertEquals("Result not as expected",19.6,
+ pc.calculatePercentage(5,25.5),0.1);
+ }
+
+ @Test
+ public void whenPass2DoubleNumbers_thenShouldCalculatePercentage(){
+ Assert.assertEquals("Result not as expected",20,
+ pc.calculatePercentage(5.5,27.5),0.1);
+ }
+
+}
diff --git a/java-streams/pom.xml b/java-streams/pom.xml
index 023a5f695b..e4670c268d 100644
--- a/java-streams/pom.xml
+++ b/java-streams/pom.xml
@@ -105,7 +105,7 @@
3.5
1.16.12
0.9.0
- 1.13
+ 1.15
0.6.5
2.10
diff --git a/java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java b/java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java
new file mode 100644
index 0000000000..1b64c8924a
--- /dev/null
+++ b/java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java
@@ -0,0 +1,209 @@
+package com.baeldung.protonpack;
+
+import com.codepoetics.protonpack.Indexed;
+import com.codepoetics.protonpack.StreamUtils;
+import com.codepoetics.protonpack.collectors.CollectorUtils;
+import com.codepoetics.protonpack.collectors.NonUniqueValueException;
+import com.codepoetics.protonpack.selectors.Selector;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.Arrays.asList;
+import static java.util.Arrays.stream;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+@SuppressWarnings("unchecked")
+public class ProtonpackUnitTest {
+ @Test
+ public void whenTakeWhile_thenTakenWhile() {
+ Stream streamOfInt = Stream.iterate(1, i -> i + 1);
+ List result = StreamUtils.takeWhile(streamOfInt, i -> i < 5).collect(Collectors.toList());
+ assertThat(result).contains(1, 2, 3, 4);
+ }
+
+ @Test
+ public void whenTakeUntil_thenTakenUntil() {
+ Stream streamOfInt = Stream.iterate(1, i -> i + 1);
+ List result = StreamUtils.takeUntil(streamOfInt, i -> i > 50).collect(Collectors.toList());
+ assertThat(result).contains(10, 20, 30, 40);
+ }
+
+ @Test
+ public void givenMultipleStream_whenZipped_thenZipped() {
+ String[] clubs = { "Juventus", "Barcelona", "Liverpool", "PSG" };
+ String[] players = { "Ronaldo", "Messi", "Salah" };
+ Set zippedFrom2Sources = StreamUtils.zip(stream(clubs), stream(players), (club, player) -> club + " " + player)
+ .collect(Collectors.toSet());
+ assertThat(zippedFrom2Sources).contains("Juventus Ronaldo", "Barcelona Messi", "Liverpool Salah");
+
+ String[] leagues = { "Serie A", "La Liga", "Premier League" };
+ Set zippedFrom3Sources = StreamUtils.zip(stream(clubs), stream(players), stream(leagues),
+ (club, player, league) -> club + " " + player + " " + league).collect(Collectors.toSet());
+ assertThat(zippedFrom3Sources).contains("Juventus Ronaldo Serie A", "Barcelona Messi La Liga",
+ "Liverpool Salah Premier League");
+ }
+
+ @Test
+ public void whenZippedWithIndex_thenZippedWithIndex() {
+ Stream streamOfClubs = Stream.of("Juventus", "Barcelona", "Liverpool");
+ Set> zipsWithIndex = StreamUtils.zipWithIndex(streamOfClubs).collect(Collectors.toSet());
+ assertThat(zipsWithIndex).contains(Indexed.index(0, "Juventus"), Indexed.index(1, "Barcelona"),
+ Indexed.index(2, "Liverpool"));
+ }
+
+ @Test
+ public void givenMultipleStream_whenMerged_thenMerged() {
+ Stream streamOfClubs = Stream.of("Juventus", "Barcelona", "Liverpool", "PSG");
+ Stream streamOfPlayers = Stream.of("Ronaldo", "Messi", "Salah");
+ Stream streamOfLeagues = Stream.of("Serie A", "La Liga", "Premier League");
+
+ Set merged = StreamUtils.merge(() -> "", (valOne, valTwo) -> valOne + " " + valTwo, streamOfClubs,
+ streamOfPlayers, streamOfLeagues).collect(Collectors.toSet());
+
+ assertThat(merged).contains(" Juventus Ronaldo Serie A", " Barcelona Messi La Liga", " Liverpool Salah Premier League",
+ " PSG");
+ }
+
+ @Test
+ public void givenMultipleStream_whenMergedToList_thenMergedToList() {
+ Stream streamOfClubs = Stream.of("Juventus", "Barcelona", "PSG");
+ Stream streamOfPlayers = Stream.of("Ronaldo", "Messi");
+
+ List> mergedListOfList = StreamUtils.mergeToList(streamOfClubs, streamOfPlayers)
+ .collect(Collectors.toList());
+ assertThat(mergedListOfList.get(0)).isInstanceOf(List.class);
+ assertThat(mergedListOfList.get(0)).containsExactly("Juventus", "Ronaldo");
+ assertThat(mergedListOfList.get(1)).containsExactly("Barcelona", "Messi");
+ assertThat(mergedListOfList.get(2)).containsExactly("PSG");
+ }
+
+ @Test
+ public void givenMultipleStream_whenInterleaved_thenInterleaved() {
+ Stream streamOfClubs = Stream.of("Juventus", "Barcelona", "Liverpool");
+ Stream streamOfPlayers = Stream.of("Ronaldo", "Messi");
+ Stream streamOfLeagues = Stream.of("Serie A", "La Liga");
+
+ AtomicInteger counter = new AtomicInteger(0);
+ Selector roundRobinSelector = (o) -> {
+ Object[] vals = (Object[]) o;
+ while (counter.get() >= vals.length || vals[counter.get()] == null) {
+ if (counter.incrementAndGet() >= vals.length)
+ counter.set(0);
+ }
+ return counter.getAndIncrement();
+ };
+ Stream interleavedStream = StreamUtils.interleave(roundRobinSelector, streamOfClubs, streamOfPlayers,
+ streamOfLeagues);
+ List interleavedList = interleavedStream.collect(Collectors.toList());
+ assertThat(interleavedList).containsExactly("Juventus", "Ronaldo", "Serie A", "Barcelona", "Messi", "La Liga",
+ "Liverpool");
+ }
+
+ @Test
+ public void whenSkippedUntil_thenSkippedUntil() {
+ Integer[] numbers = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+ List skippedUntilGreaterThan5 = StreamUtils.skipUntil(stream(numbers), i -> i > 5).collect(Collectors.toList());
+ assertThat(skippedUntilGreaterThan5).containsExactly(6, 7, 8, 9, 10);
+
+ List skippedUntilLessThanEquals5 = StreamUtils.skipUntil(stream(numbers), i -> i <= 5)
+ .collect(Collectors.toList());
+ assertThat(skippedUntilLessThanEquals5).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ }
+
+ @Test
+ public void whenSkippedWhile_thenSkippedWhile() {
+ Integer[] numbers = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+ List skippedWhileLessThanEquals5 = StreamUtils.skipWhile(stream(numbers), i -> i <= 5)
+ .collect(Collectors.toList());
+ assertThat(skippedWhileLessThanEquals5).containsExactly(6, 7, 8, 9, 10);
+
+ List skippedWhileGreaterThan5 = StreamUtils.skipWhile(stream(numbers), i -> i > 5).collect(Collectors.toList());
+ assertThat(skippedWhileGreaterThan5).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ }
+
+ @Test
+ public void givenFibonacciGenerator_whenUnfolded_thenUnfolded() {
+ AtomicInteger lastValue = new AtomicInteger(0);
+ Function> fibonacciGenerator = (i) -> (i < 10) ?
+ Optional.of(i + lastValue.getAndSet(i)) :
+ Optional.empty();
+
+ List fib = StreamUtils.unfold(1, fibonacciGenerator).collect(Collectors.toList());
+ assertThat(fib).containsExactly(1, 1, 2, 3, 5, 8, 13);
+ }
+
+ @Test
+ public void whenWindowed_thenWindowed() {
+ Integer[] numbers = { 1, 2, 3, 4, 5, 6, 7 };
+
+ List> windowedWithSkip1 = StreamUtils.windowed(stream(numbers), 3, 1).collect(Collectors.toList());
+ assertThat(windowedWithSkip1).containsExactly(asList(1, 2, 3), asList(2, 3, 4), asList(3, 4, 5), asList(4, 5, 6),
+ asList(5, 6, 7));
+
+ List> windowedWithSkip2 = StreamUtils.windowed(stream(numbers), 3, 2).collect(Collectors.toList());
+ assertThat(windowedWithSkip2).containsExactly(asList(1, 2, 3), asList(3, 4, 5), asList(5, 6, 7));
+ }
+
+ @Test
+ public void whenAggregated_thenAggregated() {
+ Integer[] numbers = { 1, 2, 2, 3, 4, 4, 4, 5 };
+ List> aggregated = StreamUtils.aggregate(stream(numbers), (int1, int2) -> int1.compareTo(int2) == 0)
+ .collect(Collectors.toList());
+ assertThat(aggregated).containsExactly(asList(1), asList(2, 2), asList(3), asList(4, 4, 4), asList(5));
+
+ List> aggregatedFixSize = StreamUtils.aggregate(stream(numbers), 5).collect(Collectors.toList());
+ assertThat(aggregatedFixSize).containsExactly(asList(1, 2, 2, 3, 4), asList(4, 4, 5));
+ }
+
+ @Test
+ public void whenGroupedRun_thenGroupedRun() {
+ Integer[] numbers = { 1, 1, 2, 3, 4, 4, 5 };
+ List> grouped = StreamUtils.groupRuns(stream(numbers)).collect(Collectors.toList());
+ assertThat(grouped).containsExactly(asList(1, 1), asList(2), asList(3), asList(4, 4), asList(5));
+
+ Integer[] numbers2 = { 1, 2, 3, 1 };
+ List> grouped2 = StreamUtils.groupRuns(stream(numbers2)).collect(Collectors.toList());
+ assertThat(grouped2).containsExactly(asList(1), asList(2), asList(3), asList(1));
+ }
+
+ @Test
+ public void whenAggregatedOnListCondition_thenAggregatedOnListCondition() {
+ Integer[] numbers = { 1, 1, 2, 3, 4, 4, 5 };
+ Stream> aggregated = StreamUtils.aggregateOnListCondition(stream(numbers),
+ (currentList, nextInt) -> currentList.stream().mapToInt(Integer::intValue).sum() + nextInt <= 5);
+ assertThat(aggregated).containsExactly(asList(1, 1, 2), asList(3), asList(4), asList(4), asList(5));
+ }
+
+ @Test
+ public void givenProjectionFunction_whenMaxedBy_thenMaxedBy() {
+ Stream clubs = Stream.of("Juventus", "Barcelona", "PSG");
+ Optional longestName = clubs.collect(CollectorUtils.maxBy(String::length));
+ assertThat(longestName.get()).isEqualTo("Barcelona");
+ }
+
+ @Test
+ public void givenStreamOfMultipleElem_whenUniqueCollector_thenValueReturned() {
+ Stream singleElement = Stream.of(1);
+ Optional unique = singleElement.collect(CollectorUtils.unique());
+ assertThat(unique.get()).isEqualTo(1);
+
+ }
+
+ @Test
+ public void givenStreamOfMultipleElem_whenUniqueCollector_thenExceptionThrown() {
+ Stream multipleElement = Stream.of(1, 2, 3);
+ assertThatExceptionOfType(NonUniqueValueException.class).isThrownBy(() -> {
+ multipleElement.collect(CollectorUtils.unique());
+ });
+ }
+
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/collection/StreamOperateAndRemoveUnitTest.java b/java-streams/src/test/java/com/baeldung/stream/StreamOperateAndRemoveUnitTest.java
similarity index 98%
rename from core-java-collections/src/test/java/com/baeldung/collection/StreamOperateAndRemoveUnitTest.java
rename to java-streams/src/test/java/com/baeldung/stream/StreamOperateAndRemoveUnitTest.java
index 9f002c89a2..c5aa9a1651 100644
--- a/core-java-collections/src/test/java/com/baeldung/collection/StreamOperateAndRemoveUnitTest.java
+++ b/java-streams/src/test/java/com/baeldung/stream/StreamOperateAndRemoveUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.collection;
+package com.baeldung.stream;
import java.util.ArrayList;
import java.util.List;
diff --git a/java-strings/README.md b/java-strings/README.md
index 233d986d98..249f1a351a 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -27,3 +27,6 @@
- [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string)
- [Java Check a String for Lowercase/Uppercase Letter, Special Character and Digit](https://www.baeldung.com/java-lowercase-uppercase-special-character-digit-regex)
- [Convert java.util.Date to String](https://www.baeldung.com/java-util-date-to-string)
+- [Converting a Stack Trace to a String in Java](https://www.baeldung.com/java-stacktrace-to-string)
+- [Sorting a String Alphabetically in Java](https://www.baeldung.com/java-sort-string-alphabetically)
+- [Remove Emojis from a Java String](https://www.baeldung.com/java-string-remove-emojis)
diff --git a/java-strings/pom.xml b/java-strings/pom.xml
index 2afe18f07a..b1ba49b33a 100644
--- a/java-strings/pom.xml
+++ b/java-strings/pom.xml
@@ -47,11 +47,21 @@
jmh-core
${jmh-core.version}
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+ ${jmh-core.version}
+
com.ibm.icu
icu4j
${icu4j.version}
+
+ com.google.guava
+ guava
+ ${guava.version}
+
com.vdurmont
@@ -92,6 +102,7 @@
3.6.1
1.19
61.1
+ 26.0-jre
\ No newline at end of file
diff --git a/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java b/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
index 085be66801..cdbba1ef53 100644
--- a/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
+++ b/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
@@ -2,6 +2,7 @@ package com.baeldung.string;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -32,5 +33,12 @@ public class JoinerSplitter {
.mapToObj(item -> (char) item)
.collect(Collectors.toList());
}
+
+ public static Map arrayToMap(String[] arrayOfString) {
+ return Arrays.asList(arrayOfString)
+ .stream()
+ .map(str -> str.split(":"))
+ .collect(Collectors.toMap(str -> str[0], str -> str[1]));
+ }
}
diff --git a/java-strings/src/main/java/com/baeldung/string/StringPerformance.java b/java-strings/src/main/java/com/baeldung/string/StringPerformance.java
new file mode 100644
index 0000000000..3b0c32991c
--- /dev/null
+++ b/java-strings/src/main/java/com/baeldung/string/StringPerformance.java
@@ -0,0 +1,196 @@
+package com.baeldung.string;
+
+import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringUtils;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+@BenchmarkMode(Mode.SingleShotTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Measurement(batchSize = 100000, iterations = 10)
+@Warmup(batchSize = 100000, iterations = 10)
+@State(Scope.Thread)
+public class StringPerformance {
+
+ protected String baeldung = "baeldung";
+ protected String longString = "Hello baeldung, I am a bit longer than other Strings";
+ protected String formatString = "hello %s, nice to meet you";
+ protected String formatDigit = "%d";
+ protected String emptyString = " ";
+ protected String result = "";
+
+ protected int sampleNumber = 100;
+
+ protected Pattern spacePattern = Pattern.compile(emptyString);
+ protected Pattern longPattern = Pattern.compile(longString);
+ protected List stringSplit = new ArrayList<>();
+ protected List stringTokenizer = new ArrayList<>();
+
+ @Benchmark
+ public String benchmarkStringDynamicConcat() {
+ result += baeldung;
+ return result;
+ }
+
+ @Benchmark
+ public StringBuilder benchmarkStringBuilder() {
+ StringBuilder stringBuilder = new StringBuilder(result);
+ stringBuilder.append(baeldung);
+ return stringBuilder;
+ }
+
+ @Benchmark
+ public StringBuffer benchmarkStringBuffer() {
+ StringBuffer stringBuffer = new StringBuffer(result);
+ stringBuffer.append(baeldung);
+ return stringBuffer;
+ }
+
+ @Benchmark
+ public String benchmarkStringConstructor() {
+ String result = new String("baeldung");
+ return result;
+ }
+
+ @Benchmark
+ public String benchmarkStringLiteral() {
+ String result = "baeldung";
+ return result;
+ }
+
+ @Benchmark
+ public String benchmarkStringFormat_s() {
+ return String.format(formatString, baeldung);
+ }
+
+ @Benchmark
+ public String benchmarkStringConcat() {
+ result = result.concat(baeldung);
+ return result;
+ }
+
+ @Benchmark
+ public String benchmarkStringIntern() {
+ return baeldung.intern();
+ }
+
+ @Benchmark
+ public String benchmarkStringReplace() {
+ return longString.replace("average", " average !!!");
+ }
+
+ @Benchmark
+ public String benchmarkStringUtilsReplace() {
+ return StringUtils.replace(longString, "average", " average !!!");
+ }
+
+ @Benchmark
+ public List benchmarkGuavaSplitter() {
+ return Splitter.on(" ").trimResults()
+ .omitEmptyStrings()
+ .splitToList(longString);
+ }
+
+ @Benchmark
+ public String [] benchmarkStringSplit() {
+ return longString.split(emptyString);
+ }
+
+ @Benchmark
+ public String [] benchmarkStringSplitPattern() {
+ return spacePattern.split(longString, 0);
+ }
+
+ @Benchmark
+ public List benchmarkStringTokenizer() {
+ StringTokenizer st = new StringTokenizer(longString);
+ while (st.hasMoreTokens()) {
+ stringTokenizer.add(st.nextToken());
+ }
+ return stringTokenizer;
+ }
+
+ @Benchmark
+ public List benchmarkStringIndexOf() {
+ int pos = 0, end;
+ while ((end = longString.indexOf(' ', pos)) >= 0) {
+ stringSplit.add(longString.substring(pos, end));
+ pos = end + 1;
+ }
+ return stringSplit;
+ }
+
+ @Benchmark
+ public String benchmarkIntegerToString() {
+ return Integer.toString(sampleNumber);
+ }
+
+ @Benchmark
+ public String benchmarkStringValueOf() {
+ return String.valueOf(sampleNumber);
+ }
+
+
+ @Benchmark
+ public String benchmarkStringConvertPlus() {
+ return sampleNumber + "";
+ }
+
+ @Benchmark
+ public String benchmarkStringFormat_d() {
+ return String.format(formatDigit, sampleNumber);
+ }
+
+ @Benchmark
+ public boolean benchmarkStringEquals() {
+ return longString.equals(baeldung);
+ }
+
+
+ @Benchmark
+ public boolean benchmarkStringEqualsIgnoreCase() {
+ return longString.equalsIgnoreCase(baeldung);
+ }
+
+ @Benchmark
+ public boolean benchmarkStringMatches() {
+ return longString.matches(baeldung);
+ }
+
+ @Benchmark
+ public boolean benchmarkPrecompiledMatches() {
+ return longPattern.matcher(baeldung).matches();
+ }
+
+ @Benchmark
+ public int benchmarkStringCompareTo() {
+ return longString.compareTo(baeldung);
+ }
+
+ @Benchmark
+ public boolean benchmarkStringIsEmpty() {
+ return longString.isEmpty();
+ }
+
+ @Benchmark
+ public boolean benchmarkStringLengthZero() {
+ return longString.length() == 0;
+ }
+
+ public static void main(String[] args) throws Exception {
+ Options options = new OptionsBuilder()
+ .include(StringPerformance.class.getSimpleName()).threads(1)
+ .forks(1).shouldFailOnError(true)
+ .shouldDoGC(true)
+ .jvmArgs("-server").build();
+ new Runner(options).run();
+ }
+}
diff --git a/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java b/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
index 8901bcf9db..a9488e27a4 100644
--- a/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
@@ -3,7 +3,9 @@ package com.baeldung.string;
import org.junit.Test;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
@@ -62,5 +64,20 @@ public class JoinerSplitterUnitTest {
assertEquals(result, expectation);
}
+
+ @Test
+ public void givenStringArray_transformedToStream_convertToMap() {
+
+ String[] programming_languages = new String[] {"language:java","os:linux","editor:emacs"};
+
+ Map expectation=new HashMap<>();
+ expectation.put("language", "java");
+ expectation.put("os", "linux");
+ expectation.put("editor", "emacs");
+
+ Map result = JoinerSplitter.arrayToMap(programming_languages);
+ assertEquals(result, expectation);
+
+ }
}
diff --git a/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java b/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
index 3859a2b26b..6157640a4a 100644
--- a/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
@@ -2,10 +2,11 @@ package com.baeldung.string;
import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.common.base.Splitter;
@@ -54,4 +55,18 @@ public class SplitUnitTest {
assertThat(resultList)
.containsExactly("car", "jeep", "scooter");
}
+
+ @Test
+ public void givenStringContainsSpaces_whenSplitAndTrim_thenReturnsArray_using_Regex() {
+ assertThat(" car , jeep, scooter ".trim()
+ .split("\\s*,\\s*")).containsExactly("car", "jeep", "scooter");
+
+ }
+
+ @Test
+ public void givenStringContainsSpaces_whenSplitAndTrim_thenReturnsArray_using_java_8() {
+ assertThat(Arrays.stream(" car , jeep, scooter ".split(","))
+ .map(String::trim)
+ .toArray(String[]::new)).containsExactly("car", "jeep", "scooter");
+ }
}
diff --git a/java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java
new file mode 100644
index 0000000000..17b13f89de
--- /dev/null
+++ b/java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java
@@ -0,0 +1,51 @@
+package com.baeldung.string;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.text.IsEmptyString.isEmptyOrNullString;
+import static org.hamcrest.text.IsEmptyString.isEmptyString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import com.google.common.base.Strings;
+
+public class StringEmptyUnitTest {
+
+ private String text = "baeldung";
+
+ @Test
+ public void givenAString_whenCheckedForEmptyUsingJunit_shouldAssertSuccessfully() {
+ assertTrue(!text.isEmpty());
+ assertFalse(text.isEmpty());
+ assertNotEquals("", text);
+ assertNotSame("", text);
+ }
+
+ @Test
+ public void givenAString_whenCheckedForEmptyUsingHamcrest_shouldAssertSuccessfully() {
+ assertThat(text, not(isEmptyString()));
+ assertThat(text, not(isEmptyOrNullString()));
+ }
+
+ @Test
+ public void givenAString_whenCheckedForEmptyUsingCommonsLang_shouldAssertSuccessfully() {
+ assertTrue(StringUtils.isNotBlank(text));
+ }
+
+ @Test
+ public void givenAString_whenCheckedForEmptyUsingAssertJ_shouldAssertSuccessfully() {
+ Assertions.assertThat(text).isNotEmpty();
+ }
+
+ @Test
+ public void givenAString_whenCheckedForEmptyUsingGuava_shouldAssertSuccessfully() {
+ assertFalse(Strings.isNullOrEmpty(text));
+ }
+
+}
diff --git a/javaxval/pom.xml b/javaxval/pom.xml
index 7af766261b..63cb4c1d1d 100644
--- a/javaxval/pom.xml
+++ b/javaxval/pom.xml
@@ -1,55 +1,73 @@
-
- 4.0.0
- com.baeldung
- javaxval
- 0.1-SNAPSHOT
-
-
- com.baeldung
- parent-modules
- 1.0.0-SNAPSHOT
-
-
-
-
- org.hibernate
- hibernate-validator
- ${hibernate-validator.version}
-
-
- org.hibernate
- hibernate-validator-annotation-processor
- ${hibernate-validator.version}
-
-
- javax.el
- javax.el-api
- ${javax.el-api.version}
-
-
- org.glassfish.web
- javax.el
- ${javax.el.version}
-
-
- org.springframework
- spring-context
- ${org.springframework.version}
-
-
- org.springframework
- spring-test
- ${org.springframework.version}
-
-
-
-
- 2.0.1.Final
- 6.0.7.Final
- 3.0.0
- 2.2.6
- 5.0.2.RELEASE
-
-
+
+ 4.0.0
+ com.baeldung
+ javaxval
+ 0.1-SNAPSHOT
+
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
+
+
+
+ javax.validation
+ validation-api
+ ${validation-api.version}
+
+
+ org.hibernate
+ hibernate-validator
+ ${hibernate-validator.version}
+
+
+ org.hibernate
+ hibernate-validator-annotation-processor
+ ${hibernate-validator.version}
+
+
+ javax.el
+ javax.el-api
+ ${javax.el-api.version}
+
+
+ org.glassfish.web
+ javax.el
+ ${javax.el.version}
+
+
+ org.springframework
+ spring-context
+ ${org.springframework.version}
+
+
+ org.springframework
+ spring-test
+ ${org.springframework.version}
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ ${assertj.version}
+ test
+
+
+
+
+ 2.0.1.Final
+ 6.0.7.Final
+ 3.0.0
+ 2.2.6
+ 5.0.2.RELEASE
+ 4.12
+ 3.11.1
+
\ No newline at end of file
diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java
new file mode 100644
index 0000000000..c9f2ab6f98
--- /dev/null
+++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java
@@ -0,0 +1,14 @@
+package org.baeldung.javabeanconstraints.appplication;
+
+import javax.validation.Validation;
+import javax.validation.Validator;
+import org.baeldung.javabeanconstraints.entities.UserNotBlank;
+
+public class Application {
+
+ public static void main(String[] args) throws Exception {
+ Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+ UserNotBlank user = new UserNotBlank(" ");
+ validator.validate(user).stream().forEach(violation -> System.out.println(violation.getMessage()));
+ }
+}
diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java
new file mode 100644
index 0000000000..2ea6a3af56
--- /dev/null
+++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java
@@ -0,0 +1,22 @@
+package org.baeldung.javabeanconstraints.entities;
+
+import javax.validation.constraints.NotBlank;
+
+public class UserNotBlank {
+
+ @NotBlank(message = "Name is mandatory")
+ private final String name;
+
+ public UserNotBlank(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String toString() {
+ return "User{" + "name=" + name + "}";
+ }
+}
diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java
new file mode 100644
index 0000000000..39e34b63d3
--- /dev/null
+++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java
@@ -0,0 +1,22 @@
+package org.baeldung.javabeanconstraints.entities;
+
+import javax.validation.constraints.NotEmpty;
+
+public class UserNotEmpty {
+
+ @NotEmpty(message = "Name is mandatory")
+ private final String name;
+
+ public UserNotEmpty(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String toString() {
+ return "User{" + "name=" + name + "}";
+ }
+}
diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java
new file mode 100644
index 0000000000..598c9ba9f9
--- /dev/null
+++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java
@@ -0,0 +1,22 @@
+package org.baeldung.javabeanconstraints.entities;
+
+import javax.validation.constraints.NotNull;
+
+public class UserNotNull {
+
+ @NotNull(message = "Name is mandatory")
+ private final String name;
+
+ public UserNotNull(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String toString() {
+ return "User{" + "name=" + name + "}";
+ }
+}
diff --git a/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotBlankUnitTest.java b/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotBlankUnitTest.java
new file mode 100644
index 0000000000..954833fef1
--- /dev/null
+++ b/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotBlankUnitTest.java
@@ -0,0 +1,63 @@
+package org.baeldung.javabeanconstraints.test;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.baeldung.javabeanconstraints.entities.UserNotBlank;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class UserNotBlankUnitTest {
+
+ private static Validator validator;
+
+ @BeforeClass
+ public static void setupValidatorInstance() {
+ validator = Validation.buildDefaultValidatorFactory().getValidator();
+ }
+
+ @Test
+ public void whenNotBlankName_thenNoConstraintViolations() {
+ UserNotBlank user = new UserNotBlank("John");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(0);
+ }
+
+ @Test
+ public void whenBlankName_thenOneConstraintViolation() {
+ UserNotBlank user = new UserNotBlank(" ");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void whenEmptyName_thenOneConstraintViolation() {
+ UserNotBlank user = new UserNotBlank("");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void whenNullName_thenOneConstraintViolation() {
+ UserNotBlank user = new UserNotBlank(null);
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void whenToString_thenCorrect() {
+ UserNotBlank user = new UserNotBlank("John");
+
+ assertThat(user.toString()).isEqualTo("User{name=John}");
+ }
+}
diff --git a/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotEmptyUnitTest.java b/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotEmptyUnitTest.java
new file mode 100644
index 0000000000..c2675ed8b6
--- /dev/null
+++ b/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotEmptyUnitTest.java
@@ -0,0 +1,54 @@
+package org.baeldung.javabeanconstraints.test;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.baeldung.javabeanconstraints.entities.UserNotEmpty;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class UserNotEmptyUnitTest {
+
+ private static Validator validator;
+
+ @BeforeClass
+ public static void setupValidatorInstance() {
+ validator = Validation.buildDefaultValidatorFactory().getValidator();
+ }
+
+ @Test
+ public void whenNotEmptyName_thenNoConstraintViolations() {
+ UserNotEmpty user = new UserNotEmpty("John");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(0);
+ }
+
+ @Test
+ public void whenEmptyName_thenOneConstraintViolation() {
+ UserNotEmpty user = new UserNotEmpty("");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void whenNullName_thenOneConstraintViolation() {
+ UserNotEmpty user = new UserNotEmpty(null);
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void whenToString_thenCorrect() {
+ UserNotEmpty user = new UserNotEmpty("John");
+
+ assertThat(user.toString()).isEqualTo("User{name=John}");
+ }
+}
diff --git a/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotNullUnitTest.java b/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotNullUnitTest.java
new file mode 100644
index 0000000000..3dd1811947
--- /dev/null
+++ b/javaxval/src/test/java/org/baeldung/javabeanconstraints/test/UserNotNullUnitTest.java
@@ -0,0 +1,54 @@
+package org.baeldung.javabeanconstraints.test;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.baeldung.javabeanconstraints.entities.UserNotNull;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class UserNotNullUnitTest {
+
+ private static Validator validator;
+
+ @BeforeClass
+ public static void setupValidatorInstance() {
+ validator = Validation.buildDefaultValidatorFactory().getValidator();
+ }
+
+ @Test
+ public void whenNotNullName_thenNoConstraintViolations() {
+ UserNotNull user = new UserNotNull("John");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(0);
+ }
+
+ @Test
+ public void whenNullName_thenOneConstraintViolation() {
+ UserNotNull user = new UserNotNull(null);
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void whenEmptyName_thenNoConstraintViolations() {
+ UserNotNull user = new UserNotNull("");
+
+ Set> violations = validator.validate(user);
+
+ assertThat(violations.size()).isEqualTo(0);
+ }
+
+ @Test
+ public void whenToString_thenCorrect() {
+ UserNotNull user = new UserNotNull("John");
+
+ assertThat(user.toString()).isEqualTo("User{name=John}");
+ }
+}
diff --git a/jee-7/pom.xml b/jee-7/pom.xml
index 08c8b5a068..242fa778c0 100644
--- a/jee-7/pom.xml
+++ b/jee-7/pom.xml
@@ -2,7 +2,6 @@
4.0.0
- com.baeldung
jee-7
1.0-SNAPSHOT
war
diff --git a/jenkins/hello-world/pom.xml b/jenkins/hello-world/pom.xml
index 5684deaea3..fb2154c7ad 100644
--- a/jenkins/hello-world/pom.xml
+++ b/jenkins/hello-world/pom.xml
@@ -7,13 +7,6 @@
hpi
Hello World Plugin
A sample Jenkins Hello World plugin
- https://wiki.jenkins-ci.org/display/JENKINS/TODO+Plugin
-
-
- MIT License
- http://opensource.org/licenses/MIT
-
-
org.jenkins-ci.plugins
diff --git a/jersey/README.md b/jersey/README.md
index 3121c560cf..1a7b541e92 100644
--- a/jersey/README.md
+++ b/jersey/README.md
@@ -1,2 +1,3 @@
- [Jersey Filters and Interceptors](http://www.baeldung.com/jersey-filters-interceptors)
- [Jersey MVC Support](https://www.baeldung.com/jersey-mvc)
+- [Set a Response Body in JAX-RS](https://www.baeldung.com/jax-rs-response)
diff --git a/jersey/pom.xml b/jersey/pom.xml
index e248f9cf90..b55bdc5330 100644
--- a/jersey/pom.xml
+++ b/jersey/pom.xml
@@ -39,6 +39,11 @@
jersey-mvc-freemarker
${jersey.version}
+
+ org.glassfish.jersey.ext
+ jersey-bean-validation
+ ${jersey.version}
+
org.glassfish.jersey.test-framework
jersey-test-framework-core
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java b/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
index d4744066c4..b6b9853aae 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
@@ -1,12 +1,14 @@
package com.baeldung.jersey.server.config;
import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.mvc.freemarker.FreemarkerMvcFeature;
public class ViewApplicationConfig extends ResourceConfig {
public ViewApplicationConfig() {
packages("com.baeldung.jersey.server");
+ property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
property(FreemarkerMvcFeature.TEMPLATE_BASE_PATH, "templates/freemarker");
register(FreemarkerMvcFeature.class);;
}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java b/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
new file mode 100644
index 0000000000..ca49797e31
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
@@ -0,0 +1,35 @@
+package com.baeldung.jersey.server.constraints;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.regex.Pattern;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.Payload;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = { SerialNumber.Validator.class })
+public @interface SerialNumber {
+
+ String message()
+
+ default "Fruit serial number is not valid";
+
+ Class[] groups() default {};
+
+ Class[] payload() default {};
+
+ public class Validator implements ConstraintValidator {
+ @Override
+ public void initialize(final SerialNumber serial) {
+ }
+
+ @Override
+ public boolean isValid(final String serial, final ConstraintValidatorContext constraintValidatorContext) {
+ final String serialNumRegex = "^\\d{3}-\\d{3}-\\d{4}$";
+ return Pattern.matches(serialNumRegex, serial);
+ }
+ }
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
index 30620e331d..c55362487b 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
@@ -1,20 +1,57 @@
package com.baeldung.jersey.server.model;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
public class Fruit {
- private final String name;
- private final String colour;
+ @Min(value = 10, message = "Fruit weight must be 10 or greater")
+ private Integer weight;
+ @Size(min = 5, max = 200)
+ private String name;
+ @Size(min = 5, max = 200)
+ private String colour;
+ private String serial;
+
+ public Fruit() {
+ }
public Fruit(String name, String colour) {
this.name = name;
this.colour = colour;
}
-
+
public String getName() {
return name;
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setColour(String colour) {
+ this.colour = colour;
+ }
public String getColour() {
return colour;
}
+
+ public Integer getWeight() {
+ return weight;
+ }
+
+ public void setWeight(Integer weight) {
+ this.weight = weight;
+ }
+
+ public String getSerial() {
+ return serial;
+ }
+
+ public void setSerial(String serial) {
+ this.serial = serial;
+ }
}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
new file mode 100644
index 0000000000..cea61c897b
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
@@ -0,0 +1,26 @@
+package com.baeldung.jersey.server.providers;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+public class FruitExceptionMapper implements ExceptionMapper {
+
+ @Override
+ public Response toResponse(final ConstraintViolationException exception) {
+ return Response.status(Response.Status.BAD_REQUEST)
+ .entity(prepareMessage(exception))
+ .type("text/plain")
+ .build();
+ }
+
+ private String prepareMessage(ConstraintViolationException exception) {
+ final StringBuilder message = new StringBuilder();
+ for (ConstraintViolation cv : exception.getConstraintViolations()) {
+ message.append(cv.getPropertyPath() + " " + cv.getMessage() + "\n");
+ }
+ return message.toString();
+ }
+
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
index 4e1fa4aa11..ee34cdd3ca 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
@@ -5,7 +5,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -15,7 +21,9 @@ import org.glassfish.jersey.server.mvc.ErrorTemplate;
import org.glassfish.jersey.server.mvc.Template;
import org.glassfish.jersey.server.mvc.Viewable;
+import com.baeldung.jersey.server.constraints.SerialNumber;
import com.baeldung.jersey.server.model.Fruit;
+import com.baeldung.jersey.service.SimpleStorageService;
@Path("/fruit")
public class FruitResource {
@@ -52,4 +60,49 @@ public class FruitResource {
return name;
}
+ @POST
+ @Path("/create")
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+ public void createFruit(
+ @NotNull(message = "Fruit name must not be null") @FormParam("name") String name,
+ @NotNull(message = "Fruit colour must not be null") @FormParam("colour") String colour) {
+
+ Fruit fruit = new Fruit(name, colour);
+ SimpleStorageService.storeFruit(fruit);
+ }
+
+ @PUT
+ @Path("/update")
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+ public void updateFruit(@SerialNumber @FormParam("serial") String serial) {
+ Fruit fruit = new Fruit();
+ fruit.setSerial(serial);
+ SimpleStorageService.storeFruit(fruit);
+ }
+
+ @POST
+ @Path("/create")
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void createFruit(@Valid Fruit fruit) {
+ SimpleStorageService.storeFruit(fruit);
+ }
+
+ @GET
+ @Valid
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/search/{name}")
+ public Fruit findFruitByName(@PathParam("name") String name) {
+ return SimpleStorageService.findByName(name);
+ }
+
+ @GET
+ @Produces(MediaType.TEXT_HTML)
+ @Path("/exception")
+ @Valid
+ public Fruit exception() {
+ Fruit fruit = new Fruit();
+ fruit.setName("a");
+ fruit.setColour("b");
+ return fruit;
+ }
}
diff --git a/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java b/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
new file mode 100644
index 0000000000..e21dd584a1
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
@@ -0,0 +1,25 @@
+package com.baeldung.jersey.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baeldung.jersey.server.model.Fruit;
+
+public class SimpleStorageService {
+
+ private static final Map fruits = new HashMap();
+
+ public static void storeFruit(final Fruit fruit) {
+ fruits.put(fruit.getName(), fruit);
+ }
+
+ public static Fruit findByName(final String name) {
+ return fruits.entrySet()
+ .stream()
+ .filter(map -> name.equals(map.getKey()))
+ .map(map -> map.getValue())
+ .findFirst()
+ .get();
+ }
+
+}
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
index a0b6daed51..2eeb5710cb 100644
--- a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
@@ -2,41 +2,116 @@ package com.baeldung.jersey.server.rest;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import javax.ws.rs.client.Entity;
import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Assert;
+import org.glassfish.jersey.test.TestProperties;
import org.junit.Test;
import com.baeldung.jersey.server.config.ViewApplicationConfig;
+import com.baeldung.jersey.server.model.Fruit;
+import com.baeldung.jersey.server.providers.FruitExceptionMapper;
public class FruitResourceIntegrationTest extends JerseyTest {
@Override
protected Application configure() {
- return new ViewApplicationConfig();
+ enable(TestProperties.LOG_TRAFFIC);
+ enable(TestProperties.DUMP_ENTITY);
+
+ ViewApplicationConfig config = new ViewApplicationConfig();
+ config.register(FruitExceptionMapper.class);
+ return config;
}
@Test
- public void testAllFruit() {
+ public void givenGetAllFruit_whenCorrectRequest_thenAllTemplateInvoked() {
final String response = target("/fruit/all").request()
.get(String.class);
- Assert.assertThat(response, allOf(containsString("banana"), containsString("apple"), containsString("kiwi")));
+ assertThat(response, allOf(containsString("banana"), containsString("apple"), containsString("kiwi")));
}
@Test
- public void testIndex() {
+ public void givenGetFruit_whenCorrectRequest_thenIndexTemplateInvoked() {
final String response = target("/fruit").request()
.get(String.class);
- Assert.assertThat(response, containsString("Welcome Fruit Index Page!"));
+ assertThat(response, containsString("Welcome Fruit Index Page!"));
}
@Test
- public void testErrorTemplate() {
+ public void givenGetFruitByName_whenFruitUnknown_thenErrorTemplateInvoked() {
final String response = target("/fruit/orange").request()
.get(String.class);
- Assert.assertThat(response, containsString("Error - Fruit not found: orange!"));
+ assertThat(response, containsString("Error - Fruit not found: orange!"));
+ }
+
+ @Test
+ public void givenCreateFruit_whenFormContainsNullParam_thenResponseCodeIsBadRequest() {
+ Form form = new Form();
+ form.param("name", "apple");
+ form.param("colour", null);
+ Response response = target("fruit/create").request(MediaType.APPLICATION_FORM_URLENCODED)
+ .post(Entity.form(form));
+
+ assertEquals("Http Response should be 400 ", 400, response.getStatus());
+ assertThat(response.readEntity(String.class), containsString("Fruit colour must not be null"));
+ }
+
+ @Test
+ public void givenUpdateFruit_whenFormContainsBadSerialParam_thenResponseCodeIsBadRequest() {
+ Form form = new Form();
+ form.param("serial", "2345-2345");
+
+ Response response = target("fruit/update").request(MediaType.APPLICATION_FORM_URLENCODED)
+ .put(Entity.form(form));
+
+ assertEquals("Http Response should be 400 ", 400, response.getStatus());
+ assertThat(response.readEntity(String.class), containsString("Fruit serial number is not valid"));
+ }
+
+ @Test
+ public void givenCreateFruit_whenFruitIsInvalid_thenResponseCodeIsBadRequest() {
+ Fruit fruit = new Fruit("Blueberry", "purple");
+ fruit.setWeight(1);
+
+ Response response = target("fruit/create").request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.entity(fruit, MediaType.APPLICATION_JSON_TYPE));
+
+ assertEquals("Http Response should be 400 ", 400, response.getStatus());
+ assertThat(response.readEntity(String.class), containsString("Fruit weight must be 10 or greater"));
+ }
+
+ @Test
+ public void givenFruitExists_whenSearching_thenResponseContainsFruit() {
+ Fruit fruit = new Fruit();
+ fruit.setName("strawberry");
+ fruit.setWeight(20);
+ Response response = target("fruit/create").request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.entity(fruit, MediaType.APPLICATION_JSON_TYPE));
+
+ assertEquals("Http Response should be 204 ", 204, response.getStatus());
+
+ final String json = target("fruit/search/strawberry").request()
+ .get(String.class);
+ assertThat(json, containsString("{\"name\":\"strawberry\",\"weight\":20}"));
+ }
+
+ @Test
+ public void givenFruit_whenFruitIsInvalid_thenReponseContainsCustomExceptions() {
+ final Response response = target("fruit/exception").request()
+ .get();
+
+ assertEquals("Http Response should be 400 ", 400, response.getStatus());
+ String responseString = response.readEntity(String.class);
+ assertThat(responseString, containsString("exception..colour size must be between 5 and 200"));
+ assertThat(responseString, containsString("exception..name size must be between 5 and 200"));
}
}
diff --git a/jhipster/jhipster-microservice/car-app/pom.xml b/jhipster/jhipster-microservice/car-app/pom.xml
index c52def554f..b05979b9c5 100644
--- a/jhipster/jhipster-microservice/car-app/pom.xml
+++ b/jhipster/jhipster-microservice/car-app/pom.xml
@@ -1,17 +1,15 @@
-
+
4.0.0
- parent-boot-1
- com.baeldung
- 0.0.1-SNAPSHOT
- ../../../parent-boot-1
+ jhipster-microservice
+ com.baeldung.jhipster
+ 1.0.0-SNAPSHOT
+
com.car.app
car-app
- 0.0.1-SNAPSHOT
war
car-app
@@ -37,9 +35,11 @@
0.7.0
3.6
2.0.0
+ 3.6.2
4.8
jdt_apt
1.1.0.Final
+ 2.10
1.4.1
3.0.1
yyyyMMddHHmmss
@@ -186,12 +186,10 @@
commons-io
commons-io
- ${commons-io.version}
io.dropwizard.metrics
metrics-annotation
- ${dropwizard-metrics.version}
io.dropwizard.metrics
@@ -200,17 +198,14 @@
io.dropwizard.metrics
metrics-json
- ${dropwizard-metrics.version}
io.dropwizard.metrics
metrics-jvm
- ${dropwizard-metrics.version}
io.dropwizard.metrics
metrics-servlet
- ${dropwizard-metrics.version}
io.dropwizard.metrics
@@ -505,8 +500,6 @@
maven-compiler-plugin
${maven-compiler-plugin.version}
- ${maven.compiler.source}
- ${maven.compiler.target}
org.mapstruct
@@ -519,6 +512,7 @@
org.apache.maven.plugins
maven-eclipse-plugin
+ ${maven-eclipse-plugin.version}
true
true
diff --git a/jhipster/jhipster-microservice/dealer-app/pom.xml b/jhipster/jhipster-microservice/dealer-app/pom.xml
index a9366e9bd3..803a0f62e6 100644
--- a/jhipster/jhipster-microservice/dealer-app/pom.xml
+++ b/jhipster/jhipster-microservice/dealer-app/pom.xml
@@ -1,54 +1,113 @@
-
+
4.0.0
+
+
+ jhipster-microservice
+ com.baeldung.jhipster
+ 1.0.0-SNAPSHOT
+
+
com.dealer.app
dealer-app
- 0.0.1-SNAPSHOT
war
dealer-app
-
- parent-boot-1
- com.baeldung
- 0.0.1-SNAPSHOT
- ../../../parent-boot-1
-
+
+ ${maven.version}
+
+
+
+ -Djava.security.egd=file:/dev/./urandom -Xmx256m
+ 3.6.2
+ 2.0.0
+ 2.5
+ 3.5
+ 0.4.13
+ 1.2
+ 5.2.8.Final
+ 2.6.0
+ 0.7.9
+ 3.21.0-GA
+ 1.0.0
+ 1.1.0
+ 0.7.0
+ 3.6
+ 2.0.0
+ 3.6.2
+ 4.8
+ jdt_apt
+ 1.1.0.Final
+ 2.10
+ 1.4.1
+ 3.0.1
+ yyyyMMddHHmmss
+ 3.0.0
+ 3.1.3
+ v6.10.0
+
+
+
+
+ ${project.build.directory}/test-results
+ 0.0.20
+ false
+ 3.2.2
+ 2.12.1
+ 3.2
+
+ src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*
+
+ S3437,UndocumentedApi,BoldAndItalicTagsCheck
+
+
+ src/main/webapp/app/**/*.*
+ Web:BoldAndItalicTagsCheck
+
+ src/main/java/**/*
+ squid:S3437
+
+ src/main/java/**/*
+ squid:UndocumentedApi
+
+ ${project.testresult.directory}/coverage/jacoco/jacoco-it.exec
+ ${project.testresult.directory}/coverage/jacoco/jacoco.exec
+ jacoco
+
+ ${project.testresult.directory}/karma
+
+ ${project.testresult.directory}/coverage/report-lcov/lcov.info
+
+ ${project.testresult.directory}/coverage/report-lcov/lcov.info
+
+ ${project.basedir}/src/main/
+ ${project.testresult.directory}/surefire-reports
+ ${project.basedir}/src/test/
+
+ 2.5.0
+
+ Camden.SR5
+ 2.6.1
+ 1.4.10.Final
+ 1.1.0.Final
+ v0.21.3
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
+
+
-
- io.github.jhipster
- jhipster
- ${jhipster.server.version}
-
-
- io.dropwizard.metrics
- metrics-core
-
-
- io.dropwizard.metrics
- metrics-annotation
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-json
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-jvm
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-servlet
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-servlets
-
com.fasterxml.jackson.datatype
jackson-datatype-hibernate5
@@ -59,11 +118,11 @@
com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
+ jackson-datatype-json-org
com.fasterxml.jackson.datatype
- jackson-datatype-json-org
+ jackson-datatype-jsr310
com.h2database
@@ -82,34 +141,12 @@
com.hazelcast
hazelcast-spring
-
- org.awaitility
- awaitility
- ${awaitility.version}
- test
-
com.jayway.jsonpath
json-path
test
-
- io.springfox
- springfox-swagger2
- ${springfox.version}
-
-
- org.mapstruct
- mapstruct
-
-
-
-
- io.springfox
- springfox-bean-validators
- ${springfox.version}
-
com.mattbertolini
liquibase-slf4j
@@ -121,16 +158,16 @@
${metrics-spring.version}
- com.codahale.metrics
metrics-annotation
+ com.codahale.metrics
- com.codahale.metrics
metrics-core
+ com.codahale.metrics
- com.codahale.metrics
metrics-healthchecks
+ com.codahale.metrics
@@ -148,12 +185,56 @@
commons-io
commons-io
- ${commons-io.version}
- org.apache.commons
- commons-lang3
- ${commons-lang.version}
+ io.dropwizard.metrics
+ metrics-annotation
+
+
+ io.dropwizard.metrics
+ metrics-core
+
+
+ io.dropwizard.metrics
+ metrics-json
+
+
+ io.dropwizard.metrics
+ metrics-jvm
+
+
+ io.dropwizard.metrics
+ metrics-servlet
+
+
+ io.dropwizard.metrics
+ metrics-servlets
+
+
+ io.github.jhipster
+ jhipster
+ ${jhipster.server.version}
+
+
+ io.jsonwebtoken
+ jjwt
+ ${jjwt.version}
+
+
+ io.springfox
+ springfox-bean-validators
+ ${springfox.version}
+
+
+ io.springfox
+ springfox-swagger2
+ ${springfox.version}
+
+
+ mapstruct
+ org.mapstruct
+
+
javax.cache
@@ -163,11 +244,41 @@
mysql
mysql-connector-java
+
+ net.logstash.logback
+ logstash-logback-encoder
+ ${logstash-logback-encoder.version}
+
+
+ logback-core
+ ch.qos.logback
+
+
+ logback-classic
+ ch.qos.logback
+
+
+ logback-access
+ ch.qos.logback
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang.version}
+
org.assertj
assertj-core
test
+
+ org.awaitility
+ awaitility
+ ${awaitility.version}
+ test
+
org.hibernate
hibernate-envers
@@ -216,6 +327,10 @@
org.springframework.boot
spring-boot-starter-aop
+
+ org.springframework.boot
+ spring-boot-starter-cloud-connectors
+
org.springframework.boot
spring-boot-starter-data-jpa
@@ -232,16 +347,6 @@
org.springframework.boot
spring-boot-starter-security
-
- org.springframework.security
- spring-security-test
- test
-
-
- org.springframework.boot
- spring-boot-test
- test
-
org.springframework.boot
spring-boot-starter-thymeleaf
@@ -251,15 +356,15 @@
spring-boot-starter-web
- org.springframework.boot
spring-boot-starter-tomcat
+ org.springframework.boot
- io.jsonwebtoken
- jjwt
- ${jjwt.version}
+ org.springframework.boot
+ spring-boot-test
+ test
@@ -268,19 +373,31 @@
org.springframework.cloud
- spring-cloud-starter-ribbon
-
-
-
- io.netty
- netty-transport-native-epoll
-
-
+ spring-cloud-starter-config
+
+
+ org.springframework.cloud
+ spring-cloud-starter-eureka
+
+
+ org.springframework.cloud
+ spring-cloud-starter-feign
org.springframework.cloud
spring-cloud-starter-hystrix
+
+ org.springframework.cloud
+ spring-cloud-starter-ribbon
+
+
+
+ netty-transport-native-epoll
+ io.netty
+
+
+
org.springframework.cloud
spring-cloud-starter-spectator
@@ -289,51 +406,51 @@
org.springframework.retry
spring-retry
-
- org.springframework.cloud
- spring-cloud-starter-eureka
-
-
- org.springframework.cloud
- spring-cloud-starter-config
-
-
- org.springframework.cloud
- spring-cloud-starter-feign
-
-
- net.logstash.logback
- logstash-logback-encoder
- ${logstash-logback-encoder.version}
-
-
- ch.qos.logback
- logback-core
-
-
- ch.qos.logback
- logback-classic
-
-
- ch.qos.logback
- logback-access
-
-
-
-
- org.springframework.boot
- spring-boot-starter-cloud-connectors
-
org.springframework.security
spring-security-data
+
+ org.springframework.security
+ spring-security-test
+ test
+
spring-boot:run
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
+
+ prepare-agent
+
+
+
+
+
+
+
+
+
+
+
+
com.github.ekryd.sortpom
@@ -356,6 +473,22 @@
false
+
+ com.spotify
+ docker-maven-plugin
+ ${docker-maven-plugin.version}
+
+ dealerapp
+ src/main/docker
+
+
+ /
+ ${project.build.directory}
+ ${project.build.finalName}.war
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -373,6 +506,7 @@
org.apache.maven.plugins
maven-eclipse-plugin
+ ${maven-eclipse-plugin.version}
true
true
@@ -479,28 +613,16 @@
-
- org.sonarsource.scanner.maven
- sonar-maven-plugin
- ${sonar-maven-plugin.version}
-
org.liquibase
liquibase-maven-plugin
${liquibase.version}
-
- src/main/resources/config/liquibase/master.xml
- src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml
- org.h2.Driver
- jdbc:h2:file:./target/h2db/db/dealerapp
-
- dealerapp
-
- hibernate:spring:com.dealer.app.domain?dialect=org.hibernate.dialect.H2Dialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
- true
- debug
-
+
+ javax.validation
+ validation-api
+ ${validation-api.version}
+
org.javassist
javassist
@@ -516,12 +638,24 @@
spring-boot-starter-data-jpa
${project.parent.version}
-
- javax.validation
- validation-api
- ${validation-api.version}
-
+
+ src/main/resources/config/liquibase/master.xml
+ src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml
+ org.h2.Driver
+ jdbc:h2:file:./target/h2db/db/dealerapp
+
+ dealerapp
+
+ hibernate:spring:com.dealer.app.domain?dialect=org.hibernate.dialect.H2Dialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+ true
+ debug
+
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ ${sonar-maven-plugin.version}
org.springframework.boot
@@ -532,58 +666,8 @@
-
- com.spotify
- docker-maven-plugin
- ${docker-maven-plugin.version}
-
- dealerapp
- src/main/docker
-
-
- /
- ${project.build.directory}
- ${project.build.finalName}.war
-
-
-
-
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
- org.jacoco
-
- jacoco-maven-plugin
-
-
- ${jacoco-maven-plugin.version}
-
-
- prepare-agent
-
-
-
-
-
-
-
-
-
-
-
-
@@ -604,24 +688,12 @@
true
-
-
- org.springframework.boot
- spring-boot-starter-undertow
-
-
- org.springframework.boot
- spring-boot-devtools
- true
-
-
org.apache.maven.plugins
maven-war-plugin
-
-
+
@@ -631,15 +703,20 @@
dev${profile.no-liquibase}
-
-
- prod
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+
org.springframework.boot
spring-boot-starter-undertow
+
+
+ prod
@@ -655,15 +732,11 @@
org.apache.maven.plugins
maven-war-plugin
-
-
+
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
@@ -671,6 +744,9 @@
+
+ true
+
@@ -680,56 +756,20 @@
prod${profile.swagger}${profile.no-liquibase}
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
cc
-
-
- org.springframework.boot
- spring-boot-starter-undertow
-
-
- org.springframework.boot
- spring-boot-devtools
- true
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
-
- src/main/webapp/
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
- true
- true
- true
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- default-compile
- none
-
-
- default-testCompile
- none
-
-
-
net.alchim31.maven
scala-maven-plugin
@@ -758,6 +798,37 @@
${scala.version}
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ default-compile
+ none
+
+
+ default-testCompile
+ none
+
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+ src/main/webapp/
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+ true
+ true
+
+
+
@@ -766,6 +837,17 @@
dev,swagger
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
@@ -788,12 +870,12 @@
io.prometheus
- simpleclient_servlet
+ simpleclient_dropwizard
${prometheus-simpleclient.version}
io.prometheus
- simpleclient_dropwizard
+ simpleclient_servlet
${prometheus-simpleclient.version}
@@ -811,96 +893,4 @@
-
-
-
- org.springframework.cloud
- spring-cloud-dependencies
- ${spring-cloud.version}
- pom
- import
-
-
-
-
-
- ${maven.version}
-
-
-
- -Djava.security.egd=file:/dev/./urandom -Xmx256m
- 3.6.2
- 2.0.0
- 2.5
- 3.5
- 0.4.13
- 1.2
- 5.2.8.Final
- 2.6.0
- 0.7.9
- 3.21.0-GA
- 1.0.0
- 1.1.0
- 0.7.0
- 3.6
- 2.0.0
- 4.8
- jdt_apt
- 1.1.0.Final
- 1.4.1
- 3.0.1
- yyyyMMddHHmmss
- 3.0.0
- 3.1.3
- v6.10.0
-
-
-
- 0.0.20
-
- ${project.build.directory}/test-results
- false
- 3.2.2
- 2.12.1
- 3.2
-
- src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*
-
- S3437,UndocumentedApi,BoldAndItalicTagsCheck
-
-
- src/main/webapp/app/**/*.*
- Web:BoldAndItalicTagsCheck
-
- src/main/java/**/*
- squid:S3437
-
- src/main/java/**/*
- squid:UndocumentedApi
-
- ${project.testresult.directory}/coverage/jacoco/jacoco-it.exec
- ${project.testresult.directory}/coverage/jacoco/jacoco.exec
- jacoco
-
- ${project.testresult.directory}/karma
-
- ${project.testresult.directory}/coverage/report-lcov/lcov.info
-
- ${project.testresult.directory}/coverage/report-lcov/lcov.info
-
- ${project.basedir}/src/main/
- ${project.testresult.directory}/surefire-reports
- ${project.basedir}/src/test/
-
- 2.5.0
-
- Camden.SR5
- 2.6.1
- 1.4.10.Final
- 1.1.0.Final
- v0.21.3
-
-
diff --git a/jhipster/jhipster-microservice/gateway-app/pom.xml b/jhipster/jhipster-microservice/gateway-app/pom.xml
index 0ae74e11bb..ed0c929027 100644
--- a/jhipster/jhipster-microservice/gateway-app/pom.xml
+++ b/jhipster/jhipster-microservice/gateway-app/pom.xml
@@ -1,53 +1,136 @@
-
+
4.0.0
+
+
+ jhipster-microservice
+ com.baeldung.jhipster
+ 1.0.0-SNAPSHOT
+
+
com.gateway
gateway-app
- 0.0.1-SNAPSHOT
war
gateway-app
-
- parent-boot-1
- com.baeldung
- 0.0.1-SNAPSHOT
- ../../../parent-boot-1
-
+
+ ${maven.version}
+
+
+
+ -Djava.security.egd=file:/dev/./urandom -Xmx256m
+ 3.6.2
+ 2.0.0
+ 3.6.0
+ 1.10
+ 2.5
+ 3.5
+ 0.4.13
+ 1.3
+ 1.2
+ 5.2.8.Final
+ 2.6.0
+ 0.7.9
+ 3.21.0-GA
+ 1.0.0
+ 1.1.0
+ 0.7.0
+ 3.6
+ 2.0.0
+ 3.6.2
+ 4.8
+ 1.3.0
+ jdt_apt
+ 1.1.0.Final
+ 2.10
+ 1.4.1
+ 3.0.1
+ yyyyMMddHHmmss
+ 3.0.0
+ 3.1.3
+ v6.10.0
+
+
+
+
+ ${project.build.directory}/test-results
+ 0.0.20
+ false
+ 3.2.2
+ 2.12.1
+ 3.2
+
+ src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*
+
+ S3437,UndocumentedApi,BoldAndItalicTagsCheck
+
+
+ src/main/webapp/app/**/*.*
+ Web:BoldAndItalicTagsCheck
+
+ src/main/java/**/*
+ squid:S3437
+
+ src/main/java/**/*
+ squid:UndocumentedApi
+
+ ${project.testresult.directory}/coverage/jacoco/jacoco-it.exec
+ ${project.testresult.directory}/coverage/jacoco/jacoco.exec
+ jacoco
+
+ ${project.testresult.directory}/karma
+
+ ${project.testresult.directory}/coverage/report-lcov/lcov.info
+
+ ${project.testresult.directory}/coverage/report-lcov/lcov.info
+
+ ${project.basedir}/src/main/
+ ${project.testresult.directory}/surefire-reports
+ ${project.basedir}/src/test/
+
+ 2.5.0
+
+ Camden.SR5
+ 2.6.1
+ 1.4.10.Final
+ 1.1.0.Final
+ v0.21.3
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
+
+
+
- io.github.jhipster
- jhipster
- ${jhipster.server.version}
+ com.datastax.cassandra
+ cassandra-driver-core
+
+
+ metrics-core
+ com.codahale.metrics
+
+
- io.dropwizard.metrics
- metrics-core
+ com.datastax.cassandra
+ cassandra-driver-extras
+ ${cassandra-driver.version}
- io.dropwizard.metrics
- metrics-annotation
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-json
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-jvm
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-servlet
- ${dropwizard-metrics.version}
-
-
- io.dropwizard.metrics
- metrics-servlets
+ com.datastax.cassandra
+ cassandra-driver-mapping
com.fasterxml.jackson.datatype
@@ -59,11 +142,11 @@
com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
+ jackson-datatype-json-org
com.fasterxml.jackson.datatype
- jackson-datatype-json-org
+ jackson-datatype-jsr310
com.h2database
@@ -82,34 +165,12 @@
com.hazelcast
hazelcast-spring
-
- org.awaitility
- awaitility
- ${awaitility.version}
- test
-
com.jayway.jsonpath
json-path
test
-
- io.springfox
- springfox-swagger2
- ${springfox.version}
-
-
- org.mapstruct
- mapstruct
-
-
-
-
- io.springfox
- springfox-bean-validators
- ${springfox.version}
-
com.mattbertolini
liquibase-slf4j
@@ -121,16 +182,16 @@
${metrics-spring.version}
- com.codahale.metrics
metrics-annotation
+ com.codahale.metrics
- com.codahale.metrics
metrics-core
+ com.codahale.metrics
- com.codahale.metrics
metrics-healthchecks
+ com.codahale.metrics
@@ -148,17 +209,60 @@
commons-codec
commons-codec
- ${commons-codec.version}
commons-io
commons-io
- ${commons-io.version}
- org.apache.commons
- commons-lang3
- ${commons-lang.version}
+ io.dropwizard.metrics
+ metrics-annotation
+
+
+ io.dropwizard.metrics
+ metrics-core
+
+
+ io.dropwizard.metrics
+ metrics-json
+
+
+ io.dropwizard.metrics
+ metrics-jvm
+
+
+ io.dropwizard.metrics
+ metrics-servlet
+
+
+ io.dropwizard.metrics
+ metrics-servlets
+
+
+ io.github.jhipster
+ jhipster
+ ${jhipster.server.version}
+
+
+ io.jsonwebtoken
+ jjwt
+ ${jjwt.version}
+
+
+ io.springfox
+ springfox-bean-validators
+ ${springfox.version}
+
+
+ io.springfox
+ springfox-swagger2
+ ${springfox.version}
+
+
+ mapstruct
+ org.mapstruct
+
+
javax.cache
@@ -173,11 +277,41 @@
lz4
${lz4.version}
+
+ net.logstash.logback
+ logstash-logback-encoder
+ ${logstash-logback-encoder.version}
+
+
+ logback-core
+ ch.qos.logback
+
+
+ logback-classic
+ ch.qos.logback
+
+
+ logback-access
+ ch.qos.logback
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang.version}
+
org.assertj
assertj-core
test
+
+ org.awaitility
+ awaitility
+ ${awaitility.version}
+ test
+
org.hibernate
hibernate-envers
@@ -226,6 +360,10 @@
org.springframework.boot
spring-boot-starter-aop
+
+ org.springframework.boot
+ spring-boot-starter-cloud-connectors
+
org.springframework.boot
spring-boot-starter-data-jpa
@@ -247,16 +385,6 @@
spring-boot-starter-test
test
-
- org.springframework.security
- spring-security-test
- test
-
-
- org.springframework.boot
- spring-boot-test
- test
-
org.springframework.boot
spring-boot-starter-thymeleaf
@@ -266,40 +394,15 @@
spring-boot-starter-web
- org.springframework.boot
spring-boot-starter-tomcat
+ org.springframework.boot
- io.jsonwebtoken
- jjwt
- ${jjwt.version}
-
-
-
- com.datastax.cassandra
- cassandra-driver-core
-
-
- com.codahale.metrics
- metrics-core
-
-
-
-
- com.datastax.cassandra
- cassandra-driver-extras
- ${cassandra-driver.version}
-
-
- com.datastax.cassandra
- cassandra-driver-mapping
-
-
-
- org.springframework.cloud
- spring-cloud-starter-zuul
+ org.springframework.boot
+ spring-boot-test
+ test
org.springframework.cloud
@@ -307,72 +410,105 @@
org.springframework.cloud
- spring-cloud-starter-ribbon
-
-
-
- io.netty
- netty-transport-native-epoll
-
-
-
-
- org.springframework.cloud
- spring-cloud-starter-hystrix
-
-
- org.springframework.cloud
- spring-cloud-starter-spectator
-
-
- org.springframework.retry
- spring-retry
+ spring-cloud-starter-config
org.springframework.cloud
spring-cloud-starter-eureka
-
- org.springframework.cloud
- spring-cloud-starter-config
-
org.springframework.cloud
spring-cloud-starter-feign
- net.logstash.logback
- logstash-logback-encoder
- ${logstash-logback-encoder.version}
+ org.springframework.cloud
+ spring-cloud-starter-hystrix
+
+
+ org.springframework.cloud
+ spring-cloud-starter-ribbon
+
- ch.qos.logback
- logback-core
-
-
- ch.qos.logback
- logback-classic
-
-
- ch.qos.logback
- logback-access
+ netty-transport-native-epoll
+ io.netty
- org.springframework.boot
- spring-boot-starter-cloud-connectors
+ org.springframework.cloud
+ spring-cloud-starter-spectator
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-zuul
+
+
+ org.springframework.retry
+ spring-retry
org.springframework.security
spring-security-data
+
+ org.springframework.security
+ spring-security-test
+ test
+
spring-boot:run
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
+
+ prepare-agent
+
+
+
+
+
+
+
+
+ com.github.eirslett
+ frontend-maven-plugin
+ ${frontend-maven-plugin.version}
+
+ install-node-and-yarn
+ yarn
+ bower
+ gulp
+
+
+
+
+
+
+
+
+
+
+
+
com.github.ekryd.sortpom
@@ -395,6 +531,22 @@
false
+
+ com.spotify
+ docker-maven-plugin
+ ${docker-maven-plugin.version}
+
+ gateway
+ src/main/docker
+
+
+ /
+ ${project.build.directory}
+ ${project.build.finalName}.war
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -412,6 +564,7 @@
org.apache.maven.plugins
maven-eclipse-plugin
+ ${maven-eclipse-plugin.version}
true
true
@@ -518,28 +671,16 @@
-
- org.sonarsource.scanner.maven
- sonar-maven-plugin
- ${sonar-maven-plugin.version}
-
org.liquibase
liquibase-maven-plugin
${liquibase.version}
-
- src/main/resources/config/liquibase/master.xml
- src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml
- org.h2.Driver
- jdbc:h2:file:./target/h2db/db/gateway
-
- gateway
-
- hibernate:spring:com.gateway.domain?dialect=org.hibernate.dialect.H2Dialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
- true
- debug
-
+
+ javax.validation
+ validation-api
+ ${validation-api.version}
+
org.javassist
javassist
@@ -555,12 +696,24 @@
spring-boot-starter-data-jpa
${project.parent.version}
-
- javax.validation
- validation-api
- ${validation-api.version}
-
+
+ src/main/resources/config/liquibase/master.xml
+ src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml
+ org.h2.Driver
+ jdbc:h2:file:./target/h2db/db/gateway
+
+ gateway
+
+ hibernate:spring:com.gateway.domain?dialect=org.hibernate.dialect.H2Dialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+ true
+ debug
+
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ ${sonar-maven-plugin.version}
org.springframework.boot
@@ -571,74 +724,8 @@
-
- com.spotify
- docker-maven-plugin
- ${docker-maven-plugin.version}
-
- gateway
- src/main/docker
-
-
- /
- ${project.build.directory}
- ${project.build.finalName}.war
-
-
-
-
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
- org.jacoco
-
- jacoco-maven-plugin
-
-
- ${jacoco-maven-plugin.version}
-
-
- prepare-agent
-
-
-
-
-
-
-
-
- com.github.eirslett
- frontend-maven-plugin
- ${frontend-maven-plugin.version}
-
- install-node-and-yarn
- yarn
- bower
- gulp
-
-
-
-
-
-
-
-
-
-
-
-
@@ -659,17 +746,6 @@
true
-
-
- org.springframework.boot
- spring-boot-starter-undertow
-
-
- org.springframework.boot
- spring-boot-devtools
- true
-
-
@@ -687,48 +763,22 @@
dev${profile.no-liquibase}
-
-
- prod
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+
org.springframework.boot
spring-boot-starter-undertow
+
+
+ prod
-
- maven-clean-plugin
-
-
-
- target/www/
-
-
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
-
- target/www/
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
- true
-
-
-
-
- build-info
-
-
-
-
com.github.eirslett
frontend-maven-plugin
@@ -773,16 +823,47 @@
gulp test
+ test
gulp
- test
test --no-notification
+
+ maven-clean-plugin
+
+
+
+ target/www/
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+ target/www/
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ build-info
+
+
+
+
+ true
+
+
@@ -791,56 +872,20 @@
prod${profile.swagger}${profile.no-liquibase}
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
cc
-
-
- org.springframework.boot
- spring-boot-starter-undertow
-
-
- org.springframework.boot
- spring-boot-devtools
- true
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
-
- src/main/webapp/
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
- true
- true
- true
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- default-compile
- none
-
-
- default-testCompile
- none
-
-
-
net.alchim31.maven
scala-maven-plugin
@@ -869,6 +914,37 @@
${scala.version}
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ default-compile
+ none
+
+
+ default-testCompile
+ none
+
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+ src/main/webapp/
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+ true
+ true
+
+
+
@@ -877,6 +953,17 @@
dev,swagger
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
@@ -899,12 +986,12 @@
io.prometheus
- simpleclient_servlet
+ simpleclient_dropwizard
${prometheus-simpleclient.version}
io.prometheus
- simpleclient_dropwizard
+ simpleclient_servlet
${prometheus-simpleclient.version}
@@ -922,99 +1009,4 @@
-
-
-
- org.springframework.cloud
- spring-cloud-dependencies
- ${spring-cloud.version}
- pom
- import
-
-
-
-
-
- ${maven.version}
-
-
-
- -Djava.security.egd=file:/dev/./urandom -Xmx256m
- 3.6.2
- 2.0.0
- 1.10
- 2.5
- 3.5
- 0.4.13
- 1.3
- 1.2
- 5.2.8.Final
- 2.6.0
- 0.7.9
- 3.21.0-GA
- 1.0.0
- 1.1.0
- 0.7.0
- 3.6
- 2.0.0
- 4.8
- 1.3.0
- jdt_apt
- 1.1.0.Final
- 1.4.1
- 3.0.1
- yyyyMMddHHmmss
- 3.0.0
- 3.1.3
- v6.10.0
-
-
-
- 0.0.20
-
- ${project.build.directory}/test-results
- false
- 3.2.2
- 2.12.1
- 3.2
-
- src/main/webapp/content/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*
-
- S3437,UndocumentedApi,BoldAndItalicTagsCheck
-
-
- src/main/webapp/app/**/*.*
- Web:BoldAndItalicTagsCheck
-
- src/main/java/**/*
- squid:S3437
-
- src/main/java/**/*
- squid:UndocumentedApi
-
- ${project.testresult.directory}/coverage/jacoco/jacoco-it.exec
- ${project.testresult.directory}/coverage/jacoco/jacoco.exec
- jacoco
-
- ${project.testresult.directory}/karma
-
- ${project.testresult.directory}/coverage/report-lcov/lcov.info
-
- ${project.testresult.directory}/coverage/report-lcov/lcov.info
-
- ${project.basedir}/src/main/
- ${project.testresult.directory}/surefire-reports
- ${project.basedir}/src/test/
-
- 2.5.0
-
- Camden.SR5
- 2.6.1
- 1.4.10.Final
- 1.1.0.Final
- v0.21.3
-
-
diff --git a/jhipster/jhipster-microservice/pom.xml b/jhipster/jhipster-microservice/pom.xml
new file mode 100644
index 0000000000..4a60e47f87
--- /dev/null
+++ b/jhipster/jhipster-microservice/pom.xml
@@ -0,0 +1,20 @@
+
+
+ 4.0.0
+ jhipster-microservice
+ pom
+ JHipster Microservice
+
+
+ jhipster
+ com.baeldung.jhipster
+ 1.0.0-SNAPSHOT
+
+
+
+ car-app
+ dealer-app
+ gateway-app
+
+
diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster/jhipster-monolithic/pom.xml
index 9708b83a70..e242668759 100644
--- a/jhipster/jhipster-monolithic/pom.xml
+++ b/jhipster/jhipster-monolithic/pom.xml
@@ -6,10 +6,9 @@
JHipster Monolithic Application
- parent-boot-1
- com.baeldung
- 0.0.1-SNAPSHOT
- ../../parent-boot-1
+ jhipster
+ com.baeldung.jhipster
+ 1.0.0-SNAPSHOT
diff --git a/jhipster/pom.xml b/jhipster/pom.xml
new file mode 100644
index 0000000000..2bf7bcb233
--- /dev/null
+++ b/jhipster/pom.xml
@@ -0,0 +1,23 @@
+
+
+ 4.0.0
+ com.baeldung.jhipster
+ jhipster
+ 1.0.0-SNAPSHOT
+ pom
+ JHipster
+
+
+ parent-boot-1
+ com.baeldung
+ 0.0.1-SNAPSHOT
+ ../parent-boot-1
+
+
+
+ jhipster-monolithic
+ jhipster-microservice
+
+
+
diff --git a/jni/pom.xml b/jni/pom.xml
index 274b9b58c3..d4cc409d33 100644
--- a/jni/pom.xml
+++ b/jni/pom.xml
@@ -1,21 +1,12 @@
4.0.0
- com.baeldung
jni
- 0.0.1-SNAPSHOT
-
-
- junit
- junit
- ${junit.version}
- test
-
-
-
-
- 4.8.1
-
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
\ No newline at end of file
diff --git a/jni/src/test/java/com/baeldung/jni/JNINativeTests.java b/jni/src/test/java/com/baeldung/jni/JNINativeManualTest.java
similarity index 98%
rename from jni/src/test/java/com/baeldung/jni/JNINativeTests.java
rename to jni/src/test/java/com/baeldung/jni/JNINativeManualTest.java
index 42e572d41b..8201945644 100644
--- a/jni/src/test/java/com/baeldung/jni/JNINativeTests.java
+++ b/jni/src/test/java/com/baeldung/jni/JNINativeManualTest.java
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-public class JNINativeTests {
+public class JNINativeManualTest {
@Before
public void setup() {
diff --git a/jooby/pom.xml b/jooby/pom.xml
index 2867b7f4b6..83dd650701 100644
--- a/jooby/pom.xml
+++ b/jooby/pom.xml
@@ -1,60 +1,63 @@
- 4.0.0
- jooby
- com.baeldung.jooby
- 1.0
- jooby
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 4.0.0
+ jooby
+ com.baeldung.jooby
+ 1.0
+ jooby
-
- org.jooby
- modules
- 1.1.3
-
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
-
-
- org.jooby
- jooby-netty
-
-
- org.jooby
- jooby-jedis
- ${jooby-jedis.version}
-
-
- ch.qos.logback
- logback-classic
-
-
- junit
- junit
- test
-
-
- io.rest-assured
- rest-assured
- test
-
-
+
+
+
+ org.jooby
+ modules
+ ${jooby.version}
+ pom
+
+
+
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- ${maven-shade-plugin.version}
-
-
-
+
+
+ org.jooby
+ jooby-netty
+ ${jooby.version}
+
+
+ org.jooby
+ jooby-jedis
+ ${jooby.version}
+
+
+ io.rest-assured
+ rest-assured
+ test
+ ${rest-assured.version}
+
+
-
- 1.1.3
- com.baeldung.jooby.App
- 1.1.3
-
- 2.4.3
-
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ ${maven-shade-plugin.version}
+
+
+
+
+
+ 1.1.3
+ 3.1.1
+ com.baeldung.jooby.App
+ 2.4.3
+
diff --git a/jooby/src/test/java/com/baeldung/jooby/AppTest.java b/jooby/src/test/java/com/baeldung/jooby/AppUnitTest.java
similarity index 96%
rename from jooby/src/test/java/com/baeldung/jooby/AppTest.java
rename to jooby/src/test/java/com/baeldung/jooby/AppUnitTest.java
index af2626c046..ab7388f5f4 100644
--- a/jooby/src/test/java/com/baeldung/jooby/AppTest.java
+++ b/jooby/src/test/java/com/baeldung/jooby/AppUnitTest.java
@@ -9,7 +9,7 @@ import org.jooby.test.MockRouter;
import org.junit.ClassRule;
import org.junit.Test;
-public class AppTest {
+public class AppUnitTest {
@ClassRule
public static JoobyRule app = new JoobyRule(new App());
diff --git a/jta/README.md b/jta/README.md
new file mode 100644
index 0000000000..445a291c8f
--- /dev/null
+++ b/jta/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Guide to Java EE JTA](https://www.baeldung.com/jee-jta)
diff --git a/kotlin-libraries/README.md b/kotlin-libraries/README.md
index ce30c71792..30c4d03ded 100644
--- a/kotlin-libraries/README.md
+++ b/kotlin-libraries/README.md
@@ -6,5 +6,4 @@
- [Writing Specifications with Kotlin and Spek](http://www.baeldung.com/kotlin-spek)
- [Processing JSON with Kotlin and Klaxson](http://www.baeldung.com/kotlin-json-klaxson)
- [Kotlin with Ktor](http://www.baeldung.com/kotlin-ktor)
-- [Idiomatic Logging in Kotlin](http://www.baeldung.com/kotlin-logging)
-- [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)
\ No newline at end of file
+- [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 2b83328295..5b34a903ce 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -147,7 +147,6 @@
jmapper-core
${jmapper.version}
-
org.apache.crunch
@@ -185,7 +184,72 @@
-
+
+ org.apache.flink
+ flink-connector-kafka-0.11_2.11
+ ${flink.version}
+
+
+ org.apache.flink
+ flink-streaming-java_2.11
+ ${flink.version}
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}
+
+
+ org.apache.flink
+ flink-core
+ ${flink.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.apache.flink
+ flink-java
+ ${flink.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.apache.flink
+ flink-test-utils_2.11
+ ${flink.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ ${assertj.version}
+
+
+ org.awaitility
+ awaitility
+ ${awaitility.version}
+ test
+
+
+ org.awaitility
+ awaitility-proxy
+ ${awaitility.version}
+ test
+
+
@@ -336,6 +400,10 @@
2.4.0
2.8.2
1.1.0
+ 1.5.0
+ 2.8.5
+ 3.0.0
+ 3.6.2
3.8.4
1.8
3.0.0
diff --git a/libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java b/libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
rename to libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
diff --git a/libraries/src/main/java/com/baeldung/flink/LineSplitter.java b/libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/LineSplitter.java
rename to libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
diff --git a/libraries/src/main/java/com/baeldung/flink/WordCount.java b/libraries-data/src/main/java/com/baeldung/flink/WordCount.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/WordCount.java
rename to libraries-data/src/main/java/com/baeldung/flink/WordCount.java
diff --git a/libraries/src/main/java/com/baeldung/flink/connector/Consumers.java b/libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/connector/Consumers.java
rename to libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
diff --git a/libraries/src/main/java/com/baeldung/flink/connector/Producers.java b/libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/connector/Producers.java
rename to libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
diff --git a/libraries/src/main/java/com/baeldung/flink/model/Backup.java b/libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/model/Backup.java
rename to libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
diff --git a/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java b/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
similarity index 99%
rename from libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
rename to libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
index 183fa69c11..b3f75256ae 100644
--- a/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
+++ b/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
@@ -18,7 +18,6 @@ public class InputMessage {
public String getSender() {
return sender;
}
-
public void setSender(String sender) {
this.sender = sender;
}
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java b/libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java b/libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java b/libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
diff --git a/libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java b/libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
rename to libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
diff --git a/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java b/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
similarity index 89%
rename from libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
rename to libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
index 1df456bbe5..9aaf8b9877 100644
--- a/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
+++ b/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
@@ -1,8 +1,6 @@
package com.baeldung.flink.schema;
import com.baeldung.flink.model.InputMessage;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.apache.flink.api.common.serialization.DeserializationSchema;
diff --git a/libraries/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
diff --git a/libraries-security/.gitignore b/libraries-security/.gitignore
new file mode 100644
index 0000000000..71881ad3ca
--- /dev/null
+++ b/libraries-security/.gitignore
@@ -0,0 +1,14 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+/bin/
diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml
new file mode 100644
index 0000000000..3077abc29c
--- /dev/null
+++ b/libraries-security/pom.xml
@@ -0,0 +1,61 @@
+
+
+ 4.0.0
+ libraries-security
+ libraries-security
+ jar
+
+
+ com.baeldung
+ parent-boot-1
+ 0.0.1-SNAPSHOT
+ ../parent-boot-1
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.security.oauth
+ spring-security-oauth2
+ 2.3.3.RELEASE
+
+
+
+ com.github.scribejava
+ scribejava-apis
+ ${scribejava.version}
+
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+ org.passay
+ passay
+ 1.3.1
+
+
+ org.cryptacular
+ cryptacular
+ 1.2.2
+
+
+
+
+
+ 4.12
+ 2.0.4.RELEASE
+ 5.6.0
+
+
+
+
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java b/libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java
new file mode 100644
index 0000000000..bb86c497b0
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.scribejava;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+public class ScribejavaApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ScribejavaApplication.class, args);
+ }
+
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java b/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
new file mode 100644
index 0000000000..cf073d3035
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
@@ -0,0 +1,27 @@
+package com.baeldung.scribejava.api;
+
+import com.github.scribejava.core.builder.api.DefaultApi20;
+
+public class MyApi extends DefaultApi20 {
+
+ private MyApi() {
+ }
+
+ private static class InstanceHolder {
+ private static final MyApi INSTANCE = new MyApi();
+ }
+
+ public static MyApi instance() {
+ return InstanceHolder.INSTANCE;
+ }
+
+ @Override
+ public String getAccessTokenEndpoint() {
+ return "http://localhost:8080/oauth/token";
+ }
+
+ @Override
+ protected String getAuthorizationBaseUrl() {
+ return null;
+ }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java
new file mode 100644
index 0000000000..ffe4f0cc8a
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java
@@ -0,0 +1,49 @@
+package com.baeldung.scribejava.controller;
+
+import com.baeldung.scribejava.service.GoogleService;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Verb;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+public class GoogleController {
+
+ @Autowired
+ private GoogleService service;
+
+
+ @GetMapping(value ="/me/google")
+ public void me(HttpServletResponse response){
+ String auth = service.getService().getAuthorizationUrl();
+
+ response.setHeader("Location", auth);
+ response.setStatus(302);
+
+ }
+
+ @GetMapping(value = "/auth/google")
+ public String google(@RequestParam String code, HttpServletResponse servletResponse){
+
+ try {
+ OAuth2AccessToken token = service.getService().getAccessToken(code);
+
+ OAuthRequest request = new OAuthRequest(Verb.GET, "https://www.googleapis.com/oauth2/v1/userinfo?alt=json");
+ service.getService().signRequest(token, request);
+ Response response = service.getService().execute(request);
+ return response.getBody();
+
+ }catch (Exception e){
+ servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ }
+
+ return null;
+ }
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
new file mode 100644
index 0000000000..bfcd6d960c
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
@@ -0,0 +1,57 @@
+package com.baeldung.scribejava.controller;
+
+import com.baeldung.scribejava.service.TwitterService;
+import com.github.scribejava.core.model.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Scanner;
+import java.util.concurrent.ExecutionException;
+
+@RestController
+public class TwitterController {
+
+ @Autowired
+ private TwitterService service;
+
+
+ @GetMapping(value ="/me/twitter")
+ public String me(HttpServletResponse servletResponse){
+ try {
+ OAuth1RequestToken requestToken = service.getService().getRequestToken();
+
+ String auth = service.getService().getAuthorizationUrl(requestToken);
+
+ Runtime runtime = Runtime.getRuntime();
+ try {
+ runtime.exec("rundll32 url.dll,FileProtocolHandler " + auth);
+ } catch (IOException e) {
+ servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ return null;
+ }
+
+ System.out.println("Insert twitter code:");
+ Scanner in = new Scanner(System.in);
+
+ String oauthverifier = in.nextLine();
+
+ final OAuth1AccessToken accessToken = service.getService().getAccessToken(requestToken,oauthverifier);
+
+ OAuthRequest request = new OAuthRequest(Verb.GET, "https://api.twitter.com/1.1/account/verify_credentials.json");
+ service.getService().signRequest(accessToken, request);
+ Response response = service.getService().execute(request);
+ return response.getBody();
+
+ } catch (IOException | InterruptedException | ExecutionException e) {
+ servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ }
+
+ return null;
+ }
+
+
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java
new file mode 100644
index 0000000000..68a11250de
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java
@@ -0,0 +1,46 @@
+package com.baeldung.scribejava.controller;
+
+import com.baeldung.scribejava.service.MyService;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Verb;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.Principal;
+
+@RestController(value = "/user")
+public class UserController {
+
+ @Autowired
+ private MyService service;
+
+ @GetMapping("/me/myapi")
+ public String me(@RequestParam String username, @RequestParam String password, HttpServletResponse responsehttp) {
+
+ try {
+ OAuth2AccessToken token = service.getService().getAccessTokenPasswordGrant(username, password);
+
+ OAuthRequest request = new OAuthRequest(Verb.GET, "http://localhost:8080/me");
+ service.getService().signRequest(token, request);
+ Response response = service.getService().execute(request);
+
+ return response.getBody();
+
+ } catch (Exception e) {
+ responsehttp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ }
+
+ return null;
+
+ }
+
+ @GetMapping("/me")
+ public Principal user(Principal principal) {
+ return principal;
+ }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java
new file mode 100644
index 0000000000..2c7162399b
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java
@@ -0,0 +1,45 @@
+package com.baeldung.scribejava.oauth;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
+
+
+@Configuration
+@EnableAuthorizationServer
+public class AuthServiceConfig extends AuthorizationServerConfigurerAdapter {
+
+ @Autowired
+ @Qualifier("authenticationManagerBean")
+ private AuthenticationManager authenticationManager;
+
+ @Override
+ public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception {
+ oauthServer.tokenKeyAccess("permitAll()")
+ .checkTokenAccess("isAuthenticated()");
+ }
+
+ @Override
+ public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
+ clients.inMemory()
+ .withClient("baeldung_api_key")
+ .secret("baeldung_api_secret")
+ .authorizedGrantTypes("password","refresh_token")
+ .scopes("read","write").autoApprove(true);
+ }
+
+ @Override
+ public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
+ endpoints
+ .authenticationManager(authenticationManager)
+ .allowedTokenEndpointRequestMethods(HttpMethod.GET, HttpMethod.POST);
+ }
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java
new file mode 100644
index 0000000000..7aa51400ea
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java
@@ -0,0 +1,53 @@
+package com.baeldung.scribejava.oauth;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+
+@Configuration
+@EnableResourceServer
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
+ @Override
+ protected void configure(HttpSecurity http) throws Exception {
+ http
+ .headers().frameOptions().disable()
+ .and()
+ .csrf().disable();
+ }
+
+ @Override
+ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+ auth.inMemoryAuthentication()
+ .withUser("baeldung")
+ .password("scribejava")
+ .roles("USER");
+ }
+
+ @Override
+ @Bean
+ public AuthenticationManager authenticationManagerBean() throws Exception {
+ return super.authenticationManagerBean();
+ }
+
+
+ @EnableResourceServer
+ @Configuration
+ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
+
+ @Override
+ public void configure(HttpSecurity http) throws Exception {
+ http
+ .authorizeRequests()
+ .antMatchers("/user/me").authenticated()
+ .and()
+ .csrf().disable();
+ }
+ }
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java b/libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java
new file mode 100644
index 0000000000..fbcc39763c
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java
@@ -0,0 +1,31 @@
+package com.baeldung.scribejava.service;
+
+import com.github.scribejava.apis.GoogleApi20;
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.oauth.OAuth20Service;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+@Component
+public class GoogleService {
+
+ private OAuth20Service service;
+ private final String API_KEY = "api_key";
+ private final String API_SECRET = "api_secret";
+ private final String SCOPE = "https://www.googleapis.com/auth/userinfo.email";
+ private final String CALLBACK = "http://localhost:8080/auth/google";
+
+ @PostConstruct
+ private void init(){
+ this.service = new ServiceBuilder(API_KEY)
+ .apiSecret(API_SECRET)
+ .scope(SCOPE)
+ .callback(CALLBACK)
+ .build(GoogleApi20.instance());
+ }
+
+
+ public OAuth20Service getService() {
+ return service;
+ }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java b/libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java
new file mode 100644
index 0000000000..739c82172c
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java
@@ -0,0 +1,29 @@
+package com.baeldung.scribejava.service;
+
+import com.baeldung.scribejava.api.MyApi;
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.oauth.OAuth20Service;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class MyService {
+
+ private OAuth20Service service;
+ private final String API_KEY = "baeldung_api_key";
+ private final String API_SECRET = "baeldung_api_secret";
+
+ @PostConstruct
+ private void init(){
+ this.service = new ServiceBuilder(API_KEY)
+ .apiSecret(API_SECRET)
+ .scope("read write")
+ .build(MyApi.instance());
+ }
+
+
+ public OAuth20Service getService() {
+ return service;
+ }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java b/libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java
new file mode 100644
index 0000000000..df49f74679
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java
@@ -0,0 +1,29 @@
+package com.baeldung.scribejava.service;
+
+import com.github.scribejava.apis.TwitterApi;
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.oauth.OAuth10aService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class TwitterService {
+
+ private final String API_KEY = "api_key";
+ private final String API_SECRET = "api_secret";
+ private OAuth10aService service;
+
+ @PostConstruct
+ private void init(){
+ this.service = new ServiceBuilder(API_KEY)
+ .apiSecret(API_SECRET)
+ .build(TwitterApi.instance());
+ }
+
+ public OAuth10aService getService(){
+ return service;
+ }
+
+
+}
diff --git a/libraries-security/src/main/resources/application.properties b/libraries-security/src/main/resources/application.properties
new file mode 100644
index 0000000000..71c6176533
--- /dev/null
+++ b/libraries-security/src/main/resources/application.properties
@@ -0,0 +1 @@
+security.oauth2.resource.filter-order = 3
\ No newline at end of file
diff --git a/libraries-security/src/test/java/com/baeldung/passay/NegativeMatchingRulesUnitTest.java b/libraries-security/src/test/java/com/baeldung/passay/NegativeMatchingRulesUnitTest.java
new file mode 100644
index 0000000000..5054a5880e
--- /dev/null
+++ b/libraries-security/src/test/java/com/baeldung/passay/NegativeMatchingRulesUnitTest.java
@@ -0,0 +1,149 @@
+package com.baeldung.passay;
+
+import org.cryptacular.bean.EncodingHashBean;
+import org.cryptacular.spec.CodecSpec;
+import org.cryptacular.spec.DigestSpec;
+import org.junit.Assert;
+import org.junit.Test;
+import org.passay.DictionaryRule;
+import org.passay.DictionarySubstringRule;
+import org.passay.DigestHistoryRule;
+import org.passay.EnglishSequenceData;
+import org.passay.HistoryRule;
+import org.passay.IllegalCharacterRule;
+import org.passay.IllegalRegexRule;
+import org.passay.IllegalSequenceRule;
+import org.passay.NumberRangeRule;
+import org.passay.PasswordData;
+import org.passay.PasswordValidator;
+import org.passay.RepeatCharacterRegexRule;
+import org.passay.RuleResult;
+import org.passay.SourceRule;
+import org.passay.UsernameRule;
+import org.passay.WhitespaceRule;
+import org.passay.dictionary.ArrayWordList;
+import org.passay.dictionary.WordListDictionary;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class NegativeMatchingRulesUnitTest {
+
+ @Test
+ public void givenDictionaryRules_whenValidatePassword_thenFoundIllegalWordsFromDictionary() {
+ ArrayWordList arrayWordList = new ArrayWordList(new String[] { "bar", "foobar" });
+
+ WordListDictionary wordListDictionary = new WordListDictionary(arrayWordList);
+
+ DictionaryRule dictionaryRule = new DictionaryRule(wordListDictionary);
+ DictionarySubstringRule dictionarySubstringRule = new DictionarySubstringRule(wordListDictionary);
+
+ PasswordValidator passwordValidator = new PasswordValidator(dictionaryRule, dictionarySubstringRule);
+ RuleResult validate = passwordValidator.validate(new PasswordData("foobar"));
+
+ assertFalse(validate.isValid());
+ assertEquals("ILLEGAL_WORD:{matchingWord=foobar}", getDetail(validate, 0));
+ assertEquals("ILLEGAL_WORD:{matchingWord=bar}", getDetail(validate, 1));
+ }
+
+ @Test
+ public void givenHistoryRule_whenValidatePassword_thenFoundIllegalWordsFromHistory() {
+ HistoryRule historyRule = new HistoryRule();
+
+ PasswordData passwordData = new PasswordData("123");
+ passwordData.setPasswordReferences(new PasswordData.HistoricalReference("12345"), new PasswordData.HistoricalReference("1234"), new PasswordData.HistoricalReference("123"));
+
+ PasswordValidator passwordValidator = new PasswordValidator(historyRule);
+
+ RuleResult validate = passwordValidator.validate(passwordData);
+
+ assertFalse(validate.isValid());
+ assertEquals("HISTORY_VIOLATION:{historySize=3}", getDetail(validate, 0));
+ }
+
+ @Test
+ public void givenSeveralIllegalRules_whenValidatePassword_thenFoundSeveralIllegalPatterns() {
+ IllegalCharacterRule illegalCharacterRule = new IllegalCharacterRule(new char[] { 'a' });
+ IllegalRegexRule illegalRegexRule = new IllegalRegexRule("\\w{2}\\d{2}");
+ IllegalSequenceRule illegalSequenceRule = new IllegalSequenceRule(EnglishSequenceData.Alphabetical, 3, true);
+ NumberRangeRule numberRangeRule = new NumberRangeRule(1, 10);
+ WhitespaceRule whitespaceRule = new WhitespaceRule();
+
+ PasswordValidator passwordValidator = new PasswordValidator(illegalCharacterRule, illegalRegexRule, illegalSequenceRule, numberRangeRule, whitespaceRule);
+
+ RuleResult validate = passwordValidator.validate(new PasswordData("abcd22 "));
+
+ assertFalse(validate.isValid());
+ assertEquals("ILLEGAL_CHAR:{illegalCharacter=a, matchBehavior=contains}", getDetail(validate, 0));
+ assertEquals("ILLEGAL_MATCH:{match=cd22, pattern=\\w{2}\\d{2}}", getDetail(validate, 1));
+ assertEquals("ILLEGAL_ALPHABETICAL_SEQUENCE:{sequence=abc}", getDetail(validate, 2));
+ assertEquals("ILLEGAL_ALPHABETICAL_SEQUENCE:{sequence=bcd}", getDetail(validate, 3));
+ assertEquals("ILLEGAL_NUMBER_RANGE:{number=2, matchBehavior=contains}", getDetail(validate, 4));
+ assertEquals("ILLEGAL_WHITESPACE:{whitespaceCharacter= , matchBehavior=contains}", getDetail(validate, 5));
+ }
+
+ @Test
+ public void givenSourceRule_whenValidatePassword_thenFoundIllegalWordsFromSource() {
+ SourceRule sourceRule = new SourceRule();
+
+ PasswordData passwordData = new PasswordData("password");
+ passwordData.setPasswordReferences(new PasswordData.SourceReference("source", "password"));
+
+ PasswordValidator passwordValidator = new PasswordValidator(sourceRule);
+ RuleResult validate = passwordValidator.validate(passwordData);
+
+ assertFalse(validate.isValid());
+ assertEquals("SOURCE_VIOLATION:{source=source}", getDetail(validate, 0));
+ }
+
+ @Test
+ public void givenRepeatCharacterRegexRuleRule_whenValidatePassword_thenFoundIllegalPatternMatches() {
+ RepeatCharacterRegexRule repeatCharacterRegexRule = new RepeatCharacterRegexRule(3);
+
+ PasswordValidator passwordValidator = new PasswordValidator(repeatCharacterRegexRule);
+
+ RuleResult validate = passwordValidator.validate(new PasswordData("aaabbb"));
+
+ assertFalse(validate.isValid());
+ assertEquals("ILLEGAL_MATCH:{match=aaa, pattern=([^\\x00-\\x1F])\\1{2}}", getDetail(validate, 0));
+ assertEquals("ILLEGAL_MATCH:{match=bbb, pattern=([^\\x00-\\x1F])\\1{2}}", getDetail(validate, 1));
+ }
+
+ @Test
+ public void givenUserNameRule_whenValidatePassword_thenFoundUserNameInPassword() {
+ PasswordValidator passwordValidator = new PasswordValidator(new UsernameRule());
+
+ PasswordData passwordData = new PasswordData("testuser1234");
+ passwordData.setUsername("testuser");
+
+ RuleResult validate = passwordValidator.validate(passwordData);
+
+ assertFalse(validate.isValid());
+ assertEquals("ILLEGAL_USERNAME:{username=testuser, matchBehavior=contains}", getDetail(validate, 0));
+ }
+
+ @Test
+ public void givenPasswordAndHashBeanAndEncryptedReferences_whenValidate_thenPasswordValidationShouldPass() {
+ List historicalReferences = Arrays.asList(new PasswordData.HistoricalReference("SHA256", "2e4551de804e27aacf20f9df5be3e8cd384ed64488b21ab079fb58e8c90068ab"));
+ PasswordData passwordData = new PasswordData("example!");
+ passwordData.setPasswordReferences(historicalReferences);
+
+ EncodingHashBean encodingHashBean = new EncodingHashBean(new CodecSpec("Base64"), new DigestSpec("SHA256"), 1, false);
+
+ PasswordValidator passwordValidator = new PasswordValidator(new DigestHistoryRule(encodingHashBean));
+
+ RuleResult validate = passwordValidator.validate(passwordData);
+
+ Assert.assertTrue(validate.isValid());
+ }
+
+ private String getDetail(RuleResult validate, int i) {
+ return validate.getDetails()
+ .get(i)
+ .toString();
+ }
+
+}
diff --git a/libraries-security/src/test/java/com/baeldung/passay/PasswordGeneratorUnitTest.java b/libraries-security/src/test/java/com/baeldung/passay/PasswordGeneratorUnitTest.java
new file mode 100644
index 0000000000..ff279e9317
--- /dev/null
+++ b/libraries-security/src/test/java/com/baeldung/passay/PasswordGeneratorUnitTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.passay;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.passay.CharacterData;
+import org.passay.CharacterRule;
+import org.passay.EnglishCharacterData;
+import org.passay.PasswordGenerator;
+
+import java.util.stream.Stream;
+
+public class PasswordGeneratorUnitTest {
+
+ @Test
+ public void givenDigitsGenerator_whenGeneratingPassword_thenPasswordContainsDigitsHasLength10() {
+ CharacterRule digits = new CharacterRule(EnglishCharacterData.Digit);
+
+ PasswordGenerator passwordGenerator = new PasswordGenerator();
+ String password = passwordGenerator.generatePassword(10, digits);
+
+ Assert.assertTrue(password.length() == 10);
+ Assert.assertTrue(containsOnlyCharactersFromSet(password, "0123456789"));
+ }
+
+ @Test
+ public void givenCustomizedRule_whenGenerating_thenGeneratedPasswordContainsCustomizedCharacters() {
+ CharacterRule specialCharacterRule = new CharacterRule(new CharacterData() {
+ @Override
+ public String getErrorCode() {
+ return "SAMPLE_ERROR_CODE";
+ }
+
+ @Override
+ public String getCharacters() {
+ return "ABCxyz123!@#";
+ }
+ });
+
+ PasswordGenerator passwordGenerator = new PasswordGenerator();
+ String password = passwordGenerator.generatePassword(10, specialCharacterRule);
+
+ Assert.assertTrue(containsOnlyCharactersFromSet(password, "ABCxyz123!@#"));
+ }
+
+ private boolean containsOnlyCharactersFromSet(String password, String setOfCharacters) {
+ return Stream.of(password.split(""))
+ .allMatch(it -> setOfCharacters.contains(it));
+ }
+
+}
diff --git a/libraries-security/src/test/java/com/baeldung/passay/PasswordValidatorUnitTest.java b/libraries-security/src/test/java/com/baeldung/passay/PasswordValidatorUnitTest.java
new file mode 100644
index 0000000000..3fc59a82d5
--- /dev/null
+++ b/libraries-security/src/test/java/com/baeldung/passay/PasswordValidatorUnitTest.java
@@ -0,0 +1,81 @@
+package com.baeldung.passay;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.passay.LengthRule;
+import org.passay.MessageResolver;
+import org.passay.PasswordData;
+import org.passay.PasswordValidator;
+import org.passay.PropertiesMessageResolver;
+import org.passay.RuleResult;
+import org.passay.RuleResultDetail;
+import org.passay.RuleResultMetadata;
+import org.passay.WhitespaceRule;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class PasswordValidatorUnitTest {
+
+ @Test
+ public void givenPasswordValidatorWithLengthRule_whenValidation_thenTooShortPassword() {
+ PasswordData passwordData = new PasswordData("1234");
+
+ PasswordValidator passwordValidator = new PasswordValidator(new LengthRule(5));
+
+ RuleResult validate = passwordValidator.validate(passwordData);
+ assertEquals(false, validate.isValid());
+
+ RuleResultDetail ruleResultDetail = validate.getDetails()
+ .get(0);
+ assertEquals("TOO_SHORT", ruleResultDetail.getErrorCode());
+ assertEquals(5, ruleResultDetail.getParameters()
+ .get("minimumLength"));
+ assertEquals(5, ruleResultDetail.getParameters()
+ .get("maximumLength"));
+
+ Integer lengthCount = validate.getMetadata()
+ .getCounts()
+ .get(RuleResultMetadata.CountCategory.Length);
+ assertEquals(Integer.valueOf(4), lengthCount);
+ }
+
+ @Test
+ public void givenPasswordValidatorWithLengthRule_whenValidation_thenTooLongPassword() {
+ PasswordData passwordData = new PasswordData("123456");
+
+ PasswordValidator passwordValidator = new PasswordValidator(new LengthRule(5));
+
+ RuleResult validate = passwordValidator.validate(passwordData);
+ assertFalse(validate.isValid());
+ Assert.assertEquals("TOO_LONG", validate.getDetails()
+ .get(0)
+ .getErrorCode());
+ }
+
+ @Test
+ public void givenPasswordValidatorWithLengthRule_whenValidation_thenCustomizedMeesagesAvailable() throws IOException {
+ URL resource = this.getClass()
+ .getClassLoader()
+ .getResource("messages.properties");
+ Properties props = new Properties();
+ props.load(new FileInputStream(resource.getPath()));
+
+ MessageResolver resolver = new PropertiesMessageResolver(props);
+ PasswordValidator validator = new PasswordValidator(resolver, new LengthRule(8, 16), new WhitespaceRule());
+
+ RuleResult tooShort = validator.validate(new PasswordData("XXXX"));
+ RuleResult tooLong = validator.validate(new PasswordData("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"));
+
+ assertEquals("Password must not contain less characters than 16.", validator.getMessages(tooShort)
+ .get(0));
+ assertEquals("Password must not have more characters than 16.", validator.getMessages(tooLong)
+ .get(0));
+ }
+
+}
diff --git a/libraries-security/src/test/java/com/baeldung/passay/PositiveMatchingRulesUnitTest.java b/libraries-security/src/test/java/com/baeldung/passay/PositiveMatchingRulesUnitTest.java
new file mode 100644
index 0000000000..0da1b43335
--- /dev/null
+++ b/libraries-security/src/test/java/com/baeldung/passay/PositiveMatchingRulesUnitTest.java
@@ -0,0 +1,76 @@
+package com.baeldung.passay;
+
+import org.junit.Test;
+import org.passay.AllowedCharacterRule;
+import org.passay.AllowedRegexRule;
+import org.passay.CharacterCharacteristicsRule;
+import org.passay.CharacterRule;
+import org.passay.EnglishCharacterData;
+import org.passay.LengthComplexityRule;
+import org.passay.LengthRule;
+import org.passay.PasswordData;
+import org.passay.PasswordValidator;
+import org.passay.RuleResult;
+
+import static org.junit.Assert.*;
+
+public class PositiveMatchingRulesUnitTest {
+
+ @Test
+ public void givenPasswordValidationRules_whenValidatingPassword_thenPosswordIsNotValidWithSeveralErrors() {
+ PasswordValidator passwordValidator = new PasswordValidator(new AllowedCharacterRule(new char[] { 'a', 'b', 'c' }), new AllowedRegexRule("\\d{2}\\w{10}"), new CharacterRule(EnglishCharacterData.LowerCase, 5), new LengthRule(8, 10));
+
+ RuleResult validate = passwordValidator.validate(new PasswordData("12abc"));
+
+ assertFalse(validate.isValid());
+ assertEquals("ALLOWED_CHAR:{illegalCharacter=1, matchBehavior=contains}", getDetail(validate, 0));
+ assertEquals("ALLOWED_CHAR:{illegalCharacter=2, matchBehavior=contains}", getDetail(validate, 1));
+ assertEquals("ALLOWED_MATCH:{pattern=\\d{2}\\w{10}}", getDetail(validate, 2));
+ assertEquals("INSUFFICIENT_LOWERCASE:{" + "minimumRequired=5, matchingCharacterCount=3, " + "validCharacters=abcdefghijklmnopqrstuvwxyz, " + "matchingCharacters=abc}", getDetail(validate, 3));
+ assertEquals("TOO_SHORT:{minimumLength=8, maximumLength=10}", getDetail(validate, 4));
+ }
+
+ @Test
+ public void givenRulesForDifferentPasswordLength_whenValidatingTwoDifferentPassword_thenBothOfThemAreInvalid() {
+ PasswordData shortPassword = new PasswordData("12ab");
+ PasswordData longPassword = new PasswordData("1234abcde");
+
+ LengthComplexityRule lengthComplexityRule = new LengthComplexityRule();
+ lengthComplexityRule.addRules("[1,5]", new CharacterRule(EnglishCharacterData.LowerCase, 5));
+ lengthComplexityRule.addRules("[6,10]", new AllowedCharacterRule(new char[] { 'a', 'b', 'c', 'd' }));
+
+ PasswordValidator passwordValidator = new PasswordValidator(lengthComplexityRule);
+
+ RuleResult validateShort = passwordValidator.validate(shortPassword);
+ RuleResult validateLong = passwordValidator.validate(longPassword);
+
+ assertFalse(validateShort.isValid());
+ assertFalse(validateLong.isValid());
+
+ assertEquals("INSUFFICIENT_LOWERCASE:{" + "minimumRequired=5, " + "matchingCharacterCount=2, " + "validCharacters=abcdefghijklmnopqrstuvwxyz, " + "matchingCharacters=ab}", getDetail(validateShort, 0));
+ assertEquals("ALLOWED_CHAR:{illegalCharacter=1, matchBehavior=contains}", getDetail(validateLong, 0));
+ }
+
+ @Test
+ public void givenCharacterCharacteristicsRule_whenValidatingPassword_thenItIsInvalidAsItBreaksToManyRules() {
+ PasswordData shortPassword = new PasswordData();
+ shortPassword.setPassword("12345abcde!");
+
+ CharacterCharacteristicsRule characterCharacteristicsRule = new CharacterCharacteristicsRule(4, new CharacterRule(EnglishCharacterData.LowerCase, 5), new CharacterRule(EnglishCharacterData.UpperCase, 5), new CharacterRule(EnglishCharacterData.Digit),
+ new CharacterRule(EnglishCharacterData.Special));
+
+ PasswordValidator passwordValidator = new PasswordValidator(characterCharacteristicsRule);
+
+ RuleResult validate = passwordValidator.validate(shortPassword);
+ assertFalse(validate.isValid());
+
+ assertEquals("INSUFFICIENT_UPPERCASE:{" + "minimumRequired=5, " + "matchingCharacterCount=0, " + "validCharacters=ABCDEFGHIJKLMNOPQRSTUVWXYZ, " + "matchingCharacters=}", getDetail(validate, 0));
+ assertEquals("INSUFFICIENT_CHARACTERISTICS:{" + "successCount=3, " + "minimumRequired=4, " + "ruleCount=4}", getDetail(validate, 1));
+ }
+
+ private String getDetail(RuleResult validate, int i) {
+ return validate.getDetails()
+ .get(i)
+ .toString();
+ }
+}
diff --git a/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/spring/cloud/LogSinkApplicationIntegrationTest.java b/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaUnitTest.java
similarity index 67%
rename from spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/spring/cloud/LogSinkApplicationIntegrationTest.java
rename to libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaUnitTest.java
index b362d72705..6565a5b085 100644
--- a/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/spring/cloud/LogSinkApplicationIntegrationTest.java
+++ b/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.cloud;
+package com.baeldung.scribejava;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -7,10 +7,11 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
-public class LogSinkApplicationIntegrationTest {
+public class ScribejavaUnitTest {
@Test
- public void contextLoads() {
+ public void contextLoad(){
+
}
}
diff --git a/libraries-security/src/test/resources/messages.properties b/libraries-security/src/test/resources/messages.properties
new file mode 100644
index 0000000000..ad0039d71d
--- /dev/null
+++ b/libraries-security/src/test/resources/messages.properties
@@ -0,0 +1,2 @@
+TOO_LONG=Password must not have more characters than %2$s.
+TOO_SHORT=Password must not contain less characters than %2$s.
\ No newline at end of file
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 1a88acfb7b..91c54b6113 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -154,45 +154,7 @@
commons-dbutils
${commons.dbutils.version}
-
- org.apache.flink
- flink-connector-kafka-0.11_2.11
- ${flink.version}
-
-
- org.apache.flink
- flink-streaming-java_2.11
- ${flink.version}
-
-
- org.apache.flink
- flink-core
- ${flink.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
- org.apache.flink
- flink-java
- ${flink.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
- org.apache.flink
- flink-test-utils_2.11
- ${flink.version}
- test
-
org.apache.commons
commons-math3
@@ -239,11 +201,7 @@
jackson-databind
${jackson.version}
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
- ${jackson.version}
-
+
org.datanucleus
@@ -900,7 +858,6 @@
4.5.3
2.5
- 1.5.0
2.8.5
2.92
1.9.26
@@ -933,7 +890,7 @@
2.5.5
1.23.0
v4-rev493-1.21.0
- 1.0.0
+ 2.0.0
1.7.0
3.0.14
2.2.0
diff --git a/libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java b/libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java
new file mode 100644
index 0000000000..7d4316e3ec
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java
@@ -0,0 +1,8 @@
+package com.baeldung.commons.lang3.application;
+
+public class Application {
+
+ public static void main(String[] args) {
+
+ }
+}
diff --git a/libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java b/libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java
new file mode 100644
index 0000000000..68aab46c33
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java
@@ -0,0 +1,25 @@
+package com.baeldung.commons.lang3.beans;
+
+public class User {
+
+ private final String name;
+ private final String email;
+
+ public User(String name, String email) {
+ this.name = name;
+ this.email = email;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ @Override
+ public String toString() {
+ return "User{" + "name=" + name + ", email=" + email + '}';
+ }
+}
diff --git a/libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java b/libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java
new file mode 100644
index 0000000000..ae5d80244c
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java
@@ -0,0 +1,11 @@
+package com.baeldung.commons.lang3.beans;
+
+import org.apache.commons.lang3.concurrent.LazyInitializer;
+
+public class UserInitializer extends LazyInitializer {
+
+ @Override
+ protected User initialize() {
+ return new User("John", "john@domain.com");
+ }
+}
diff --git a/libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java b/libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java
new file mode 100644
index 0000000000..15488bbaf4
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java
@@ -0,0 +1,56 @@
+package com.baeldung.kafka;
+
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.KafkaException;
+
+import java.util.Properties;
+import java.util.stream.Stream;
+
+import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.TRANSACTIONAL_ID_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
+
+public class TransactionalMessageProducer {
+
+ private static final String DATA_MESSAGE_1 = "Put any space separated data here for count";
+ private static final String DATA_MESSAGE_2 = "Output will contain count of every word in the message";
+
+ public static void main(String[] args) {
+
+ KafkaProducer producer = createKafkaProducer();
+
+ producer.initTransactions();
+
+ try{
+
+ producer.beginTransaction();
+
+ Stream.of(DATA_MESSAGE_1, DATA_MESSAGE_2).forEach(s -> producer.send(
+ new ProducerRecord("input", null, s)));
+
+ producer.commitTransaction();
+
+ }catch (KafkaException e){
+
+ producer.abortTransaction();
+
+ }
+
+ }
+
+ private static KafkaProducer createKafkaProducer() {
+
+ Properties props = new Properties();
+ props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ props.put(ENABLE_IDEMPOTENCE_CONFIG, "true");
+ props.put(TRANSACTIONAL_ID_CONFIG, "prod-0");
+ props.put(KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+ props.put(VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+
+ return new KafkaProducer(props);
+
+ }
+}
diff --git a/libraries/src/main/java/com/baeldung/kafka/TransactionalWordCount.java b/libraries/src/main/java/com/baeldung/kafka/TransactionalWordCount.java
new file mode 100644
index 0000000000..0563ba6684
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/kafka/TransactionalWordCount.java
@@ -0,0 +1,105 @@
+package com.baeldung.kafka;
+
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.KafkaException;
+import org.apache.kafka.common.TopicPartition;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.time.Duration.ofSeconds;
+import static java.util.Collections.singleton;
+import static org.apache.kafka.clients.consumer.ConsumerConfig.*;
+import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.*;
+
+public class TransactionalWordCount {
+
+ private static final String CONSUMER_GROUP_ID = "my-group-id";
+ private static final String OUTPUT_TOPIC = "output";
+ private static final String INPUT_TOPIC = "input";
+
+ public static void main(String[] args) {
+
+ KafkaConsumer consumer = createKafkaConsumer();
+ KafkaProducer producer = createKafkaProducer();
+
+ producer.initTransactions();
+
+ try {
+
+ while (true) {
+
+ ConsumerRecords records = consumer.poll(ofSeconds(60));
+
+ Map wordCountMap = records.records(new TopicPartition(INPUT_TOPIC, 0))
+ .stream()
+ .flatMap(record -> Stream.of(record.value().split(" ")))
+ .map(word -> Tuple.of(word, 1))
+ .collect(Collectors.toMap(tuple -> tuple.getKey(), t1 -> t1.getValue(), (v1, v2) -> v1 + v2));
+
+ producer.beginTransaction();
+
+ wordCountMap.forEach((key, value) -> producer.send(new ProducerRecord(OUTPUT_TOPIC, key, value.toString())));
+
+ Map offsetsToCommit = new HashMap<>();
+
+ for (TopicPartition partition : records.partitions()) {
+ List> partitionedRecords = records.records(partition);
+ long offset = partitionedRecords.get(partitionedRecords.size() - 1).offset();
+
+ offsetsToCommit.put(partition, new OffsetAndMetadata(offset + 1));
+ }
+
+ producer.sendOffsetsToTransaction(offsetsToCommit, CONSUMER_GROUP_ID);
+ producer.commitTransaction();
+
+ }
+
+ } catch (KafkaException e) {
+
+ producer.abortTransaction();
+
+ }
+
+
+ }
+
+ private static KafkaConsumer createKafkaConsumer() {
+ Properties props = new Properties();
+ props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ props.put(GROUP_ID_CONFIG, CONSUMER_GROUP_ID);
+ props.put(ENABLE_AUTO_COMMIT_CONFIG, "false");
+ props.put(ISOLATION_LEVEL_CONFIG, "read_committed");
+ props.put(KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+ props.put(VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+
+ KafkaConsumer consumer = new KafkaConsumer<>(props);
+ consumer.subscribe(singleton(INPUT_TOPIC));
+ return consumer;
+ }
+
+ private static KafkaProducer createKafkaProducer() {
+
+ Properties props = new Properties();
+ props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ props.put(ENABLE_IDEMPOTENCE_CONFIG, "true");
+ props.put(TRANSACTIONAL_ID_CONFIG, "prod-1");
+ props.put(KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+ props.put(VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+
+ return new KafkaProducer(props);
+
+ }
+
+}
diff --git a/libraries/src/main/java/com/baeldung/kafka/Tuple.java b/libraries/src/main/java/com/baeldung/kafka/Tuple.java
new file mode 100644
index 0000000000..883de4ba21
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/kafka/Tuple.java
@@ -0,0 +1,24 @@
+package com.baeldung.kafka;
+
+public class Tuple {
+
+ private String key;
+ private Integer value;
+
+ private Tuple(String key, Integer value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public static Tuple of(String key, Integer value){
+ return new Tuple(key,value);
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+}
diff --git a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java b/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
index 76d044ca60..086f32677e 100644
--- a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
+++ b/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
@@ -18,16 +18,19 @@ import java.util.List;
public class BeanExamples {
public static List beanBuilderExample(Path path, Class clazz) {
+ ColumnPositionMappingStrategy ms = new ColumnPositionMappingStrategy();
+ return beanBuilderExample(path, clazz, ms);
+ }
+
+ public static List beanBuilderExample(Path path, Class clazz, MappingStrategy ms) {
CsvTransfer csvTransfer = new CsvTransfer();
try {
- ColumnPositionMappingStrategy ms = new ColumnPositionMappingStrategy();
ms.setType(clazz);
Reader reader = Files.newBufferedReader(path);
- CsvToBean cb = new CsvToBeanBuilder(reader)
- .withType(clazz)
- .withMappingStrategy(ms)
- .build();
+ CsvToBean cb = new CsvToBeanBuilder(reader).withType(clazz)
+ .withMappingStrategy(ms)
+ .build();
csvTransfer.setCsvList(cb.parse());
reader.close();
@@ -40,11 +43,10 @@ public class BeanExamples {
public static String writeCsvFromBean(Path path) {
try {
- Writer writer = new FileWriter(path.toString());
+ Writer writer = new FileWriter(path.toString());
- StatefulBeanToCsv sbc = new StatefulBeanToCsvBuilder(writer)
- .withSeparator(CSVWriter.DEFAULT_SEPARATOR)
- .build();
+ StatefulBeanToCsv sbc = new StatefulBeanToCsvBuilder(writer).withSeparator(CSVWriter.DEFAULT_SEPARATOR)
+ .build();
List list = new ArrayList<>();
list.add(new WriteExampleBean("Test1", "sfdsf", "fdfd"));
diff --git a/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java b/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java
index e46d8654a2..64e13a277e 100644
--- a/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java
@@ -42,4 +42,13 @@ public class BidiMapUnitTest {
map.put("key1", "value1");
assertEquals(map.getKey("value1"), "key1");
}
+
+ @Test
+ public void givenKeyValue_whenAddValue_thenReplaceFirstKey() {
+ BidiMap map = new DualHashBidiMap<>();
+ map.put("key1", "value1");
+ map.put("key2", "value1");
+ assertEquals(map.size(), 1);
+ assertFalse(map.containsKey("key1"));
+ }
}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java
new file mode 100644
index 0000000000..5eba736b4a
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java
@@ -0,0 +1,84 @@
+package com.baeldung.commons.lang3.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.ArrayUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ArrayUtilsUnitTest {
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledtoString_thenCorrect() {
+ String[] array = {"a", "b", "c"};
+ assertThat(ArrayUtils.toString(array)).isEqualTo("{a,b,c}");
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledtoStringIfArrayisNull_thenCorrect() {
+ String[] array = null;
+ assertThat(ArrayUtils.toString(array, "Array is null")).isEqualTo("Array is null");
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledhashCode_thenCorrect() {
+ String[] array = {"a", "b", "c"};
+ assertThat(ArrayUtils.hashCode(array)).isEqualTo(997619);
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledtoMap_thenCorrect() {
+ String[][] array = {{"1", "one", }, {"2", "two", }, {"3", "three"}};
+ Map map = new HashMap();
+ map.put("1", "one");
+ map.put("2", "two");
+ map.put("3", "three");
+ assertThat(ArrayUtils.toMap(array)).isEqualTo(map);
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCallednullToEmptyStringArray_thenCorrect() {
+ String[] array = null;
+ assertThat(ArrayUtils.nullToEmpty(array)).isEmpty();
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCallednullToEmptyObjectArray_thenCorrect() {
+ Object[] array = null;
+ assertThat(ArrayUtils.nullToEmpty(array)).isEmpty();
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledsubarray_thenCorrect() {
+ int[] array = {1, 2, 3};
+ int[] expected = {1};
+ assertThat(ArrayUtils.subarray(array, 0, 1)).isEqualTo(expected);
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledisSameLength_thenCorrect() {
+ int[] array1 = {1, 2, 3};
+ int[] array2 = {1, 2, 3};
+ assertThat(ArrayUtils.isSameLength(array1, array2)).isTrue();
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledreverse_thenCorrect() {
+ int[] array1 = {1, 2, 3};
+ int[] array2 = {3, 2, 1};
+ ArrayUtils.reverse(array1);
+ assertThat(array1).isEqualTo(array2);
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledIndexOf_thenCorrect() {
+ int[] array = {1, 2, 3};
+ assertThat(ArrayUtils.indexOf(array, 1, 0)).isEqualTo(0);
+ }
+
+ @Test
+ public void givenArrayUtilsClass_whenCalledcontains_thenCorrect() {
+ int[] array = {1, 2, 3};
+ assertThat(ArrayUtils.contains(array, 1)).isTrue();
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java
new file mode 100644
index 0000000000..f32980269a
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class BasicThreadFactoryUnitTest {
+
+ @Test
+ public void givenBasicThreadFactoryInstance_whenCalledBuilder_thenCorrect() {
+ BasicThreadFactory factory = new BasicThreadFactory.Builder()
+ .namingPattern("workerthread-%d")
+ .daemon(true)
+ .priority(Thread.MAX_PRIORITY)
+ .build();
+ assertThat(factory).isInstanceOf(BasicThreadFactory.class);
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java
new file mode 100644
index 0000000000..f55f239d75
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang3.reflect.ConstructorUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ConstructorUtilsUnitTest {
+
+ @Test
+ public void givenConstructorUtilsClass_whenCalledgetAccessibleConstructor_thenCorrect() {
+ assertThat(ConstructorUtils.getAccessibleConstructor(User.class, String.class, String.class)).isInstanceOf(Constructor.class);
+ }
+
+ @Test
+ public void givenConstructorUtilsClass_whenCalledinvokeConstructor_thenCorrect() throws Exception {
+ assertThat(ConstructorUtils.invokeConstructor(User.class, "name", "email")).isInstanceOf(User.class);
+ }
+
+ @Test
+ public void givenConstructorUtilsClass_whenCalledinvokeExactConstructor_thenCorrect() throws Exception {
+ String[] args = {"name", "email"};
+ Class[] parameterTypes= {String.class, String.class};
+ assertThat(ConstructorUtils.invokeExactConstructor(User.class, args, parameterTypes)).isInstanceOf(User.class);
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java
new file mode 100644
index 0000000000..8abb373e30
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class FieldUtilsUnitTest {
+
+ private static User user;
+
+ @BeforeClass
+ public static void setUpUserInstance() {
+ user = new User("Julie", "julie@domain.com");
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledgetField_thenCorrect() {
+ assertThat(FieldUtils.getField(User.class, "name", true).getName()).isEqualTo("name");
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledgetFieldForceAccess_thenCorrect() {
+ assertThat(FieldUtils.getField(User.class, "name", true).getName()).isEqualTo("name");
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledgetDeclaredFieldForceAccess_thenCorrect() {
+ assertThat(FieldUtils.getDeclaredField(User.class, "name", true).getName()).isEqualTo("name");
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledgetAllField_thenCorrect() {
+ assertThat(FieldUtils.getAllFields(User.class).length).isEqualTo(2);
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledreadField_thenCorrect() throws IllegalAccessException {
+ assertThat(FieldUtils.readField(user, "name", true)).isEqualTo("Julie");
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledreadDeclaredField_thenCorrect() throws IllegalAccessException {
+ assertThat(FieldUtils.readDeclaredField(user, "name", true)).isEqualTo("Julie");
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledwriteField_thenCorrect() throws IllegalAccessException {
+ FieldUtils.writeField(user, "name", "Julie", true);
+ assertThat(FieldUtils.readField(user, "name", true)).isEqualTo("Julie");
+
+ }
+
+ @Test
+ public void givenFieldUtilsClass_whenCalledwriteDeclaredField_thenCorrect() throws IllegalAccessException {
+ FieldUtils.writeDeclaredField(user, "name", "Julie", true);
+ assertThat(FieldUtils.readField(user, "name", true)).isEqualTo("Julie");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java
new file mode 100644
index 0000000000..1a5094a16d
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.math.Fraction;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class FractionUnitTest {
+
+ @Test
+ public void givenFractionClass_whenCalledgetFraction_thenCorrect() {
+ assertThat(Fraction.getFraction(5, 6)).isInstanceOf(Fraction.class);
+ }
+
+ @Test
+ public void givenTwoFractionInstances_whenCalledadd_thenCorrect() {
+ Fraction fraction1 = Fraction.getFraction(1, 4);
+ Fraction fraction2 = Fraction.getFraction(3, 4);
+ assertThat(fraction1.add(fraction2).toString()).isEqualTo("1/1");
+ }
+
+ @Test
+ public void givenTwoFractionInstances_whenCalledsubstract_thenCorrect() {
+ Fraction fraction1 = Fraction.getFraction(3, 4);
+ Fraction fraction2 = Fraction.getFraction(1, 4);
+ assertThat(fraction1.subtract(fraction2).toString()).isEqualTo("1/2");
+ }
+
+ @Test
+ public void givenTwoFractionInstances_whenCalledmultiply_thenCorrect() {
+ Fraction fraction1 = Fraction.getFraction(3, 4);
+ Fraction fraction2 = Fraction.getFraction(1, 4);
+ assertThat(fraction1.multiplyBy(fraction2).toString()).isEqualTo("3/16");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java
new file mode 100644
index 0000000000..bbd24c8207
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class HashCodeBuilderUnitTest {
+
+ @Test
+ public void givenHashCodeBuilderInstance_whenCalledtoHashCode_thenCorrect() {
+ int hashcode = new HashCodeBuilder(17, 37)
+ .append("John")
+ .append("john@domain.com")
+ .toHashCode();
+ assertThat(hashcode).isEqualTo(1269178828);
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java
new file mode 100644
index 0000000000..28ed8d2514
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ImmutablePairUnitTest {
+
+ private static ImmutablePair immutablePair;
+
+ @BeforeClass
+ public static void setUpImmutablePairInstance() {
+ immutablePair = new ImmutablePair<>("leftElement", "rightElement");
+ }
+
+ @Test
+ public void givenImmutablePairInstance_whenCalledgetLeft_thenCorrect() {
+ assertThat(immutablePair.getLeft()).isEqualTo("leftElement");
+ }
+
+ @Test
+ public void givenImmutablePairInstance_whenCalledgetRight_thenCorrect() {
+ assertThat(immutablePair.getRight()).isEqualTo("rightElement");
+ }
+
+ @Test
+ public void givenImmutablePairInstance_whenCalledof_thenCorrect() {
+ assertThat(ImmutablePair.of("leftElement", "rightElement")).isInstanceOf(ImmutablePair.class);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void givenImmutablePairInstance_whenCalledSetValue_thenThrowUnsupportedOperationException() {
+ immutablePair.setValue("newValue");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java
new file mode 100644
index 0000000000..a9dd3fa7c0
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.ImmutableTriple;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ImmutableTripleUnitTest {
+
+ private static ImmutableTriple immutableTriple;
+
+ @BeforeClass
+ public static void setUpImmutableTripleInstance() {
+ immutableTriple = new ImmutableTriple<>("leftElement", "middleElement", "rightElement");
+ }
+
+ @Test
+ public void givenImmutableTripleInstance_whenCalledgetLeft_thenCorrect() {
+ assertThat(immutableTriple.getLeft()).isEqualTo("leftElement");
+ }
+
+ @Test
+ public void givenImmutableTripleInstance_whenCalledgetMiddle_thenCorrect() {
+ assertThat(immutableTriple.getMiddle()).isEqualTo("middleElement");
+ }
+
+ @Test
+ public void givenImmutableInstance_whenCalledgetRight_thenCorrect() {
+ assertThat(immutableTriple.getRight()).isEqualTo("rightElement");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java
new file mode 100644
index 0000000000..a08399f8de
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import com.baeldung.commons.lang3.beans.UserInitializer;
+import org.apache.commons.lang3.concurrent.ConcurrentException;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class LazyInitializerUnitTest {
+
+ @Test
+ public void givenLazyInitializerInstance_whenCalledget_thenCorrect() throws ConcurrentException {
+ UserInitializer userInitializer = new UserInitializer();
+ assertThat(userInitializer.get()).isInstanceOf(User.class);
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java
new file mode 100644
index 0000000000..5e1d15f2f8
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import java.lang.reflect.Method;
+import org.apache.commons.lang3.reflect.MethodUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class MethodUtilsUnitTest {
+
+ @Test
+ public void givenMethodUtilsClass_whenCalledgetAccessibleMethod_thenCorrect() {
+ assertThat(MethodUtils.getAccessibleMethod(User.class, "getName")).isInstanceOf(Method.class);
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java
new file mode 100644
index 0000000000..02041f51e8
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MutableObjectUnitTest {
+
+ private static MutableObject mutableObject;
+
+ @BeforeClass
+ public static void setUpMutableObject() {
+ mutableObject = new MutableObject("Initial value");
+ }
+
+ @Test
+ public void givenMutableObject_whenCalledgetValue_thenCorrect() {
+ assertThat(mutableObject.getValue()).isInstanceOf(String.class);
+ }
+
+ @Test
+ public void givenMutableObject_whenCalledsetValue_thenCorrect() {
+ mutableObject.setValue("Another value");
+ assertThat(mutableObject.getValue()).isEqualTo("Another value");
+ }
+
+ @Test
+ public void givenMutableObject_whenCalledtoString_thenCorrect() {
+ assertThat(mutableObject.toString()).isEqualTo("Another value");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java
new file mode 100644
index 0000000000..174ec70c4d
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.MutablePair;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MutablePairUnitTest {
+
+ private static MutablePair mutablePair;
+
+ @BeforeClass
+ public static void setUpMutablePairInstance() {
+ mutablePair = new MutablePair<>("leftElement", "rightElement");
+ }
+
+ @Test
+ public void givenMutablePairInstance_whenCalledgetLeft_thenCorrect() {
+ assertThat(mutablePair.getLeft()).isEqualTo("leftElement");
+ }
+
+ @Test
+ public void givenMutablePairInstance_whenCalledgetRight_thenCorrect() {
+ assertThat(mutablePair.getRight()).isEqualTo("rightElement");
+ }
+
+ @Test
+ public void givenMutablePairInstance_whenCalledsetLeft_thenCorrect() {
+ mutablePair.setLeft("newLeftElement");
+ assertThat(mutablePair.getLeft()).isEqualTo("newLeftElement");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java
new file mode 100644
index 0000000000..bdf254a102
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class NumberUtilsUnitTest {
+
+ @Test
+ public void givenNumberUtilsClass_whenCalledcompareWithIntegers_thenCorrect() {
+ assertThat(NumberUtils.compare(1, 1)).isEqualTo(0);
+ }
+
+ @Test
+ public void givenNumberUtilsClass_whenCalledcompareWithLongs_thenCorrect() {
+ assertThat(NumberUtils.compare(1L, 1L)).isEqualTo(0);
+ }
+
+ @Test
+ public void givenNumberUtilsClass_whenCalledcreateNumber_thenCorrect() {
+ assertThat(NumberUtils.createNumber("123456")).isEqualTo(123456);
+ }
+
+ @Test
+ public void givenNumberUtilsClass_whenCalledisDigits_thenCorrect() {
+ assertThat(NumberUtils.isDigits("123456")).isTrue();
+ }
+
+ @Test
+ public void givenNumberUtilsClass_whenCallemaxwithIntegerArray_thenCorrect() {
+ int[] array = {1, 2, 3, 4, 5, 6};
+ assertThat(NumberUtils.max(array)).isEqualTo(6);
+ }
+
+ @Test
+ public void givenNumberUtilsClass_whenCalleminwithIntegerArray_thenCorrect() {
+ int[] array = {1, 2, 3, 4, 5, 6};
+ assertThat(NumberUtils.min(array)).isEqualTo(1);
+ }
+
+ @Test
+ public void givenNumberUtilsClass_whenCalleminwithByteArray_thenCorrect() {
+ byte[] array = {1, 2, 3, 4, 5, 6};
+ assertThat(NumberUtils.min(array)).isEqualTo((byte) 1);
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java
new file mode 100644
index 0000000000..ab39ba7bd9
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.StringUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class StringUtilsUnitTest {
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisBlank_thenCorrect() {
+ assertThat(StringUtils.isBlank(" ")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisEmpty_thenCorrect() {
+ assertThat(StringUtils.isEmpty("")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisAllLowerCase_thenCorrect() {
+ assertThat(StringUtils.isAllLowerCase("abd")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisAllUpperCase_thenCorrect() {
+ assertThat(StringUtils.isAllUpperCase("ABC")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisMixedCase_thenCorrect() {
+ assertThat(StringUtils.isMixedCase("abC")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisAlpha_thenCorrect() {
+ assertThat(StringUtils.isAlpha("abc")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledisAlphanumeric_thenCorrect() {
+ assertThat(StringUtils.isAlphanumeric("abc123")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledcontains_thenCorrect() {
+ assertThat(StringUtils.contains("abc", "ab")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledcontainsAny_thenCorrect() {
+ assertThat(StringUtils.containsAny("abc", 'a', 'b', 'c')).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledcontainsIgnoreCase_thenCorrect() {
+ assertThat(StringUtils.containsIgnoreCase("abc", "ABC")).isTrue();
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledswapCase_thenCorrect() {
+ assertThat(StringUtils.swapCase("abc")).isEqualTo("ABC");
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalledreverse_thenCorrect() {
+ assertThat(StringUtils.reverse("abc")).isEqualTo("cba");
+ }
+
+ @Test
+ public void givenStringUtilsClass_whenCalleddifference_thenCorrect() {
+ assertThat(StringUtils.difference("abc", "abd")).isEqualTo("d");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java
new file mode 100644
index 0000000000..0efe97f912
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.commons.lang3.test;
+
+import java.io.File;
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class SystemsUtilsUnitTest {
+
+ @Test
+ public void givenSystemUtilsClass_whenCalledgetJavaHome_thenCorrect() {
+ assertThat(SystemUtils.getJavaHome()).isEqualTo(new File("/usr/lib/jvm/java-8-oracle/jre"));
+ }
+
+ @Test
+ public void givenSystemUtilsClass_whenCalledgetUserHome_thenCorrect() {
+ assertThat(SystemUtils.getUserHome()).isEqualTo(new File("/home/travis"));
+ }
+
+ @Test
+ public void givenSystemUtilsClass_whenCalledisJavaVersionAtLeast_thenCorrect() {
+ assertThat(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_RECENT)).isTrue();
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java
new file mode 100644
index 0000000000..7d506bbbab
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.Triple;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TripleUnitTest {
+
+ private static Triple triple;
+
+ @BeforeClass
+ public static void setUpTripleInstance() {
+ triple = Triple.of("leftElement", "middleElement", "rightElement");
+ }
+
+ @Test
+ public void givenTripleInstance_whenCalledgetLeft_thenCorrect() {
+ assertThat(triple.getLeft()).isEqualTo("leftElement");
+ }
+
+ @Test
+ public void givenTripleInstance_whenCalledgetMiddle_thenCorrect() {
+ assertThat(triple.getMiddle()).isEqualTo("middleElement");
+ }
+
+ @Test
+ public void givenTripleInstance_whenCalledgetRight_thenCorrect() {
+ assertThat(triple.getRight()).isEqualTo("rightElement");
+ }
+}
diff --git a/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java b/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java
index 4406494d30..e61f4158a7 100644
--- a/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java
+++ b/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java
@@ -4,10 +4,12 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.streams.KafkaStreams;
+import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.StreamsConfig;
+import org.apache.kafka.streams.Topology;
import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KStreamBuilder;
import org.apache.kafka.streams.kstream.KTable;
+import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.test.TestUtils;
import org.junit.Ignore;
import org.junit.Test;
@@ -36,20 +38,20 @@ public class KafkaStreamsLiveTest {
streamsConfiguration.put(StreamsConfig.STATE_DIR_CONFIG, TestUtils.tempDirectory().getAbsolutePath());
// when
- KStreamBuilder builder = new KStreamBuilder();
+ StreamsBuilder builder = new StreamsBuilder();
KStream textLines = builder.stream(inputTopic);
Pattern pattern = Pattern.compile("\\W+", Pattern.UNICODE_CHARACTER_CLASS);
KTable wordCounts = textLines.flatMapValues(value -> Arrays.asList(pattern.split(value.toLowerCase()))).groupBy((key, word) -> word).count();
- wordCounts.foreach((word, count) -> System.out.println("word: " + word + " -> " + count));
+ textLines.foreach((word, count) -> System.out.println("word: " + word + " -> " + count));
String outputTopic = "outputTopic";
final Serde stringSerde = Serdes.String();
- final Serde longSerde = Serdes.Long();
- wordCounts.to(stringSerde, longSerde, outputTopic);
+ final Serde longSerde = Serdes.String();
+ textLines.to(outputTopic, Produced.with(stringSerde,longSerde));
- KafkaStreams streams = new KafkaStreams(builder, streamsConfiguration);
+ KafkaStreams streams = new KafkaStreams(new Topology(), streamsConfiguration);
streams.start();
// then
diff --git a/lombok/README.md b/lombok/README.md
index 1a787e32c7..d12c14416d 100644
--- a/lombok/README.md
+++ b/lombok/README.md
@@ -1,3 +1,5 @@
## Relevant Articles:
- [Introduction to Project Lombok](http://www.baeldung.com/intro-to-project-lombok)
- [Using Lombok’s @Builder Annotation](http://www.baeldung.com/lombok-builder)
+- [Using Lombok’s @Getter for Boolean Fields](https://www.baeldung.com/lombok-getter-boolean)
+- [Lombok @Builder with Inheritance](https://www.baeldung.com/lombok-builder-inheritance)
diff --git a/mustache/pom.xml b/mustache/pom.xml
index d385246182..a276dfbf43 100644
--- a/mustache/pom.xml
+++ b/mustache/pom.xml
@@ -3,7 +3,6 @@
4.0.0
mustache
- 0.0.1-SNAPSHOT
jar
mustache
@@ -24,10 +23,8 @@
org.assertj
assertj-core
- ${assertj.version}
-
log4j
log4j
@@ -55,13 +52,6 @@
${datafactory.version}
-
- junit
- junit
- ${junit.version}
- test
-
-
@@ -73,90 +63,13 @@
-
-
- integration
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- integration-test
-
- test
-
-
-
- **/*LiveTest.java
- **/AutoconfigurationTest.java
-
-
- **/*IntegrationTest.java
- **/*IntTest.java
-
-
-
-
-
-
- json
-
-
-
-
-
-
-
- autoconfiguration
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- integration-test
-
- test
-
-
-
- **/*LiveTest.java
- **/*IntegrationTest.java
- **/*IntTest.java
-
-
- **/AutoconfigurationTest.java
-
-
-
-
-
-
- json
-
-
-
-
-
-
-
-
0.9.2
- 3.7.0
1.2.16
- 4.12
- UTF-8
- 3.7.0
- 2.21.0
0.8
3.3.7
- 1.8
\ No newline at end of file
diff --git a/optaplanner/README.md b/optaplanner/README.md
new file mode 100644
index 0000000000..1568a615c0
--- /dev/null
+++ b/optaplanner/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [A Guide to OptaPlanner](https://www.baeldung.com/opta-planner)
diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..46ee3cd368
--- /dev/null
+++ b/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,67 @@
+package org.baeldung;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.thrift.transport.TTransportException;
+import org.baeldung.spring.data.cassandra.config.CassandraConfig;
+import org.baeldung.spring.data.cassandra.model.Book;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cassandra.core.cql.CqlIdentifier;
+import org.springframework.data.cassandra.core.CassandraAdminOperations;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = CassandraConfig.class)
+public class SpringContextIntegrationTest {
+
+ public static final String KEYSPACE_CREATION_QUERY = "CREATE KEYSPACE IF NOT EXISTS testKeySpace " + "WITH replication = { 'class': 'SimpleStrategy', 'replication_factor': '3' };";
+
+ public static final String KEYSPACE_ACTIVATE_QUERY = "USE testKeySpace;";
+
+ public static final String DATA_TABLE_NAME = "book";
+
+ @Autowired
+ private CassandraAdminOperations adminTemplate;
+
+ @BeforeClass
+ public static void startCassandraEmbedded() throws InterruptedException, TTransportException, ConfigurationException, IOException {
+ EmbeddedCassandraServerHelper.startEmbeddedCassandra();
+ final Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1").withPort(9142).build();
+ final Session session = cluster.connect();
+ session.execute(KEYSPACE_CREATION_QUERY);
+ session.execute(KEYSPACE_ACTIVATE_QUERY);
+ Thread.sleep(5000);
+ }
+
+ @Before
+ public void createTable() throws InterruptedException, TTransportException, ConfigurationException, IOException {
+ adminTemplate.createTable(true, CqlIdentifier.cqlId(DATA_TABLE_NAME), Book.class, new HashMap());
+ }
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+
+ @After
+ public void dropTable() {
+ adminTemplate.dropTable(CqlIdentifier.cqlId(DATA_TABLE_NAME));
+ }
+
+ @AfterClass
+ public static void stopCassandraEmbedded() {
+ EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
+ }
+}
diff --git a/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..7f906bdbcd
--- /dev/null
+++ b/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..4be5891e3e
--- /dev/null
+++ b/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.eclipselink.springdata.EclipselinkSpringDataApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = EclipselinkSpringDataApplication.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..2f0557ccc1
--- /dev/null
+++ b/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.data.gemfire.function.GemfireConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes=GemfireConfiguration.class, loader=AnnotationConfigContextLoader.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..ea32ed324b
--- /dev/null
+++ b/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MovieDatabaseNeo4jTestConfiguration.class)
+@ActiveProfiles(profiles = "test")
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..e093892365
--- /dev/null
+++ b/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.data.redis.config.RedisConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RedisConfig.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..e76967ae8a
--- /dev/null
+++ b/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.data.solr.config.SolrConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = SolrConfig.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..a81a4eedb1
--- /dev/null
+++ b/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.PersistenceConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..af4618d0f3
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.PersistenceConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
index 78c4116c67..ec0d4bca3c 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
@@ -78,9 +78,9 @@ public class PersistenceJPAConfig {
final Properties hibernateProperties = new Properties();
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
- hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache"));
- hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache"));
- // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
+ hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", "false");
+
+
return hibernateProperties;
}
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
index 1c8ce5400f..cf6e69eb39 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
@@ -5,7 +5,7 @@ import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatche
public class WebInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
@Override
protected Class[] getRootConfigClasses() {
- return new Class[] { PersistenceJNDIConfig.class };
+ return new Class[] { PersistenceJPAConfig.class };
}
@Override
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepository.java
similarity index 71%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepository.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepository.java
index af30ae461e..114cf48c7c 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepository.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepository.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepositoryCustom.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryCustom.java
similarity index 58%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepositoryCustom.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryCustom.java
index 35330cfa3c..b939907572 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepositoryCustom.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryCustom.java
@@ -1,8 +1,8 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
import java.util.List;
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
public interface BookRepositoryCustom {
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/dao/BookRepositoryImpl.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryImpl.java
similarity index 87%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/dao/BookRepositoryImpl.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryImpl.java
index f782d69e1e..6e9aa998d7 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/dao/BookRepositoryImpl.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryImpl.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.criteria.dao;
+package org.baeldung.persistence.dao;
import java.util.ArrayList;
import java.util.List;
@@ -10,8 +10,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.baeldung.persistence.criteria.model.Book;
-import org.baeldung.persistence.criteria.repository.BookRepositoryCustom;
+import org.baeldung.persistence.model.Book;
import org.springframework.stereotype.Repository;
@Repository
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookService.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookService.java
similarity index 63%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookService.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookService.java
index 7b1aff857e..88b769e9bf 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookService.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookService.java
@@ -1,12 +1,12 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
-import static org.baeldung.persistence.criteria.repository.BookSpecifications.hasAuthor;
-import static org.baeldung.persistence.criteria.repository.BookSpecifications.titleContains;
+import static org.baeldung.persistence.dao.BookSpecifications.hasAuthor;
+import static org.baeldung.persistence.dao.BookSpecifications.titleContains;
import static org.springframework.data.jpa.domain.Specifications.where;
import java.util.List;
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
import org.springframework.stereotype.Service;
@Service
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookSpecifications.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookSpecifications.java
similarity index 78%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookSpecifications.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookSpecifications.java
index 392b750977..ed9540060d 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookSpecifications.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookSpecifications.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
import org.springframework.data.jpa.domain.Specification;
public class BookSpecifications {
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/model/Book.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Book.java
similarity index 91%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/model/Book.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Book.java
index beb6c0190c..754bd179d1 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/model/Book.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.criteria.model;
+package org.baeldung.persistence.model;
import javax.persistence.Entity;
import javax.persistence.Id;
diff --git a/persistence-modules/spring-jpa/src/main/resources/persistence.xml b/persistence-modules/spring-jpa/src/main/resources/persistence.xml
index 65bad29cdc..6304fa0a65 100644
--- a/persistence-modules/spring-jpa/src/main/resources/persistence.xml
+++ b/persistence-modules/spring-jpa/src/main/resources/persistence.xml
@@ -21,8 +21,6 @@
${hibernate.hbm2ddl.auto}
${hibernate.dialect}
- ${hibernate.cache.use_second_level_cache}
- ${hibernate.cache.use_query_cache}
diff --git a/pom.xml b/pom.xml
index 7a7e2d7f64..bda69bfd42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -398,16 +398,17 @@
javafx
jgroups
jee-7
- jhipster/jhipster-monolithic
+ jhipster
jjwt
jsf
json-path
json
jsoup
testing-modules/junit-5
- jws
+
libraries
libraries-data
+ libraries-security
libraries-server
linkrest
logging-modules/log-mdc
@@ -470,10 +471,11 @@
spring-boot-persistence
spring-boot-security
spring-boot-mvc
- spring-boot-vue
+ spring-boot-vue
spring-boot-logging-log4j2
spring-cloud-data-flow
spring-cloud
+ spring-cloud-bus
spring-core
spring-cucumber
spring-ejb
@@ -603,7 +605,236 @@
spring-reactive-kotlin
jnosql
spring-boot-angular-ecommerce
+ cdi-portable-extension
jta
+
+ java-websocket
+ activejdbc
+ animal-sniffer-mvn-plugin
+ apache-avro
+ apache-bval
+ apache-shiro
+ apache-spark
+ asciidoctor
+ checker-plugin
+
+
+ core-java-sun
+ custom-pmd
+ dagger
+ data-structures
+ dubbo
+ flyway
+
+ java-difference-date
+
+ jni
+ jooby
+
+
+
+ ratpack
+ rest-with-spark-java
+ spring-boot-autoconfiguration
+ spring-boot-custom-starter
+ spring-boot-jasypt
+ spring-custom-aop
+ spring-data-rest-querydsl
+ spring-groovy
+ spring-mobile
+ spring-mustache
+ spring-mvc-simple
+ spring-mybatis
+ spring-rest-hal-browser
+ spring-rest-shell
+ spring-rest-template
+ spring-roo
+ spring-security-stormpath
+ sse-jaxrs
+ static-analysis
+ stripe
+
+ Twitter4J
+ wicket
+ xstream
+ cas/cas-secured-app
+ cas/cas-server
+
+
+
+
+
+
+
+
+
+
+
+
+ jenkins/hello-world
+
+
+
+ spring-boot-custom-starter/greeter
+ spring-boot-h2/spring-boot-h2-database
+
+
+
+
+
+
+
+
+
+ spring-context
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+ 3
+ true
+
+ **/*SpringContextIntegrationTest.java
+
+
+
+
+
+
+
+
+ spring-5
+ spring-5-data-reactive
+ spring-5-reactive
+ spring-5-reactive-client
+ spring-5-reactive-security
+ spring-5-security
+ spring-activiti
+ spring-akka
+ spring-all
+ spring-aop
+ spring-apache-camel
+ spring-batch
+ spring-bom
+ spring-boot-admin/spring-boot-admin-client
+ spring-boot-admin/spring-boot-admin-server
+ spring-boot-bootstrap
+ spring-boot-bootstrap
+ spring-boot-camel
+ spring-boot-client
+ spring-boot-custom-starter
+ greeter-spring-boot-autoconfigure
+ greeter-spring-boot-sample-app
+ spring-boot-h2/spring-boot-h2-database
+ spring-boot-jasypt
+ spring-boot-keycloak
+ spring-boot-mvc
+ spring-boot-property-exp/property-exp-custom-config
+ spring-boot-property-exp/property-exp-default-config
+ spring-boot-vue
+ spring-cloud
+ spring-cloud/spring-cloud-archaius/basic-config
+ spring-cloud/spring-cloud-archaius/extra-configs
+ spring-cloud/spring-cloud-bootstrap/config
+ spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer
+ spring-cloud/spring-cloud-contract/spring-cloud-contract-producer
+ spring-cloud/spring-cloud-gateway
+ spring-cloud/spring-cloud-kubernetes/demo-backend
+ spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server
+ spring-cloud/spring-cloud-ribbon-client
+ spring-cloud/spring-cloud-security/auth-client
+ spring-cloud/spring-cloud-security/auth-resource
+ spring-cloud/spring-cloud-security/auth-server
+ spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit
+ spring-cloud/spring-cloud-task/springcloudtasksink
+ spring-cloud/spring-cloud-zookeeper
+ spring-cloud/spring-cloud-bus/spring-cloud-config-server
+ spring-cloud/spring-cloud-data-flow/log-sink
+ spring-cloud/spring-cloud-data-flow/time-processor
+ spring-cloud/spring-cloud-data-flow/time-source
+ spring-cucumber
+ spring-data-keyvalue
+ spring-data-rest
+ spring-dispatcher-servlet
+ spring-drools
+ spring-freemarker
+ spring-hibernate-3
+ spring-hibernate4
+ spring-integration
+ spring-jenkins-pipeline
+ spring-jersey
+ spring-jinq
+ spring-jms
+ spring-kafka
+ spring-katharsis
+ spring-ldap
+ spring-mobile
+ spring-mockito
+ spring-mvc-forms-thymeleaf
+ spring-mvc-java
+ spring-mvc-velocity
+ spring-mvc-webflow
+ spring-protobuf
+ spring-quartz
+ remoting-hessian-burlap/spring-remoting-hessian-burlap-client
+ remoting-hessian-burlap/remoting-hessian-burlap-server
+ spring-reactor
+ spring-remoting/
+ spring-remoting/remoting-http/remoting-http-server
+ spring-remoting/remoting-jms/remoting-jms-client
+ spring-remoting/remoting-rmi/remoting-rmi-server
+ spring-rest
+ spring-rest-angular
+ spring-rest-embedded-tomcat
+ spring-rest-full
+ spring-rest-simple
+ spring-resttemplate
+ spring-security-acl
+ spring-security-angular
+ spring-security-cache-control
+ spring-security-client/spring-security-jsp-authentication
+ spring-security-client/spring-security-jsp-authorize
+ spring-security-client/spring-security-jsp-config
+ spring-security-client/spring-security-mvc
+ spring-security-client/spring-security-thymeleaf-authentication
+ spring-security-client/spring-security-thymeleaf-authorize
+ spring-security-client/spring-security-thymeleaf-config
+ spring-security-core
+ spring-security-mvc-boot
+ spring-security-mvc-custom
+ spring-security-mvc-digest-auth
+ spring-security-mvc-ldap
+ spring-security-mvc-persisted-remember-me
+ spring-security-mvc-session
+ spring-security-mvc-socket
+ spring-security-rest
+ spring-security-sso/spring-security-sso-auth-server
+ spring-security-sso/spring-security-sso-ui
+ spring-security-sso/spring-security-sso-ui-2
+ spring-security-thymeleaf/spring-security-thymeleaf-authentication
+ spring-security-thymeleaf/spring-security-thymeleaf-authorize
+ spring-security-thymeleaf/spring-security-thymeleaf-config
+ spring-security-x509/spring-security-x509-basic-auth
+ spring-security-x509/spring-security-x509-client-auth
+ spring-session/spring-session-jdbc
+ spring-sleuth
+ spring-social-login
+ spring-spel
+ spring-state-machine
+ spring-swagger-codegen/spring-swagger-codegen-app
+ spring-thymeleaf
+ spring-userservice
+ spring-vault
+ spring-vertx
+ spring-zuul/spring-zuul-foos-resource
+ persistence-modules/spring-data-dynamodb
+ persistence-modules/spring-data-eclipselink
+ persistence-modules/spring-data-solr
+ persistence-modules/spring-hibernate-5
@@ -747,6 +978,7 @@
spring-boot-logging-log4j2
spring-cloud-data-flow
spring-cloud
+ spring-cloud-bus
spring-core
spring-cucumber
spring-ejb
@@ -847,7 +1079,80 @@
-
+
+ java-websocket
+ activejdbc
+ animal-sniffer-mvn-plugin
+ apache-avro
+ apache-bval
+ apache-shiro
+ apache-spark
+ asciidoctor
+ checker-plugin
+
+
+ core-java-sun
+ custom-pmd
+ dagger
+ data-structures
+ dubbo
+ flyway
+
+ java-difference-date
+
+ jni
+ jooby
+
+
+
+ ratpack
+ rest-with-spark-java
+ spring-boot-autoconfiguration
+ spring-boot-custom-starter
+ spring-boot-jasypt
+ spring-custom-aop
+ spring-data-rest-querydsl
+ spring-groovy
+ spring-mobile
+ spring-mustache
+ spring-mvc-simple
+ spring-mybatis
+ spring-rest-hal-browser
+ spring-rest-shell
+ spring-rest-template
+ spring-roo
+ spring-security-stormpath
+ sse-jaxrs
+ static-analysis
+ stripe
+
+
+ wicket
+ xstream
+ cas/cas-secured-app
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jenkins/hello-world
+
+
+
+ spring-boot-custom-starter/greeter
+ spring-boot-h2/spring-boot-h2-database
+
+
+
+
@@ -1028,6 +1333,7 @@
spring-boot-logging-log4j2
spring-cloud-data-flow
spring-cloud
+ spring-cloud-bus
spring-core
spring-cucumber
spring-ejb
@@ -1235,7 +1541,7 @@
parent-kotlin
libraries
geotools
- jhipster/jhipster-monolithic
+ jhipster
testing-modules/gatling
spring-boot
spring-boot-ops
diff --git a/ratpack/README.md b/ratpack/README.md
index 02b91da0bd..dded42fab6 100644
--- a/ratpack/README.md
+++ b/ratpack/README.md
@@ -4,4 +4,4 @@
- [Ratpack Google Guice Integration](http://www.baeldung.com/ratpack-google-guice)
- [Ratpack Integration with Spring Boot](http://www.baeldung.com/ratpack-spring-boot)
- [Ratpack with Hystrix](http://www.baeldung.com/ratpack-hystrix)
-
+- [Ratpack HTTP Client](https://www.baeldung.com/ratpack-http-client)
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java b/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java
index 56650ba306..e3060b8e02 100644
--- a/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java
+++ b/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java
@@ -37,14 +37,14 @@ public class ReactorIntegrationTest {
Flux.just(1, 2, 3, 4)
.log()
.map(i -> i * 2)
- .zipWith(Flux.range(0, Integer.MAX_VALUE).log(), (two, one) -> String.format("First Flux: %d, Second Flux: %d", one, two))
+ .zipWith(Flux.range(0, Integer.MAX_VALUE).log(), (one, two) -> String.format("First Flux: %d, Second Flux: %d", one, two))
.subscribe(elements::add);
assertThat(elements).containsExactly(
- "First Flux: 0, Second Flux: 2",
- "First Flux: 1, Second Flux: 4",
- "First Flux: 2, Second Flux: 6",
- "First Flux: 3, Second Flux: 8");
+ "First Flux: 2, Second Flux: 0",
+ "First Flux: 4, Second Flux: 1",
+ "First Flux: 6, Second Flux: 2",
+ "First Flux: 8, Second Flux: 3");
}
@Test
diff --git a/rest-with-spark-java/src/test/java/com/baeldung/AppTest.java b/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
similarity index 96%
rename from rest-with-spark-java/src/test/java/com/baeldung/AppTest.java
rename to rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
index c7b88dd6d1..9e24879767 100644
--- a/rest-with-spark-java/src/test/java/com/baeldung/AppTest.java
+++ b/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
@@ -16,16 +16,16 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-public class AppTest extends TestCase {
+public class AppLiveTest extends TestCase {
ObjectMapper mapper = new ObjectMapper();
- public AppTest( String testName ) {
+ public AppLiveTest( String testName ) {
super( testName );
}
public static Test suite() {
- return new TestSuite( AppTest.class );
+ return new TestSuite( AppLiveTest.class );
}
public void testApp() throws IOException, ClassNotFoundException {
diff --git a/rxjava-2/README.md b/rxjava-2/README.md
index ccf575757f..78eb6e6428 100644
--- a/rxjava-2/README.md
+++ b/rxjava-2/README.md
@@ -2,5 +2,6 @@
- [RxJava and Error Handling](http://www.baeldung.com/rxjava-error-handling)
- [RxJava 2 – Flowable](http://www.baeldung.com/rxjava-2-flowable)
+- [RxJava 2 - Completable](http://www.baeldung.com/rxjava-completable)
- [RxJava Maybe](http://www.baeldung.com/rxjava-maybe)
-- [Introduction to RxRelay for RxJava](http://www.baeldung.com/rx-relay)
\ No newline at end of file
+- [Introduction to RxRelay for RxJava](http://www.baeldung.com/rx-relay)
diff --git a/rxjava-2/pom.xml b/rxjava-2/pom.xml
index 4c5ea014d7..a18b096b6d 100644
--- a/rxjava-2/pom.xml
+++ b/rxjava-2/pom.xml
@@ -38,9 +38,8 @@
3.8.0
- 2.1.3
+ 2.2.2
1.7.0
2.0.0
-
\ No newline at end of file
diff --git a/rxjava-2/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java
new file mode 100644
index 0000000000..6acda310a5
--- /dev/null
+++ b/rxjava-2/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java
@@ -0,0 +1,112 @@
+package com.baeldung.rxjava;
+
+import io.reactivex.Completable;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.observers.DisposableCompletableObserver;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CompletableUnitTest {
+
+ Completable first;
+ Completable second;
+ Completable error;
+ Throwable throwable = new RuntimeException();
+
+ @Before
+ public void setUpCompletables() {
+ first = Completable.fromSingle(Single.just(1));
+ second = Completable.fromRunnable(() -> {});
+ error = Single.error(throwable)
+ .ignoreElement();
+ }
+
+ @Test
+ public void whenCompletableConstructed_thenCompletedSuccessfully() {
+ Completable completed = Completable.complete();
+ completed.subscribe(new DisposableCompletableObserver() {
+ @Override
+ public void onComplete() {
+ System.out.println("Completed!");
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ e.printStackTrace();
+ }
+ });
+ Flowable flowable = Flowable.just("request received", "user logged in");
+ Completable flowableCompletable = Completable.fromPublisher(flowable);
+ Completable singleCompletable = Single.just(1)
+ .ignoreElement();
+
+ completed.andThen(flowableCompletable)
+ .andThen(singleCompletable)
+ .test()
+ .assertComplete();
+ }
+
+ @Test
+ public void whenCombiningCompletables_thenCompletedSuccessfully() {
+ first.andThen(second)
+ .test()
+ .assertComplete();
+ }
+
+ @Test
+ public void whenCombinedWithError_thenCompletedWithError() {
+ first.andThen(second)
+ .andThen(error)
+ .test()
+ .assertError(throwable);
+ }
+
+ @Test
+ public void whenCombinedWithNever_thenDoesNotComplete() {
+ first.andThen(second)
+ .andThen(Completable.never())
+ .test()
+ .assertNotComplete();
+ }
+
+ @Test
+ public void whenMergedCompletables_thenCompletedSuccessfully() {
+ Completable.mergeArray(first, second)
+ .test()
+ .assertComplete();
+ }
+
+ @Test
+ public void whenMergedWithError_thenCompletedWithError() {
+ Completable.mergeArray(first, second, error)
+ .test()
+ .assertError(throwable);
+ }
+
+ @Test
+ public void whenFlatMaped_thenCompletedSuccessfully() {
+ Completable allElementsCompletable = Flowable.just("request received", "user logged in")
+ .flatMapCompletable(message -> Completable
+ .fromRunnable(() -> System.out.println(message))
+ );
+ allElementsCompletable
+ .test()
+ .assertComplete();
+ }
+
+ @Test
+ public void whenAmbWithNever_thenCompletedSuccessfully() {
+ Completable.ambArray(first, Completable.never(), second)
+ .test()
+ .assertComplete();
+ }
+
+ @Test
+ public void whenAmbWithError_thenCompletedWithError() {
+ Completable.ambArray(error, first, second)
+ .test()
+ .assertError(throwable);
+ }
+
+}
diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index cf10f64aa2..78939bba95 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -71,10 +71,8 @@
- UTF-8
1.0.1
1.16.18
- 1.8
1.4.197
diff --git a/spring-4/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-4/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..9dfac2bd9e
--- /dev/null
+++ b/spring-4/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.flips.ApplicationConfig;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ApplicationConfig.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-5-data-reactive/pom.xml b/spring-5-data-reactive/pom.xml
index e4dd454635..5c723c6e29 100644
--- a/spring-5-data-reactive/pom.xml
+++ b/spring-5-data-reactive/pom.xml
@@ -62,28 +62,6 @@
spring-boot-starter-test
test
-
-
- org.junit.jupiter
- junit-jupiter-api
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
- org.junit.platform
- junit-platform-surefire-provider
- ${junit.platform.version}
- test
-
-
- org.junit.platform
- junit-platform-runner
- ${junit.platform.version}
- test
-
@@ -175,32 +153,13 @@
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- 3
- true
- methods
- true
-
- **/*IntegrationTest.java
- **/*IntTest.java
- **/*LiveTest.java
-
-
-
- UTF-8
- UTF-8
- 1.8
1.2.40
1.2.40
- 1.0.0
- 5.0.2
+
diff --git a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..ce4c172960
--- /dev/null
+++ b/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.Spring5ReactiveApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5ReactiveApplication.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..7843a8968d
--- /dev/null
+++ b/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.Spring5ReactiveTestApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5ReactiveTestApplication.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/functional/EmployeeFunctionalConfig.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/functional/EmployeeFunctionalConfig.java
index 8d7860ccdc..76b697c1aa 100644
--- a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/functional/EmployeeFunctionalConfig.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/functional/EmployeeFunctionalConfig.java
@@ -39,7 +39,7 @@ public class EmployeeFunctionalConfig {
}
@Bean
- RouterFunction updateEmployee() {
+ RouterFunction updateEmployeeRoute() {
return route(POST("/employees/update"),
req -> req.body(toMono(Employee.class))
.doOnNext(employeeRepository()::updateEmployee)
diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/functional/EmployeeSpringFunctionalIntegrationTest.java b/spring-5-reactive-security/src/test/java/com/baeldung/reactive/functional/EmployeeSpringFunctionalIntegrationTest.java
index 1197820066..6e73e8072c 100644
--- a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/functional/EmployeeSpringFunctionalIntegrationTest.java
+++ b/spring-5-reactive-security/src/test/java/com/baeldung/reactive/functional/EmployeeSpringFunctionalIntegrationTest.java
@@ -1,13 +1,37 @@
package com.baeldung.reactive.functional;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient;
import com.baeldung.webflux.Employee;
+import com.baeldung.webflux.EmployeeRepository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = EmployeeSpringFunctionalApplication.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class EmployeeSpringFunctionalIntegrationTest {
- private static EmployeeFunctionalConfig config = new EmployeeFunctionalConfig();
+ @Autowired
+ private EmployeeFunctionalConfig config;
+
+ @MockBean
+ private EmployeeRepository employeeRepository;
@Test
public void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() {
@@ -15,7 +39,9 @@ public class EmployeeSpringFunctionalIntegrationTest {
.bindToRouterFunction(config.getEmployeeByIdRoute())
.build();
- Employee expected = new Employee("1", "Employee 1");
+ Employee employee = new Employee("1", "Employee 1");
+
+ given(employeeRepository.findEmployeeById("1")).willReturn(Mono.just(employee));
client.get()
.uri("/employees/1")
@@ -23,6 +49,50 @@ public class EmployeeSpringFunctionalIntegrationTest {
.expectStatus()
.isOk()
.expectBody(Employee.class)
- .isEqualTo(expected);
+ .isEqualTo(employee);
+ }
+
+ @Test
+ public void whenGetAllEmployees_thenCorrectEmployees() {
+ WebTestClient client = WebTestClient
+ .bindToRouterFunction(config.getAllEmployeesRoute())
+ .build();
+
+ List employeeList = new ArrayList<>();
+
+ Employee employee1 = new Employee("1", "Employee 1");
+ Employee employee2 = new Employee("2", "Employee 2");
+
+ employeeList.add(employee1);
+ employeeList.add(employee2);
+
+ Flux employeeFlux = Flux.fromIterable(employeeList);
+ given(employeeRepository.findAllEmployees()).willReturn(employeeFlux);
+
+ client.get()
+ .uri("/employees")
+ .exchange()
+ .expectStatus()
+ .isOk()
+ .expectBodyList(Employee.class)
+ .isEqualTo(employeeList);
+ }
+
+ @Test
+ public void whenUpdateEmployee_thenEmployeeUpdated() {
+ WebTestClient client = WebTestClient
+ .bindToRouterFunction(config.updateEmployeeRoute())
+ .build();
+
+ Employee employee = new Employee("1", "Employee 1 Updated");
+
+ client.post()
+ .uri("/employees/update")
+ .body(Mono.just(employee), Employee.class)
+ .exchange()
+ .expectStatus()
+ .isOk();
+
+ verify(employeeRepository).updateEmployee(employee);
}
}
diff --git a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..2bcd974510
--- /dev/null
+++ b/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.security.SpringSecurity5Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringSecurity5Application.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-5-reactive/README.md b/spring-5-reactive/README.md
index 0665eb4f57..7977fd820f 100644
--- a/spring-5-reactive/README.md
+++ b/spring-5-reactive/README.md
@@ -13,3 +13,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [How to Set a Header on a Response with Spring 5](http://www.baeldung.com/spring-response-header)
- [Spring Webflux and CORS](http://www.baeldung.com/spring-webflux-cors)
- [Handling Errors in Spring WebFlux](http://www.baeldung.com/spring-webflux-errors)
+- [Server-Sent Events in Spring](https://www.baeldung.com/spring-server-sent-events)
diff --git a/spring-5-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..ce4c172960
--- /dev/null
+++ b/spring-5-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.Spring5ReactiveApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5ReactiveApplication.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-5-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..967f67e760
--- /dev/null
+++ b/spring-5-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.dsl.CustomConfigurerApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CustomConfigurerApplication.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index 9f60b8a364..293edb5bda 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -1,5 +1,6 @@
-
4.0.0
com.baeldung
@@ -134,7 +135,26 @@
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+ methods
+ true
+
+ **/*IntegrationTest.java
+ **/*IntTest.java
+ **/*LongRunningUnitTest.java
+ **/*ManualTest.java
+ **/JdbcTest.java
+ **/*LiveTest.java
+
+
+
+
@@ -142,6 +162,8 @@
1.5.6
4.1
${project.build.directory}/generated-snippets
+ 2.21.0
+
diff --git a/spring-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..75b3df4978
--- /dev/null
+++ b/spring-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Spring5Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5Application.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-activiti/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-activiti/src/test/java/org/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..ae37e77f86
--- /dev/null
+++ b/spring-activiti/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.example.activitiwithspring.ActivitiWithSpringApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ActivitiWithSpringApplication.class)
+public class SpringContextIntegrationTest {
+
+ @Test
+ public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ }
+}
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index c4c4cf7963..bab2e431ec 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -45,6 +45,15 @@
spring-shell
${org.springframework.shell.version}
+
+ org.springframework
+ spring-websocket
+
+
+ org.springframework
+ spring-messaging
+
+
org.springframework
@@ -190,7 +199,24 @@
-
+
+
+ dev
+
+ true
+
+
+ dev
+
+
+
+ prod
+
+ prod
+
+
+
+
org.baeldung.sample.App
diff --git a/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java b/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
index eb5543e3db..2d1905ee9c 100644
--- a/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
@@ -2,9 +2,11 @@ package org.baeldung.profiles;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
@Configuration
@ComponentScan("org.baeldung.profiles")
+@PropertySource(value = "classpath:application.properties")
public class SpringProfilesConfig {
}
diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
index 73df386aff..9257a3aa3a 100644
--- a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
@@ -13,21 +13,36 @@ import org.springframework.web.bind.annotation.RequestMapping;
public class ScopesController {
public static final Logger LOG = LoggerFactory.getLogger(ScopesController.class);
- @Resource(name = "requestMessage")
- HelloMessageGenerator requestMessage;
+ @Resource(name = "requestScopedBean")
+ HelloMessageGenerator requestScopedBean;
- @Resource(name = "sessionMessage")
- HelloMessageGenerator sessionMessage;
+ @Resource(name = "sessionScopedBean")
+ HelloMessageGenerator sessionScopedBean;
- @RequestMapping("/scopes")
- public String getScopes(final Model model) {
- LOG.info("Request Message:" + requestMessage.getMessage());
- LOG.info("Session Message" + sessionMessage.getMessage());
- requestMessage.setMessage("Good morning!");
- sessionMessage.setMessage("Good afternoon!");
- model.addAttribute("requestMessage", requestMessage.getMessage());
- model.addAttribute("sessionMessage", sessionMessage.getMessage());
+ @Resource(name = "applicationScopedBean")
+ HelloMessageGenerator applicationScopedBean;
+
+ @RequestMapping("/scopes/request")
+ public String getRequestScopeMessage(final Model model) {
+ model.addAttribute("previousMessage", requestScopedBean.getMessage());
+ requestScopedBean.setMessage("Request Scope Message!");
+ model.addAttribute("currentMessage", requestScopedBean.getMessage());
return "scopesExample";
}
+ @RequestMapping("/scopes/session")
+ public String getSessionScopeMessage(final Model model) {
+ model.addAttribute("previousMessage", sessionScopedBean.getMessage());
+ sessionScopedBean.setMessage("Session Scope Message!");
+ model.addAttribute("currentMessage", sessionScopedBean.getMessage());
+ return "scopesExample";
+ }
+
+ @RequestMapping("/scopes/application")
+ public String getApplicationScopeMessage(final Model model) {
+ model.addAttribute("previousMessage", applicationScopedBean.getMessage());
+ applicationScopedBean.setMessage("Application Scope Message!");
+ model.addAttribute("currentMessage", applicationScopedBean.getMessage());
+ return "scopesExample";
+ }
}
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
index fb34725508..b5fe494ee2 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
@@ -27,19 +27,25 @@ public class ScopesConfig {
@Bean
@Scope(value = WebApplicationContext.SCOPE_REQUEST, proxyMode = ScopedProxyMode.TARGET_CLASS)
- public HelloMessageGenerator requestMessage() {
+ public HelloMessageGenerator requestScopedBean() {
return new HelloMessageGenerator();
}
@Bean
@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
- public HelloMessageGenerator sessionMessage() {
+ public HelloMessageGenerator sessionScopedBean() {
return new HelloMessageGenerator();
}
@Bean
@Scope(value = WebApplicationContext.SCOPE_APPLICATION, proxyMode = ScopedProxyMode.TARGET_CLASS)
- public HelloMessageGenerator globalSessionMessage() {
+ public HelloMessageGenerator applicationScopedBean() {
+ return new HelloMessageGenerator();
+ }
+
+ @Bean
+ @Scope(scopeName = "websocket", proxyMode = ScopedProxyMode.TARGET_CLASS)
+ public HelloMessageGenerator websocketScopedBean() {
return new HelloMessageGenerator();
}
diff --git a/spring-all/src/main/resources/application.properties b/spring-all/src/main/resources/application.properties
new file mode 100644
index 0000000000..cbfe3f2df2
--- /dev/null
+++ b/spring-all/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
index 7974cf0220..0946f1b5ef 100644
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
@@ -2,9 +2,9 @@
- Bean Scopes Examples
-
- Request Message: ${requestMessage }
- Session Message: ${sessionMessage }
+ Bean Scopes Examples
+
Previous Message: ${previousMessage }
+
Current Message: ${currentMessage }
+