diff --git a/.gitignore b/.gitignore
index aeb63f7323..7725bf202e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,12 @@ core-java-io/target_link.txt
core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
ethereum/logs/
jmeter/src/main/resources/*-JMeter.csv
+jmeter/src/main/resources/*-Basic*.csv
+jmeter/src/main/resources/*-JMeter*.csv
+jmeter/src/main/resources/*ReportsDashboard*.csv
+jmeter/src/main/resources/dashboard/*ReportsDashboard*.csv
+jmeter/src/main/resources/*FileExtractionExample.csv
+
ninja/devDb.mv.db
**/node_modules/
@@ -83,6 +89,7 @@ spring-soap/src/main/java/com/baeldung/springsoap/gen/
/report-*.json
transaction.log
*-shell.log
+customers.xml
apache-cxf/cxf-aegis/baeldung.xml
testing-modules/report-*.json
@@ -97,9 +104,20 @@ spring-boot-modules/spring-boot-react/frontend/build
spring-boot-modules/spring-boot-react/frontend/node
spring-boot-modules/spring-boot-react/frontend/yarn.lock
spring-boot-modules/spring-boot-properties-3/*.log
+spring-boot-modules/spring-boot-properties-3/*.gz
# SDKMan
.sdkmanrc
# Localstack
-**/.localstack
\ No newline at end of file
+**/.localstack
+
+#libraries-2
+libraries-2/employee*
+libraries-2/src/test/resources/crawler4j/**
+
+#web-modules/ninja
+devDb*.db
+
+#jaxb
+*.xjb
\ No newline at end of file
diff --git a/README.md b/README.md
index 1ae225b1f3..b354a8f819 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,11 @@ The projects are broadly divided into 3 lists: first, second and heavy.
Next, they are segregated further on the basis of the tests that we want to execute.
-Additionally, there are 2 profiles dedicated for JDK9 and above builds.
+Additionally, there are 2 profiles dedicated for JDK9 and above builds - **which require JDK 17**.
-Therefore, we have a total of 8 profiles:
+We also have a parents profile to build only parent modules.
+
+Therefore, we have a total of 9 profiles:
| Profile | Includes | Type of test enabled |
| -------------------------- | --------------------------- | -------------------- |
@@ -45,6 +47,7 @@ Therefore, we have a total of 8 profiles:
| integration-heavy | Heavy/long running projects | *IntegrationTest |
| default-jdk9-and-above | JDK9 and above projects | *UnitTest |
| integration-jdk9-and-above | JDK9 and above projects | *IntegrationTest |
+| parents | Set of parent modules | None |
Building the project
====================
@@ -71,6 +74,17 @@ Building a single module
====================
To build a specific module, run the command: `mvn clean install` in the module directory.
+It can happen that your module is part of a parent module e.g. `parent-boot-1`,`parent-spring-5` etc, then you will need to build the parent module first so that you can build your module.
+We have created a `parents` profile that you can use to build just the parent modules, just run the profile as:
+`mvn clean install -Pparents`
+
+
+Building modules from the root of the repository
+====================
+To build specific modules from the root of the repository, run the command: `mvn clean install --pl asm,atomikos -Pdefault-first` in the root directory.
+
+Here `asm` and `atomikos` are the modules that we want to build and `default-first` is the maven profile in which these modules are present.
+
Running a Spring Boot module
====================
diff --git a/akka-modules/spring-akka/pom.xml b/akka-modules/spring-akka/pom.xml
index 7451a40b86..2201181435 100644
--- a/akka-modules/spring-akka/pom.xml
+++ b/akka-modules/spring-akka/pom.xml
@@ -43,7 +43,7 @@
- 4.3.4.RELEASE
+ 5.3.25
2.4.14
diff --git a/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java
index 2ac7adc3aa..f828d148ba 100644
--- a/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java
+++ b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/AntColonyOptimizationLongRunningUnitTest.java
@@ -1,22 +1,24 @@
package com.baeldung.algorithms;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.ga.ant_colony.AntColonyOptimization;
-public class AntColonyOptimizationLongRunningUnitTest {
+class AntColonyOptimizationLongRunningUnitTest {
@Test
- public void testGenerateRandomMatrix() {
+ void testGenerateRandomMatrix() {
AntColonyOptimization antTSP = new AntColonyOptimization(5);
- Assert.assertNotNull(antTSP.generateRandomMatrix(5));
+ assertNotNull(antTSP.generateRandomMatrix(5));
}
@Test
- public void testStartAntOptimization() {
+ void testStartAntOptimization() {
AntColonyOptimization antTSP = new AntColonyOptimization(5);
- Assert.assertNotNull(antTSP.solve());
+ assertNotNull(antTSP.solve());
}
}
diff --git a/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java
index e819da4b36..a2f869e171 100644
--- a/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java
+++ b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/BinaryGeneticAlgorithmLongRunningUnitTest.java
@@ -1,16 +1,19 @@
package com.baeldung.algorithms;
-import org.junit.Assert;
-import org.junit.Test;
+
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.ga.binary.SimpleGeneticAlgorithm;
-public class BinaryGeneticAlgorithmLongRunningUnitTest {
+class BinaryGeneticAlgorithmLongRunningUnitTest {
@Test
- public void testGA() {
+ void testGA() {
SimpleGeneticAlgorithm ga = new SimpleGeneticAlgorithm();
- Assert.assertTrue(ga.runAlgorithm(50, "1011000100000100010000100000100111001000000100000100000000001111"));
+ assertTrue(ga.runAlgorithm(50, "1011000100000100010000100000100111001000000100000100000000001111"));
}
}
diff --git a/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java
index 2ce7d75e43..461e3e9128 100644
--- a/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java
+++ b/algorithms-modules/algorithms-genetic/src/test/java/com/baeldung/algorithms/SimulatedAnnealingLongRunningUnitTest.java
@@ -1,15 +1,17 @@
package com.baeldung.algorithms;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.ga.annealing.SimulatedAnnealing;
-public class SimulatedAnnealingLongRunningUnitTest {
+class SimulatedAnnealingLongRunningUnitTest {
@Test
- public void testSimulateAnnealing() {
- Assert.assertTrue(SimulatedAnnealing.simulateAnnealing(10, 1000, 0.9) > 0);
+ void testSimulateAnnealing() {
+ assertTrue(SimulatedAnnealing.simulateAnnealing(10, 1000, 0.9) > 0);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java
index e817d195b3..4e8f927750 100644
--- a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/HillClimbingAlgorithmUnitTest.java
@@ -1,23 +1,25 @@
package com.baeldung.algorithms;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import com.baeldung.algorithms.hillclimbing.HillClimbing;
import com.baeldung.algorithms.hillclimbing.State;
-import org.junit.Before;
-import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-public class HillClimbingAlgorithmUnitTest {
+class HillClimbingAlgorithmUnitTest {
private Stack initStack;
private Stack goalStack;
- @Before
+ @BeforeEach
public void initStacks() {
String blockArr[] = { "B", "C", "D", "A" };
String goalBlockArr[] = { "A", "B", "C", "D" };
@@ -30,7 +32,7 @@ public class HillClimbingAlgorithmUnitTest {
}
@Test
- public void givenInitAndGoalState_whenGetPathWithHillClimbing_thenPathFound() {
+ void givenInitAndGoalState_whenGetPathWithHillClimbing_thenPathFound() {
HillClimbing hillClimbing = new HillClimbing();
List path;
@@ -46,7 +48,7 @@ public class HillClimbingAlgorithmUnitTest {
}
@Test
- public void givenCurrentState_whenFindNextState_thenBetterHeuristics() {
+ void givenCurrentState_whenFindNextState_thenBetterHeuristics() {
HillClimbing hillClimbing = new HillClimbing();
List> initList = new ArrayList<>();
initList.add(initStack);
diff --git a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java
index fddccfcd9f..f3e896541d 100644
--- a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/RtFiniteStateMachineLongRunningUnitTest.java
@@ -1,14 +1,16 @@
package com.baeldung.algorithms;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
import com.baeldung.algorithms.automata.*;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
-public final class RtFiniteStateMachineLongRunningUnitTest {
+class RtFiniteStateMachineLongRunningUnitTest {
@Test
- public void acceptsSimplePair() {
+ void acceptsSimplePair() {
String json = "{\"key\":\"value\"}";
FiniteStateMachine machine = this.buildJsonStateMachine();
for (int i = 0; i < json.length(); i++) {
@@ -18,7 +20,7 @@ public final class RtFiniteStateMachineLongRunningUnitTest {
}
@Test
- public void acceptsMorePairs() {
+ void acceptsMorePairs() {
String json = "{\"key1\":\"value1\",\"key2\":\"value2\"}";
FiniteStateMachine machine = this.buildJsonStateMachine();
for (int i = 0; i < json.length(); i++) {
@@ -27,13 +29,15 @@ public final class RtFiniteStateMachineLongRunningUnitTest {
assertTrue(machine.canStop());
}
- @Test(expected = IllegalArgumentException.class)
- public void missingColon() {
+ @Test
+ void missingColon() {
String json = "{\"key\"\"value\"}";
- FiniteStateMachine machine = this.buildJsonStateMachine();
- for (int i = 0; i < json.length(); i++) {
- machine = machine.switchState(String.valueOf(json.charAt(i)));
- }
+ assertThrows(IllegalArgumentException.class, () -> {
+ FiniteStateMachine machine = this.buildJsonStateMachine();
+ for (int i = 0; i < json.length(); i++) {
+ machine = machine.switchState(String.valueOf(json.charAt(i)));
+ }
+ });
}
/**
diff --git a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java
index 6fbb7c163a..e877d9945a 100644
--- a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/kthlargest/FindKthLargestUnitTest.java
@@ -1,54 +1,54 @@
package com.baeldung.algorithms.kthlargest;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class FindKthLargestUnitTest {
+class FindKthLargestUnitTest {
private FindKthLargest findKthLargest;
private Integer[] arr = { 3, 7, 1, 2, 8, 10, 4, 5, 6, 9 };
- @Before
+ @BeforeEach
public void setup() {
findKthLargest = new FindKthLargest();
}
@Test
- public void givenIntArray_whenFindKthLargestBySorting_thenGetResult() {
+ void givenIntArray_whenFindKthLargestBySorting_thenGetResult() {
int k = 3;
assertThat(findKthLargest.findKthLargestBySorting(arr, k)).isEqualTo(8);
}
@Test
- public void givenIntArray_whenFindKthLargestBySortingDesc_thenGetResult() {
+ void givenIntArray_whenFindKthLargestBySortingDesc_thenGetResult() {
int k = 3;
assertThat(findKthLargest.findKthLargestBySortingDesc(arr, k)).isEqualTo(8);
}
@Test
- public void givenIntArray_whenFindKthLargestByQuickSelect_thenGetResult() {
+ void givenIntArray_whenFindKthLargestByQuickSelect_thenGetResult() {
int k = 3;
int kthLargest = arr.length - k;
assertThat(findKthLargest.findKthElementByQuickSelect(arr, 0, arr.length - 1, kthLargest)).isEqualTo(8);
}
@Test
- public void givenIntArray_whenFindKthElementByQuickSelectIterative_thenGetResult() {
+ void givenIntArray_whenFindKthElementByQuickSelectIterative_thenGetResult() {
int k = 3;
int kthLargest = arr.length - k;
assertThat(findKthLargest.findKthElementByQuickSelectWithIterativePartition(arr, 0, arr.length - 1, kthLargest)).isEqualTo(8);
}
@Test
- public void givenIntArray_whenFindKthSmallestByQuickSelect_thenGetResult() {
+ void givenIntArray_whenFindKthSmallestByQuickSelect_thenGetResult() {
int k = 3;
assertThat(findKthLargest.findKthElementByQuickSelect(arr, 0, arr.length - 1, k - 1)).isEqualTo(3);
}
@Test
- public void givenIntArray_whenFindKthLargestByRandomizedQuickSelect_thenGetResult() {
+ void givenIntArray_whenFindKthLargestByRandomizedQuickSelect_thenGetResult() {
int k = 3;
int kthLargest = arr.length - k;
assertThat(findKthLargest.findKthElementByRandomizedQuickSelect(arr, 0, arr.length - 1, kthLargest)).isEqualTo(8);
diff --git a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java
index 59f0fcf053..e36e3651de 100644
--- a/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/minimax/MinimaxUnitTest.java
@@ -1,23 +1,24 @@
package com.baeldung.algorithms.minimax;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.*;
-import com.baeldung.algorithms.minimax.MiniMax;
-import com.baeldung.algorithms.minimax.Tree;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class MinimaxUnitTest {
+class MinimaxUnitTest {
private Tree gameTree;
private MiniMax miniMax;
- @Before
+ @BeforeEach
public void initMiniMaxUtility() {
miniMax = new MiniMax();
}
@Test
- public void givenMiniMax_whenConstructTree_thenNotNullTree() {
+ void givenMiniMax_whenConstructTree_thenNotNullTree() {
assertNull(gameTree);
miniMax.constructTree(6);
gameTree = miniMax.getTree();
@@ -25,7 +26,7 @@ public class MinimaxUnitTest {
}
@Test
- public void givenMiniMax_whenCheckWin_thenComputeOptimal() {
+ void givenMiniMax_whenCheckWin_thenComputeOptimal() {
miniMax.constructTree(6);
boolean result = miniMax.checkWin();
assertTrue(result);
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java
index bbc4d4f398..7e80d335be 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java
@@ -1,6 +1,6 @@
package com.baeldung.algorithms;
-import org.junit.Test;
+
import com.baeldung.algorithms.ga.dijkstra.Dijkstra;
import com.baeldung.algorithms.ga.dijkstra.Graph;
@@ -11,7 +11,9 @@ import java.util.List;
import static org.junit.Assert.assertTrue;
-public class DijkstraAlgorithmLongRunningUnitTest {
+import org.junit.jupiter.api.Test;
+
+class DijkstraAlgorithmLongRunningUnitTest {
@Test
public void whenSPPSolved_thenCorrect() {
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java
index aba7f149da..ba492b33cf 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/astar/underground/RouteFinderIntegrationTest.java
@@ -1,5 +1,6 @@
package com.baeldung.algorithms.astar.underground;
+
import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
@@ -10,22 +11,22 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import com.baeldung.algorithms.astar.Graph;
import com.baeldung.algorithms.astar.RouteFinder;
import lombok.extern.slf4j.Slf4j;
-import org.junit.Before;
-import org.junit.Test;
-
@Slf4j
-public class RouteFinderIntegrationTest {
+class RouteFinderIntegrationTest {
private Graph underground;
private RouteFinder routeFinder;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Set stations = new HashSet<>();
Map> connections = new HashMap<>();
@@ -641,7 +642,7 @@ public class RouteFinderIntegrationTest {
}
@Test
- public void findRoute() {
+ void findRoute() {
List route = routeFinder.findRoute(underground.getNode("74"), underground.getNode("7"));
assertThat(route).size().isPositive();
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java
deleted file mode 100644
index d11da61191..0000000000
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.baeldung.algorithms.editdistance;
-
-import org.junit.runners.Parameterized.Parameters;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-public class EditDistanceDataProvider {
-
- @Parameters
- public static Collection getLists() {
- return Arrays.asList(new Object[][] {
- { "", "", 0 },
- { "ago", "", 3 },
- { "", "do", 2 },
- { "abc", "adc", 1 },
- { "peek", "pesek", 1 },
- { "sunday", "saturday", 3 }
- });
- }
-}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java
index 3dd63e86ab..044c8fc268 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java
@@ -1,32 +1,39 @@
package com.baeldung.algorithms.editdistance;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(Parameterized.class)
-public class EditDistanceUnitTest extends EditDistanceDataProvider {
+import java.util.stream.Stream;
- private String x;
- private String y;
- private int result;
- public EditDistanceUnitTest(String a, String b, int res) {
- super();
- x = a;
- y = b;
- result = res;
- }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
- @Test
- public void testEditDistance_RecursiveImplementation() {
+import org.junit.jupiter.params.provider.MethodSource;
+
+class EditDistanceUnitTest {
+
+ @ParameterizedTest
+ @MethodSource("provideArguments")
+ void testEditDistance_RecursiveImplementation(String x, String y, int result) {
assertEquals(result, EditDistanceRecursive.calculate(x, y));
}
- @Test
- public void testEditDistance_givenDynamicProgrammingImplementation() {
+ @ParameterizedTest
+ @MethodSource("provideArguments")
+ void testEditDistance_givenDynamicProgrammingImplementation(String x, String y, int result) {
assertEquals(result, EditDistanceDynamicProgramming.calculate(x, y));
}
+
+
+ static Stream provideArguments() {
+ return Stream.of(new Object[][] {
+ { "", "", 0 },
+ { "ago", "", 3 },
+ { "", "do", 2 },
+ { "abc", "adc", 1 },
+ { "peek", "pesek", 1 },
+ { "sunday", "saturday", 3 }
+ }).map(Arguments::of);
+ }
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java
index 33889fbec6..a2bcb07ce3 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java
@@ -1,23 +1,16 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(value = Parameterized.class)
-public class CycleDetectionBruteForceUnitTest extends CycleDetectionTestBase {
- boolean cycleExists;
- Node head;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
- public CycleDetectionBruteForceUnitTest(Node head, boolean cycleExists) {
- super();
- this.cycleExists = cycleExists;
- this.head = head;
- }
+class CycleDetectionBruteForceUnitTest extends CycleDetectionTestBase {
- @Test
- public void givenList_detectLoop() {
- Assert.assertEquals(cycleExists, CycleDetectionBruteForce.detectCycle(head).cycleExists);
+
+ @ParameterizedTest
+ @MethodSource("getLists")
+ void givenList_detectLoop(Node head, boolean cycleExists) {
+ assertEquals(cycleExists, CycleDetectionBruteForce.detectCycle(head).cycleExists);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java
index 1496840771..6acd8a2bef 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java
@@ -1,23 +1,16 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-@RunWith(value = Parameterized.class)
-public class CycleDetectionByFastAndSlowIteratorsUnitTest extends CycleDetectionTestBase {
- boolean cycleExists;
- Node head;
+import static org.junit.jupiter.api.Assertions.assertEquals;
- public CycleDetectionByFastAndSlowIteratorsUnitTest(Node head, boolean cycleExists) {
- super();
- this.cycleExists = cycleExists;
- this.head = head;
- }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
- @Test
- public void givenList_detectLoop() {
- Assert.assertEquals(cycleExists, CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
+class CycleDetectionByFastAndSlowIteratorsUnitTest extends CycleDetectionTestBase {
+
+ @ParameterizedTest
+ @MethodSource("getLists")
+ void givenList_detectLoop(Node head, boolean cycleExists) {
+ assertEquals(cycleExists, CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java
index 136f55f834..905423e337 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java
@@ -1,23 +1,17 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-@RunWith(value = Parameterized.class)
-public class CycleDetectionByHashingUnitTest extends CycleDetectionTestBase {
- boolean cycleExists;
- Node head;
+import static org.junit.jupiter.api.Assertions.assertEquals;
- public CycleDetectionByHashingUnitTest(Node head, boolean cycleExists) {
- super();
- this.cycleExists = cycleExists;
- this.head = head;
- }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
- @Test
- public void givenList_detectLoop() {
- Assert.assertEquals(cycleExists, CycleDetectionByHashing.detectCycle(head).cycleExists);
+
+class CycleDetectionByHashingUnitTest extends CycleDetectionTestBase {
+
+ @ParameterizedTest
+ @MethodSource("getLists")
+ void givenList_detectLoop(Node head, boolean cycleExists) {
+ assertEquals(cycleExists, CycleDetectionByHashing.detectCycle(head).cycleExists);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java
index 1c6f56b20d..b4d0bf5459 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionTestBase.java
@@ -7,7 +7,7 @@ import org.junit.runners.Parameterized.Parameters;
public class CycleDetectionTestBase {
- @Parameters
+
public static Collection getLists() {
return Arrays.asList(new Object[][] {
{ createList(), false },
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java
index 36f08d2b76..6dc6ff9f58 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java
@@ -1,24 +1,19 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-@RunWith(value = Parameterized.class)
-public class CycleRemovalBruteForceUnitTest extends CycleDetectionTestBase {
- boolean cycleExists;
- Node head;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
- public CycleRemovalBruteForceUnitTest(Node head, boolean cycleExists) {
- super();
- this.cycleExists = cycleExists;
- this.head = head;
- }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
- @Test
- public void givenList_ifLoopExists_thenDetectAndRemoveLoop() {
- Assert.assertEquals(cycleExists, CycleRemovalBruteForce.detectAndRemoveCycle(head));
- Assert.assertFalse(CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
+
+class CycleRemovalBruteForceUnitTest extends CycleDetectionTestBase {
+
+ @ParameterizedTest
+ @MethodSource("getLists")
+ void givenList_ifLoopExists_thenDetectAndRemoveLoop(Node head, boolean cycleExists) {
+ assertEquals(cycleExists, CycleRemovalBruteForce.detectAndRemoveCycle(head));
+ assertFalse(CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java
index cc7589c53d..c82f175488 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java
@@ -1,24 +1,17 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
-@RunWith(value = Parameterized.class)
-public class CycleRemovalByCountingLoopNodesUnitTest extends CycleDetectionTestBase {
- boolean cycleExists;
- Node head;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
- public CycleRemovalByCountingLoopNodesUnitTest(Node head, boolean cycleExists) {
- super();
- this.cycleExists = cycleExists;
- this.head = head;
- }
+class CycleRemovalByCountingLoopNodesUnitTest extends CycleDetectionTestBase {
- @Test
- public void givenList_ifLoopExists_thenDetectAndRemoveLoop() {
- Assert.assertEquals(cycleExists, CycleRemovalByCountingLoopNodes.detectAndRemoveCycle(head));
- Assert.assertFalse(CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
+ @ParameterizedTest
+ @MethodSource("getLists")
+ void givenList_ifLoopExists_thenDetectAndRemoveLoop(Node head, boolean cycleExists) {
+ assertEquals(cycleExists, CycleRemovalByCountingLoopNodes.detectAndRemoveCycle(head));
+ assertFalse(CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java
index 350e63dcc3..3ffb9ac639 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java
@@ -1,24 +1,19 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-@RunWith(value = Parameterized.class)
-public class CycleRemovalWithoutCountingLoopNodesUnitTest extends CycleDetectionTestBase {
- boolean cycleExists;
- Node head;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
- public CycleRemovalWithoutCountingLoopNodesUnitTest(Node head, boolean cycleExists) {
- super();
- this.cycleExists = cycleExists;
- this.head = head;
- }
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
- @Test
- public void givenList_ifLoopExists_thenDetectAndRemoveLoop() {
- Assert.assertEquals(cycleExists, CycleRemovalWithoutCountingLoopNodes.detectAndRemoveCycle(head));
- Assert.assertFalse(CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
+
+class CycleRemovalWithoutCountingLoopNodesUnitTest extends CycleDetectionTestBase {
+
+ @ParameterizedTest
+ @MethodSource("getLists")
+ void givenList_ifLoopExists_thenDetectAndRemoveLoop(Node head, boolean cycleExists) {
+ assertEquals(cycleExists, CycleRemovalWithoutCountingLoopNodes.detectAndRemoveCycle(head));
+ assertFalse(CycleDetectionByFastAndSlowIterators.detectCycle(head).cycleExists);
}
}
\ No newline at end of file
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java
index 26643e9c1e..1b94643e8a 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java
@@ -1,84 +1,84 @@
package com.baeldung.algorithms.moneywords;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.numberwordconverter.NumberWordConverter;
-public class NumberWordConverterUnitTest {
+class NumberWordConverterUnitTest {
@Test
- public void whenMoneyNegative_thenReturnInvalidInput() {
+ void whenMoneyNegative_thenReturnInvalidInput() {
assertEquals(NumberWordConverter.INVALID_INPUT_GIVEN, NumberWordConverter.getMoneyIntoWords(-13));
}
@Test
- public void whenZeroDollarsGiven_thenReturnEmptyString() {
+ void whenZeroDollarsGiven_thenReturnEmptyString() {
assertEquals("", NumberWordConverter.getMoneyIntoWords(0));
}
@Test
- public void whenOnlyDollarsGiven_thenReturnWords() {
+ void whenOnlyDollarsGiven_thenReturnWords() {
assertEquals("one dollar", NumberWordConverter.getMoneyIntoWords(1));
}
@Test
- public void whenOnlyCentsGiven_thenReturnWords() {
+ void whenOnlyCentsGiven_thenReturnWords() {
assertEquals("sixty cents", NumberWordConverter.getMoneyIntoWords(0.6));
}
@Test
- public void whenAlmostAMillioDollarsGiven_thenReturnWords() {
+ void whenAlmostAMillioDollarsGiven_thenReturnWords() {
String expectedResult = "nine hundred ninety nine thousand nine hundred ninety nine dollars";
assertEquals(expectedResult, NumberWordConverter.getMoneyIntoWords(999_999));
}
@Test
- public void whenThirtyMillionDollarsGiven_thenReturnWords() {
+ void whenThirtyMillionDollarsGiven_thenReturnWords() {
String expectedResult = "thirty three million three hundred forty eight thousand nine hundred seventy eight dollars";
assertEquals(expectedResult, NumberWordConverter.getMoneyIntoWords(33_348_978));
}
@Test
- public void whenTwoBillionDollarsGiven_thenReturnWords() {
+ void whenTwoBillionDollarsGiven_thenReturnWords() {
String expectedResult = "two billion one hundred thirty three million two hundred forty seven thousand eight hundred ten dollars";
assertEquals(expectedResult, NumberWordConverter.getMoneyIntoWords(2_133_247_810));
}
@Test
- public void whenGivenDollarsAndCents_thenReturnWords() {
+ void whenGivenDollarsAndCents_thenReturnWords() {
String expectedResult = "nine hundred twenty four dollars and sixty cents";
assertEquals(expectedResult, NumberWordConverter.getMoneyIntoWords(924.6));
}
@Test
- public void whenOneDollarAndNoCents_thenReturnDollarSingular() {
+ void whenOneDollarAndNoCents_thenReturnDollarSingular() {
assertEquals("one dollar", NumberWordConverter.getMoneyIntoWords(1));
}
@Test
- public void whenNoDollarsAndOneCent_thenReturnCentSingular() {
+ void whenNoDollarsAndOneCent_thenReturnCentSingular() {
assertEquals("one cent", NumberWordConverter.getMoneyIntoWords(0.01));
}
@Test
- public void whenNoDollarsAndTwoCents_thenReturnCentsPlural() {
+ void whenNoDollarsAndTwoCents_thenReturnCentsPlural() {
assertEquals("two cents", NumberWordConverter.getMoneyIntoWords(0.02));
}
@Test
- public void whenNoDollarsAndNinetyNineCents_thenReturnWords() {
+ void whenNoDollarsAndNinetyNineCents_thenReturnWords() {
assertEquals("ninety nine cents", NumberWordConverter.getMoneyIntoWords(0.99));
}
@Test
- public void whenNoDollarsAndNineFiveNineCents_thenCorrectRounding() {
+ void whenNoDollarsAndNineFiveNineCents_thenCorrectRounding() {
assertEquals("ninety six cents", NumberWordConverter.getMoneyIntoWords(0.959));
}
@Test
- public void whenGivenDollarsAndCents_thenReturnWordsVersionTwo() {
+ void whenGivenDollarsAndCents_thenReturnWordsVersionTwo() {
assertEquals("three hundred ten £ 00/100", NumberWordConverter.getMoneyIntoWords("310"));
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java
index 0b0d6ae822..c95f1bc6e8 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java
@@ -1,6 +1,8 @@
package com.baeldung.jgrapht;
-import static org.junit.Assert.assertEquals;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
@@ -9,15 +11,15 @@ import org.jgrapht.alg.HamiltonianCycle;
import org.jgrapht.generate.CompleteGraphGenerator;
import org.jgrapht.graph.DefaultEdge;
import org.jgrapht.graph.SimpleWeightedGraph;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class CompleteGraphUnitTest {
+class CompleteGraphUnitTest {
static SimpleWeightedGraph completeGraph;
static int size = 10;
- @Before
+ @BeforeEach
public void createCompleteGraph() {
completeGraph = new SimpleWeightedGraph<>(DefaultEdge.class);
CompleteGraphGenerator completeGenerator = new CompleteGraphGenerator(size);
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java
index 3aebaf49a2..ad3433cc21 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTest.java
@@ -1,7 +1,9 @@
package com.baeldung.jgrapht;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.List;
@@ -21,13 +23,13 @@ import org.jgrapht.graph.DefaultEdge;
import org.jgrapht.graph.DirectedSubgraph;
import org.jgrapht.traverse.BreadthFirstIterator;
import org.jgrapht.traverse.DepthFirstIterator;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class DirectedGraphUnitTest {
+class DirectedGraphUnitTest {
DirectedGraph directedGraph;
- @Before
+ @BeforeEach
public void createDirectedGraph() {
directedGraph = new DefaultDirectedGraph(DefaultEdge.class);
IntStream.range(1, 10).forEach(i -> {
@@ -46,7 +48,7 @@ public class DirectedGraphUnitTest {
}
@Test
- public void givenDirectedGraph_whenGetStronglyConnectedSubgraphs_thenPathExistsBetweenStronglyconnectedVertices() {
+ void givenDirectedGraph_whenGetStronglyConnectedSubgraphs_thenPathExistsBetweenStronglyconnectedVertices() {
StrongConnectivityAlgorithm scAlg = new KosarajuStrongConnectivityInspector<>(directedGraph);
List> stronglyConnectedSubgraphs = scAlg.stronglyConnectedSubgraphs();
List stronglyConnectedVertices = new ArrayList<>(stronglyConnectedSubgraphs.get(3).vertexSet());
@@ -60,7 +62,7 @@ public class DirectedGraphUnitTest {
}
@Test
- public void givenDirectedGraphWithCycle_whenCheckCycles_thenDetectCycles() {
+ void givenDirectedGraphWithCycle_whenCheckCycles_thenDetectCycles() {
CycleDetector cycleDetector = new CycleDetector(directedGraph);
assertTrue(cycleDetector.detectCycles());
Set cycleVertices = cycleDetector.findCycles();
@@ -68,26 +70,26 @@ public class DirectedGraphUnitTest {
}
@Test
- public void givenDirectedGraph_whenCreateInstanceDepthFirstIterator_thenGetIterator() {
+ void givenDirectedGraph_whenCreateInstanceDepthFirstIterator_thenGetIterator() {
DepthFirstIterator depthFirstIterator = new DepthFirstIterator<>(directedGraph);
assertNotNull(depthFirstIterator);
}
@Test
- public void givenDirectedGraph_whenCreateInstanceBreadthFirstIterator_thenGetIterator() {
+ void givenDirectedGraph_whenCreateInstanceBreadthFirstIterator_thenGetIterator() {
BreadthFirstIterator breadthFirstIterator = new BreadthFirstIterator<>(directedGraph);
assertNotNull(breadthFirstIterator);
}
@Test
- public void givenDirectedGraph_whenGetDijkstraShortestPath_thenGetNotNullPath() {
+ void givenDirectedGraph_whenGetDijkstraShortestPath_thenGetNotNullPath() {
DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(directedGraph);
List shortestPath = dijkstraShortestPath.getPath("v1", "v4").getVertexList();
assertNotNull(shortestPath);
}
@Test
- public void givenDirectedGraph_whenGetBellmanFordShortestPath_thenGetNotNullPath() {
+ void givenDirectedGraph_whenGetBellmanFordShortestPath_thenGetNotNullPath() {
BellmanFordShortestPath bellmanFordShortestPath = new BellmanFordShortestPath(directedGraph);
List shortestPath = bellmanFordShortestPath.getPath("v1", "v4").getVertexList();
assertNotNull(shortestPath);
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java
index 8cf1b70898..e47f53da75 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java
@@ -1,7 +1,7 @@
package com.baeldung.jgrapht;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.stream.IntStream;
@@ -9,13 +9,13 @@ import org.jgrapht.GraphPath;
import org.jgrapht.alg.cycle.HierholzerEulerianCycle;
import org.jgrapht.graph.DefaultEdge;
import org.jgrapht.graph.SimpleWeightedGraph;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class EulerianCircuitUnitTest {
+class EulerianCircuitUnitTest {
SimpleWeightedGraph simpleGraph;
- @Before
+ @BeforeEach
public void createGraphWithEulerianCircuit() {
simpleGraph = new SimpleWeightedGraph<>(DefaultEdge.class);
IntStream.range(1, 6).forEach(i -> {
diff --git a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java
index a0d7523f48..7fb1b28cca 100644
--- a/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java
@@ -1,6 +1,8 @@
package com.baeldung.jgrapht;
-import static org.junit.Assert.assertTrue;
+
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Color;
import java.awt.image.BufferedImage;
@@ -12,18 +14,18 @@ import javax.imageio.ImageIO;
import org.jgrapht.ext.JGraphXAdapter;
import org.jgrapht.graph.DefaultDirectedGraph;
import org.jgrapht.graph.DefaultEdge;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.mxgraph.layout.mxCircleLayout;
import com.mxgraph.layout.mxIGraphLayout;
import com.mxgraph.util.mxCellRenderer;
-public class GraphImageGenerationUnitTest {
+class GraphImageGenerationUnitTest {
static DefaultDirectedGraph g;
- @Before
+ @BeforeEach
public void createGraph() throws IOException {
File imgFile = new File("src/test/resources/graph1.png");
imgFile.createNewFile();
@@ -39,14 +41,14 @@ public class GraphImageGenerationUnitTest {
g.addEdge(x3, x1);
}
- @After
+ @AfterEach
public void cleanup() {
File imgFile = new File("src/test/resources/graph1.png");
imgFile.deleteOnExit();
}
@Test
- public void givenAdaptedGraph_whenWriteBufferedImage_ThenFileShouldExist() throws IOException {
+ void givenAdaptedGraph_whenWriteBufferedImage_ThenFileShouldExist() throws IOException {
JGraphXAdapter graphAdapter = new JGraphXAdapter(g);
mxIGraphLayout layout = new mxCircleLayout(graphAdapter);
layout.execute(graphAdapter.getDefaultParent());
diff --git a/algorithms-modules/algorithms-miscellaneous-3/README.md b/algorithms-modules/algorithms-miscellaneous-3/README.md
index dd5bbac162..8a606caa22 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/README.md
+++ b/algorithms-modules/algorithms-miscellaneous-3/README.md
@@ -10,7 +10,7 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
- [Converting Between Roman and Arabic Numerals in Java](https://www.baeldung.com/java-convert-roman-arabic)
- [Practical Java Examples of the Big O Notation](https://www.baeldung.com/java-algorithm-complexity)
- [Checking If a List Is Sorted in Java](https://www.baeldung.com/java-check-if-list-sorted)
-- [Checking if a Java Graph has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
+- [Checking if a Java Graph Has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
- [A Guide to the Folding Technique in Java](https://www.baeldung.com/folding-hashing-technique)
- [Creating a Triangle with for Loops in Java](https://www.baeldung.com/java-print-triangle)
- [The K-Means Clustering Algorithm in Java](https://www.baeldung.com/java-k-means-clustering-algorithm)
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checktargetsum/CheckTargetSum.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checktargetsum/CheckTargetSum.java
new file mode 100644
index 0000000000..fdbde62301
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checktargetsum/CheckTargetSum.java
@@ -0,0 +1,58 @@
+package com.baeldung.algorithms.checktargetsum;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class CheckTargetSum {
+ public boolean isTargetSumExistNaive(int[] nums, int target) {
+ for (int i = 0; i < nums.length; i++) {
+ for (int j = i + 1; j < nums.length; j++) {
+ if (nums[i] + nums[j] == target) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public boolean isTargetSumExistSorted(int[] nums, int target) {
+ Arrays.sort(nums);
+
+ int start = 0;
+ int end = nums.length - 1;
+
+ while (start < end) {
+ int sum = nums[start] + nums[end];
+
+ if (sum == target) {
+ return true;
+ }
+
+ if (sum < target) {
+ start++;
+ } else {
+ end--;
+ }
+ }
+
+ return false;
+ }
+
+ public boolean isTargetSumExistHashSet(int[] nums, int target) {
+ Set hashSet = new HashSet<>();
+
+ for (int num : nums) {
+ int diff = target - num;
+
+ if (hashSet.contains(diff)) {
+ return true;
+ }
+
+ hashSet.add(num);
+ }
+
+ return false;
+ }
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java
index 1e9188f726..f3d9f7161a 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/analysis/AnalysisRunnerLiveTest.java
@@ -1,14 +1,14 @@
package com.baeldung.algorithms.analysis;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class AnalysisRunnerLiveTest {
+class AnalysisRunnerLiveTest {
int n = 10;
int total = 0;
@Test
- public void whenConstantComplexity_thenConstantRuntime() {
+ void whenConstantComplexity_thenConstantRuntime() {
System.out.println("**** n = " + n + " ****");
System.out.println();
@@ -22,7 +22,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenLogarithmicComplexity_thenLogarithmicRuntime() {
+ void whenLogarithmicComplexity_thenLogarithmicRuntime() {
// Logarithmic Time
System.out.println("**** Logarithmic Time ****");
for (int i = 1; i < n; i = i * 2) {
@@ -34,7 +34,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenLinearComplexity_thenLinearRuntime() {
+ void whenLinearComplexity_thenLinearRuntime() {
// Linear Time
System.out.println("**** Linear Time ****");
for (int i = 0; i < n; i++) {
@@ -47,7 +47,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenNLogNComplexity_thenNLogNRuntime() {
+ void whenNLogNComplexity_thenNLogNRuntime() {
// N Log N Time
System.out.println("**** nlogn Time ****");
total = 0;
@@ -64,7 +64,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenQuadraticComplexity_thenQuadraticRuntime() {
+ void whenQuadraticComplexity_thenQuadraticRuntime() {
// Quadratic Time
System.out.println("**** Quadratic Time ****");
total = 0;
@@ -81,7 +81,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenCubicComplexity_thenCubicRuntime() {
+ void whenCubicComplexity_thenCubicRuntime() {
// Cubic Time
System.out.println("**** Cubic Time ****");
total = 0;
@@ -100,7 +100,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenExponentialComplexity_thenExponentialRuntime() {
+ void whenExponentialComplexity_thenExponentialRuntime() {
// Exponential Time
System.out.println("**** Exponential Time ****");
total = 0;
@@ -115,7 +115,7 @@ public class AnalysisRunnerLiveTest {
}
@Test
- public void whenFactorialComplexity_thenFactorialRuntime() {
+ void whenFactorialComplexity_thenFactorialRuntime() {
// Factorial Time
System.out.println("**** Factorial Time ****");
total = 0;
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java
index 44c4388e6c..e865aa010a 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checksortedlist/SortedListCheckerUnitTest.java
@@ -11,10 +11,10 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class SortedListCheckerUnitTest {
+class SortedListCheckerUnitTest {
private List sortedListOfString;
private List unsortedListOfString;
@@ -23,7 +23,7 @@ public class SortedListCheckerUnitTest {
private List employeesSortedByName;
private List employeesNotSortedByName;
- @Before
+ @BeforeEach
public void setUp() {
sortedListOfString = asList("Canada", "HK", "LA", "NJ", "NY");
unsortedListOfString = asList("LA", "HK", "NJ", "NY", "Canada");
@@ -34,72 +34,72 @@ public class SortedListCheckerUnitTest {
}
@Test
- public void givenSortedList_whenUsingIterativeApproach_thenReturnTrue() {
+ void givenSortedList_whenUsingIterativeApproach_thenReturnTrue() {
assertThat(checkIfSortedUsingIterativeApproach(sortedListOfString)).isTrue();
}
@Test
- public void givenSingleElementList_whenUsingIterativeApproach_thenReturnTrue() {
+ void givenSingleElementList_whenUsingIterativeApproach_thenReturnTrue() {
assertThat(checkIfSortedUsingIterativeApproach(singletonList)).isTrue();
}
@Test
- public void givenUnsortedList_whenUsingIterativeApproach_thenReturnFalse() {
+ void givenUnsortedList_whenUsingIterativeApproach_thenReturnFalse() {
assertThat(checkIfSortedUsingIterativeApproach(unsortedListOfString)).isFalse();
}
@Test
- public void givenSortedListOfEmployees_whenUsingIterativeApproach_thenReturnTrue() {
+ void givenSortedListOfEmployees_whenUsingIterativeApproach_thenReturnTrue() {
assertThat(checkIfSortedUsingIterativeApproach(employeesSortedByName, Comparator.comparing(Employee::getName))).isTrue();
}
@Test
- public void givenUnsortedListOfEmployees_whenUsingIterativeApproach_thenReturnFalse() {
+ void givenUnsortedListOfEmployees_whenUsingIterativeApproach_thenReturnFalse() {
assertThat(checkIfSortedUsingIterativeApproach(employeesNotSortedByName, Comparator.comparing(Employee::getName))).isFalse();
}
@Test
- public void givenSortedList_whenUsingRecursion_thenReturnTrue() {
+ void givenSortedList_whenUsingRecursion_thenReturnTrue() {
assertThat(checkIfSortedUsingRecursion(sortedListOfString)).isTrue();
}
@Test
- public void givenSingleElementList_whenUsingRecursion_thenReturnTrue() {
+ void givenSingleElementList_whenUsingRecursion_thenReturnTrue() {
assertThat(checkIfSortedUsingRecursion(singletonList)).isTrue();
}
@Test
- public void givenUnsortedList_whenUsingRecursion_thenReturnFalse() {
+ void givenUnsortedList_whenUsingRecursion_thenReturnFalse() {
assertThat(checkIfSortedUsingRecursion(unsortedListOfString)).isFalse();
}
@Test
- public void givenSortedList_whenUsingGuavaOrdering_thenReturnTrue() {
+ void givenSortedList_whenUsingGuavaOrdering_thenReturnTrue() {
assertThat(checkIfSortedUsingOrderingClass(sortedListOfString)).isTrue();
}
@Test
- public void givenUnsortedList_whenUsingGuavaOrdering_thenReturnFalse() {
+ void givenUnsortedList_whenUsingGuavaOrdering_thenReturnFalse() {
assertThat(checkIfSortedUsingOrderingClass(unsortedListOfString)).isFalse();
}
@Test
- public void givenSortedListOfEmployees_whenUsingGuavaOrdering_thenReturnTrue() {
+ void givenSortedListOfEmployees_whenUsingGuavaOrdering_thenReturnTrue() {
assertThat(checkIfSortedUsingOrderingClass(employeesSortedByName, Comparator.comparing(Employee::getName))).isTrue();
}
@Test
- public void givenUnsortedListOfEmployees_whenUsingGuavaOrdering_thenReturnFalse() {
+ void givenUnsortedListOfEmployees_whenUsingGuavaOrdering_thenReturnFalse() {
assertThat(checkIfSortedUsingOrderingClass(employeesNotSortedByName, Comparator.comparing(Employee::getName))).isFalse();
}
@Test
- public void givenSortedList_whenUsingGuavaComparators_thenReturnTrue() {
+ void givenSortedList_whenUsingGuavaComparators_thenReturnTrue() {
assertThat(checkIfSortedUsingComparators(sortedListOfString)).isTrue();
}
@Test
- public void givenUnsortedList_whenUsingGuavaComparators_thenReturnFalse() {
+ void givenUnsortedList_whenUsingGuavaComparators_thenReturnFalse() {
assertThat(checkIfSortedUsingComparators(unsortedListOfString)).isFalse();
}
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checktargetsum/CheckTargetSumUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checktargetsum/CheckTargetSumUnitTest.java
new file mode 100644
index 0000000000..ff20ce112e
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checktargetsum/CheckTargetSumUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.algorithms.checktargetsum;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CheckTargetSumUnitTest {
+ private CheckTargetSum checkTargetSum = new CheckTargetSum();
+
+ private int[] nums = new int[] { 10, 5, 15, 7, 14, 1, 9 };
+
+ private int existingTarget = 6;
+
+ private int nonExistingTarget = 27;
+
+ @Test
+ public void givenArrayOfIntegers_whenTargetSumNaive_thenPairExists() {
+ assertTrue(checkTargetSum.isTargetSumExistNaive(nums, existingTarget));
+ }
+
+ @Test
+ public void givenArrayOfIntegers_whenTargetSumNaive_thenPairDoesNotExists() {
+ assertFalse(checkTargetSum.isTargetSumExistNaive(nums, nonExistingTarget));
+ }
+
+ @Test
+ public void givenArrayOfIntegers_whenTargetSumSorted_thenPairExists() {
+ assertTrue(checkTargetSum.isTargetSumExistNaive(nums, existingTarget));
+ }
+
+ @Test
+ public void givenArrayOfIntegers_whenTargetSumSorted_thenPairDoesNotExists() {
+ assertFalse(checkTargetSum.isTargetSumExistNaive(nums, nonExistingTarget));
+ }
+
+ @Test
+ public void givenArrayOfIntegers_whenTargetSumHashSet_thenPairExists() {
+ assertTrue(checkTargetSum.isTargetSumExistNaive(nums, existingTarget));
+ }
+
+ @Test
+ public void givenArrayOfIntegers_whenTargetSumHashSet_thenPairDoesNotExists() {
+ assertFalse(checkTargetSum.isTargetSumExistNaive(nums, nonExistingTarget));
+ }
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java
index 61ed6b3aec..5b48c884e4 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java
@@ -1,37 +1,37 @@
package com.baeldung.algorithms.enumstatemachine;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class LeaveRequestStateUnitTest {
+class LeaveRequestStateUnitTest {
@Test
- public void givenLeaveRequest_whenStateEscalated_thenResponsibleIsTeamLeader() {
+ void givenLeaveRequest_whenStateEscalated_thenResponsibleIsTeamLeader() {
LeaveRequestState state = LeaveRequestState.Escalated;
- assertEquals(state.responsiblePerson(), "Team Leader");
+ assertEquals( "Team Leader", state.responsiblePerson());
}
@Test
- public void givenLeaveRequest_whenStateApproved_thenResponsibleIsDepartmentManager() {
+ void givenLeaveRequest_whenStateApproved_thenResponsibleIsDepartmentManager() {
LeaveRequestState state = LeaveRequestState.Approved;
- assertEquals(state.responsiblePerson(), "Department Manager");
+ assertEquals( "Department Manager" , state.responsiblePerson());
}
@Test
- public void givenLeaveRequest_whenNextStateIsCalled_thenStateIsChanged() {
+ void givenLeaveRequest_whenNextStateIsCalled_thenStateIsChanged() {
LeaveRequestState state = LeaveRequestState.Submitted;
state = state.nextState();
- assertEquals(state, LeaveRequestState.Escalated);
+ assertEquals(LeaveRequestState.Escalated, state);
state = state.nextState();
- assertEquals(state, LeaveRequestState.Approved);
+ assertEquals(LeaveRequestState.Approved, state);
state = state.nextState();
- assertEquals(state, LeaveRequestState.Approved);
+ assertEquals(LeaveRequestState.Approved, state);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java
index 8d464d7b97..c54483dbbb 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/graphcycledetection/GraphCycleDetectionUnitTest.java
@@ -1,14 +1,14 @@
package com.baeldung.algorithms.graphcycledetection;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.graphcycledetection.domain.Graph;
import com.baeldung.algorithms.graphcycledetection.domain.Vertex;
-public class GraphCycleDetectionUnitTest {
+class GraphCycleDetectionUnitTest {
@Test
public void givenGraph_whenCycleExists_thenReturnTrue() {
@@ -33,7 +33,7 @@ public class GraphCycleDetectionUnitTest {
}
@Test
- public void givenGraph_whenNoCycleExists_thenReturnFalse() {
+ void givenGraph_whenNoCycleExists_thenReturnFalse() {
Vertex vertexA = new Vertex("A");
Vertex vertexB = new Vertex("B");
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java
index 97e99290c9..ad98d63388 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java
@@ -1,14 +1,11 @@
package com.baeldung.algorithms.printtriangles;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
-@RunWith(JUnitParamsRunner.class)
-public class PrintTriangleExamplesUnitTest {
+class PrintTriangleExamplesUnitTest {
private static Object[][] rightTriangles() {
String expected0 = "";
@@ -38,9 +35,9 @@ public class PrintTriangleExamplesUnitTest {
};
}
- @Test
- @Parameters(method = "rightTriangles")
- public void whenPrintARightTriangleIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
+ @ParameterizedTest
+ @MethodSource("rightTriangles")
+ void whenPrintARightTriangleIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
String actual = PrintTriangleExamples.printARightTriangle(nrOfRows);
assertEquals(expected, actual);
@@ -74,24 +71,24 @@ public class PrintTriangleExamplesUnitTest {
};
}
- @Test
- @Parameters(method = "isoscelesTriangles")
- public void whenPrintAnIsoscelesTriangleIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
+ @ParameterizedTest
+ @MethodSource("isoscelesTriangles")
+ void whenPrintAnIsoscelesTriangleIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
String actual = PrintTriangleExamples.printAnIsoscelesTriangle(nrOfRows);
assertEquals(expected, actual);
}
- @Test
- @Parameters(method = "isoscelesTriangles")
+ @ParameterizedTest
+ @MethodSource("isoscelesTriangles")
public void whenPrintAnIsoscelesTriangleUsingStringUtilsIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
String actual = PrintTriangleExamples.printAnIsoscelesTriangleUsingStringUtils(nrOfRows);
assertEquals(expected, actual);
}
-
- @Test
- @Parameters(method = "isoscelesTriangles")
+
+ @ParameterizedTest
+ @MethodSource("isoscelesTriangles")
public void whenPrintAnIsoscelesTriangleUsingSubstringIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
String actual = PrintTriangleExamples.printAnIsoscelesTriangleUsingSubstring(nrOfRows);
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java
index 9043cfe9cc..4571a60509 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/romannumerals/RomanArabicConverterUnitTest.java
@@ -1,13 +1,14 @@
package com.baeldung.algorithms.romannumerals;
+
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class RomanArabicConverterUnitTest {
+class RomanArabicConverterUnitTest {
@Test
- public void given2018Roman_WhenConvertingToArabic_ThenReturn2018() {
+ void given2018Roman_WhenConvertingToArabic_ThenReturn2018() {
String roman2018 = "MMXVIII";
@@ -17,7 +18,7 @@ public class RomanArabicConverterUnitTest {
}
@Test
- public void given1999Arabic_WhenConvertingToRoman_ThenReturnMCMXCIX() {
+ void given1999Arabic_WhenConvertingToRoman_ThenReturnMCMXCIX() {
int arabic1999 = 1999;
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java
index 422a53fa3e..5aaf1711b9 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddleUnitTest.java
@@ -2,14 +2,14 @@ package com.baeldung.algorithms.twopointertechnique;
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class LinkedListFindMiddleUnitTest {
+class LinkedListFindMiddleUnitTest {
LinkedListFindMiddle linkedListFindMiddle = new LinkedListFindMiddle();
@Test
- public void givenLinkedListOfMyNodes_whenLinkedListFindMiddle_thenCorrect() {
+ void givenLinkedListOfMyNodes_whenLinkedListFindMiddle_thenCorrect() {
MyNode head = createNodesList(8);
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java
index da227ae751..defc956a68 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/RotateArrayUnitTest.java
@@ -1,10 +1,10 @@
package com.baeldung.algorithms.twopointertechnique;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class RotateArrayUnitTest {
+class RotateArrayUnitTest {
private RotateArray rotateArray = new RotateArray();
@@ -13,7 +13,7 @@ public class RotateArrayUnitTest {
private int step;
@Test
- public void givenAnArrayOfIntegers_whenRotateKsteps_thenCorrect() {
+ void givenAnArrayOfIntegers_whenRotateKsteps_thenCorrect() {
inputArray = new int[] { 1, 2, 3, 4, 5, 6, 7 };
step = 4;
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java
index aa76f8e1cf..9b017a9d06 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/twopointertechnique/TwoSumUnitTest.java
@@ -1,11 +1,12 @@
package com.baeldung.algorithms.twopointertechnique;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
-public class TwoSumUnitTest {
+class TwoSumUnitTest {
private TwoSum twoSum = new TwoSum();
@@ -14,7 +15,7 @@ public class TwoSumUnitTest {
private int targetValue;
@Test
- public void givenASortedArrayOfIntegers_whenTwoSumSlow_thenPairExists() {
+ void givenASortedArrayOfIntegers_whenTwoSumSlow_thenPairExists() {
sortedArray = new int[] { 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9 };
@@ -24,7 +25,7 @@ public class TwoSumUnitTest {
}
@Test
- public void givenASortedArrayOfIntegers_whenTwoSumSlow_thenPairDoesNotExists() {
+ void givenASortedArrayOfIntegers_whenTwoSumSlow_thenPairDoesNotExists() {
sortedArray = new int[] { 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9 };
@@ -34,7 +35,7 @@ public class TwoSumUnitTest {
}
@Test
- public void givenASortedArrayOfIntegers_whenTwoSum_thenPairExists() {
+ void givenASortedArrayOfIntegers_whenTwoSum_thenPairExists() {
sortedArray = new int[] { 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9 };
@@ -44,7 +45,7 @@ public class TwoSumUnitTest {
}
@Test
- public void givenASortedArrayOfIntegers_whenTwoSum_thenPairDoesNotExists() {
+ void givenASortedArrayOfIntegers_whenTwoSum_thenPairDoesNotExists() {
sortedArray = new int[] { 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9 };
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java
index 4f914bd289..4a60bcb213 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/counter/CounterUnitTest.java
@@ -1,18 +1,18 @@
package com.baeldung.counter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.baeldung.counter.CounterUtil.MutableInteger;
-public class CounterUnitTest {
+class CounterUnitTest {
@Test
- public void whenMapWithWrapperAsCounter_runsSuccessfully() {
+ void whenMapWithWrapperAsCounter_runsSuccessfully() {
Map counterMap = new HashMap<>();
CounterUtil.counterWithWrapperObject(counterMap);
@@ -23,7 +23,7 @@ public class CounterUnitTest {
}
@Test
- public void whenMapWithLambdaAndWrapperCounter_runsSuccessfully() {
+ void whenMapWithLambdaAndWrapperCounter_runsSuccessfully() {
Map counterMap = new HashMap<>();
CounterUtil.counterWithLambdaAndWrapper(counterMap);
@@ -34,7 +34,7 @@ public class CounterUnitTest {
}
@Test
- public void whenMapWithMutableIntegerCounter_runsSuccessfully() {
+ void whenMapWithMutableIntegerCounter_runsSuccessfully() {
Map counterMap = new HashMap<>();
CounterUtil.counterWithMutableInteger(counterMap);
assertEquals(3, counterMap.get("China")
@@ -44,7 +44,7 @@ public class CounterUnitTest {
}
@Test
- public void whenMapWithPrimitiveArray_runsSuccessfully() {
+ void whenMapWithPrimitiveArray_runsSuccessfully() {
Map counterMap = new HashMap<>();
CounterUtil.counterWithPrimitiveArray(counterMap);
assertEquals(3, counterMap.get("China")[0]);
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java
index 43e33d8378..4db4ebd337 100644
--- a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/folding/FoldingHashUnitTest.java
@@ -1,22 +1,22 @@
package com.baeldung.folding;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class FoldingHashUnitTest {
+class FoldingHashUnitTest {
@Test
- public void givenStringJavaLanguage_whenSize2Capacity100000_then48933() throws Exception {
+ void givenStringJavaLanguage_whenSize2Capacity100000_then48933() throws Exception {
final FoldingHash hasher = new FoldingHash();
final int value = hasher.hash("Java language", 2, 100_000);
assertEquals(value, 48933);
}
@Test
- public void givenStringVaJaLanguage_whenSize2Capacity100000_thenSameAsJavaLanguage() throws Exception {
+ void givenStringVaJaLanguage_whenSize2Capacity100000_thenSameAsJavaLanguage() throws Exception {
final FoldingHash hasher = new FoldingHash();
final int java = hasher.hash("Java language", 2, 100_000);
final int vaja = hasher.hash("vaJa language", 2, 100_000);
@@ -24,28 +24,28 @@ public class FoldingHashUnitTest {
}
@Test
- public void givenSingleElementArray_whenOffset0Size2_thenSingleElement() throws Exception {
+ void givenSingleElementArray_whenOffset0Size2_thenSingleElement() throws Exception {
final FoldingHash hasher = new FoldingHash();
final int[] value = hasher.extract(new int[] { 5 }, 0, 2);
assertArrayEquals(new int[] { 5 }, value);
}
@Test
- public void givenFiveElementArray_whenOffset0Size3_thenFirstThreeElements() throws Exception {
+ void givenFiveElementArray_whenOffset0Size3_thenFirstThreeElements() throws Exception {
final FoldingHash hasher = new FoldingHash();
final int[] value = hasher.extract(new int[] { 1, 2, 3, 4, 5 }, 0, 3);
assertArrayEquals(new int[] { 1, 2, 3 }, value);
}
@Test
- public void givenFiveElementArray_whenOffset1Size2_thenTwoElements() throws Exception {
+ void givenFiveElementArray_whenOffset1Size2_thenTwoElements() throws Exception {
final FoldingHash hasher = new FoldingHash();
final int[] value = hasher.extract(new int[] { 1, 2, 3, 4, 5 }, 1, 2);
assertArrayEquals(new int[] { 2, 3 }, value);
}
@Test
- public void givenFiveElementArray_whenOffset2SizeTooBig_thenElementsToTheEnd() throws Exception {
+ void givenFiveElementArray_whenOffset2SizeTooBig_thenElementsToTheEnd() throws Exception {
final FoldingHash hasher = new FoldingHash();
final int[] value = hasher.extract(new int[] { 1, 2, 3, 4, 5 }, 2, 2000);
assertArrayEquals(new int[] { 3, 4, 5 }, value);
diff --git a/algorithms-modules/algorithms-miscellaneous-4/README.md b/algorithms-modules/algorithms-miscellaneous-4/README.md
index e2ae542bf8..6f1b6a66b9 100644
--- a/algorithms-modules/algorithms-miscellaneous-4/README.md
+++ b/algorithms-modules/algorithms-miscellaneous-4/README.md
@@ -5,10 +5,10 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
### Relevant articles:
- [Multi-Swarm Optimization Algorithm in Java](https://www.baeldung.com/java-multi-swarm-algorithm)
-- [Check If a String Contains All The Letters of The Alphabet with Java](https://www.baeldung.com/java-string-contains-all-letters)
+- [Check if a String Contains All the Letters of the Alphabet With Java](https://www.baeldung.com/java-string-contains-all-letters)
- [Find the Middle Element of a Linked List in Java](https://www.baeldung.com/java-linked-list-middle-element)
- [Find Substrings That Are Palindromes in Java](https://www.baeldung.com/java-palindrome-substrings)
-- [Find the Longest Substring without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
+- [Find the Longest Substring Without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
- [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
- [Find the Smallest Missing Integer in an Array](https://www.baeldung.com/java-smallest-missing-integer-in-array)
- [Permutations of a String in Java](https://www.baeldung.com/java-string-permutations)
diff --git a/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java
index 2cda0ccb36..0759f2c020 100644
--- a/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-4/src/test/java/com/baeldung/algorithms/MiddleElementLookupUnitTest.java
@@ -1,18 +1,19 @@
package com.baeldung.algorithms;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import com.baeldung.algorithms.middleelementlookup.MiddleElementLookup;
import com.baeldung.algorithms.middleelementlookup.Node;
-import org.junit.Test;
import java.util.LinkedList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.jupiter.api.Test;
-public class MiddleElementLookupUnitTest {
+class MiddleElementLookupUnitTest {
@Test
- public void whenFindingMiddleLinkedList_thenMiddleFound() {
+ void whenFindingMiddleLinkedList_thenMiddleFound() {
assertEquals("3", MiddleElementLookup
.findMiddleElementLinkedList(createLinkedList(5))
.get());
@@ -22,7 +23,7 @@ public class MiddleElementLookupUnitTest {
}
@Test
- public void whenFindingMiddleFromHead_thenMiddleFound() {
+ void whenFindingMiddleFromHead_thenMiddleFound() {
assertEquals("3", MiddleElementLookup
.findMiddleElementFromHead(createNodesList(5))
.get());
@@ -32,7 +33,7 @@ public class MiddleElementLookupUnitTest {
}
@Test
- public void whenFindingMiddleFromHead1PassRecursively_thenMiddleFound() {
+ void whenFindingMiddleFromHead1PassRecursively_thenMiddleFound() {
assertEquals("3", MiddleElementLookup
.findMiddleElementFromHead1PassRecursively(createNodesList(5))
.get());
@@ -42,7 +43,7 @@ public class MiddleElementLookupUnitTest {
}
@Test
- public void whenFindingMiddleFromHead1PassIteratively_thenMiddleFound() {
+ void whenFindingMiddleFromHead1PassIteratively_thenMiddleFound() {
assertEquals("3", MiddleElementLookup
.findMiddleElementFromHead1PassIteratively(createNodesList(5))
.get());
@@ -52,7 +53,7 @@ public class MiddleElementLookupUnitTest {
}
@Test
- public void whenListEmptyOrNull_thenMiddleNotFound() {
+ void whenListEmptyOrNull_thenMiddleNotFound() {
// null list
assertFalse(MiddleElementLookup
.findMiddleElementLinkedList(null)
diff --git a/algorithms-modules/algorithms-miscellaneous-5/README.md b/algorithms-modules/algorithms-miscellaneous-5/README.md
index 54b936586f..72e9b45683 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/README.md
+++ b/algorithms-modules/algorithms-miscellaneous-5/README.md
@@ -9,7 +9,7 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
- [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)
- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
- [Knapsack Problem Implementation in Java](https://www.baeldung.com/java-knapsack)
-- [How to Determine if a Binary Tree is Balanced in Java](https://www.baeldung.com/java-balanced-binary-tree)
+- [How to Determine if a Binary Tree Is Balanced in Java](https://www.baeldung.com/java-balanced-binary-tree)
- [Overview of Combinatorial Problems in Java](https://www.baeldung.com/java-combinatorial-algorithms)
- [Prim’s Algorithm with a Java Implementation](https://www.baeldung.com/java-prim-algorithm)
- [Maximum Subarray Problem in Java](https://www.baeldung.com/java-maximum-subarray)
diff --git a/algorithms-modules/algorithms-miscellaneous-5/pom.xml b/algorithms-modules/algorithms-miscellaneous-5/pom.xml
index 97c61cb88f..92b8e7d1f5 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/pom.xml
+++ b/algorithms-modules/algorithms-miscellaneous-5/pom.xml
@@ -34,6 +34,23 @@
guava
${guava.version}
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${xml-bind-api.version}
+
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ ${jaxb-runtime.version}
+
+
+ 4.0.0
+ 4.0.0
+
+
\ No newline at end of file
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java
index d3e251d3fd..ae434d88ad 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java
@@ -2,13 +2,15 @@ package com.baeldung.algorithms.conversion;
import java.math.BigInteger;
-import javax.xml.bind.DatatypeConverter;
+
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
import com.google.common.io.BaseEncoding;
+import jakarta.xml.bind.DatatypeConverter;
+
public class HexStringConverter {
/**
@@ -90,7 +92,7 @@ public class HexStringConverter {
return DatatypeConverter.parseHexBinary(hexString);
}
- public String encodeUsingApacheCommons(byte[] bytes) throws DecoderException {
+ public String encodeUsingApacheCommons(byte[] bytes) {
return Hex.encodeHexString(bytes);
}
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java
index 25f313f991..154bc80932 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/balancedbinarytree/BalancedBinaryTreeUnitTest.java
@@ -1,22 +1,23 @@
package com.baeldung.algorithms.balancedbinarytree;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-public class BalancedBinaryTreeUnitTest extends BinaryTreeDataProvider {
+import org.junit.jupiter.api.Test;
+
+class BalancedBinaryTreeUnitTest extends BinaryTreeDataProvider {
@Test
- public void givenBalancedTrees_whenCallingIsBalanced_ShouldReturnTrue() {
+ void givenBalancedTrees_whenCallingIsBalanced_ShouldReturnTrue() {
for (Tree tree : balancedTrees()) {
- assertTrue(toString(tree) + " should be balanced", BalancedBinaryTree.isBalanced(tree));
+ assertTrue(BalancedBinaryTree.isBalanced(tree), toString(tree) + " should be balanced");
}
}
@Test
- public void givenUnbalancedTrees_whenCallingIsBalanced_ShouldReturnFalse() {
+ void givenUnbalancedTrees_whenCallingIsBalanced_ShouldReturnFalse() {
for (Tree tree : unbalancedTrees()) {
- assertFalse(toString(tree) + " should not be balanced", BalancedBinaryTree.isBalanced(tree));
+ assertFalse(BalancedBinaryTree.isBalanced(tree), toString(tree) + " should not be balanced");
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java
index 304d36e2bb..7404c9b5bd 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/binarygap/BinaryGapUnitTest.java
@@ -5,27 +5,31 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-public class BinaryGapUnitTest {
+class BinaryGapUnitTest {
- @Test public void givenNoOccurrenceOfBoundedZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
+ @Test
+ void givenNoOccurrenceOfBoundedZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
int result = calculateBinaryGap(63);
assertEquals(0, result);
}
- @Test public void givenTrailingZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
+ @Test
+ void givenTrailingZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
int result = calculateBinaryGap(40);
assertEquals(1, result);
}
- @Test public void givenSingleOccurrenceOfBoundedZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
+ @Test
+ void givenSingleOccurrenceOfBoundedZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
int result = calculateBinaryGap(9);
assertEquals(2, result);
}
- @Test public void givenMultipleOccurrenceOfBoundedZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
+ @Test
+ void givenMultipleOccurrenceOfBoundedZeros_whenCalculateBinaryGap_thenOutputCorrectResult() {
int result = calculateBinaryGap(145);
assertEquals(3, result);
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java
index 95ffdec239..9f82c444cb 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java
@@ -1,17 +1,18 @@
package com.baeldung.algorithms.combinatorics;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.api.Test;
-public class CombinatoricsUnitTest {
+class CombinatoricsUnitTest {
@Test
- public void givenEmptySequence_whenCallingPermutations_ShouldReturnEmptyList() {
+ void givenEmptySequence_whenCallingPermutations_ShouldReturnEmptyList() {
List sequence = Arrays.asList();
List> permutations = Combinatorics.permutations(sequence);
@@ -20,7 +21,7 @@ public class CombinatoricsUnitTest {
}
@Test
- public void givenOneElementSequence_whenCallingPermutations_ShouldReturnPermutations() {
+ void givenOneElementSequence_whenCallingPermutations_ShouldReturnPermutations() {
List sequence = Arrays.asList(1);
List> permutations = Combinatorics.permutations(sequence);
@@ -31,7 +32,7 @@ public class CombinatoricsUnitTest {
}
@Test
- public void givenFourElementsSequence_whenCallingPermutations_ShouldReturnPermutations() {
+ void givenFourElementsSequence_whenCallingPermutations_ShouldReturnPermutations() {
List sequence = Arrays.asList(1, 2, 3, 4);
List> permutations = Combinatorics.permutations(sequence);
@@ -41,7 +42,7 @@ public class CombinatoricsUnitTest {
}
@Test
- public void givenTwoElements_whenCalling3Combinations_ShouldReturnEmptyList() {
+ void givenTwoElements_whenCalling3Combinations_ShouldReturnEmptyList() {
List set = Arrays.asList(1, 2);
List> combinations = Combinatorics.combinations(set, 3);
@@ -50,7 +51,7 @@ public class CombinatoricsUnitTest {
}
@Test
- public void givenThreeElements_whenCalling3Combinations_ShouldReturnOneCombination() {
+ void givenThreeElements_whenCalling3Combinations_ShouldReturnOneCombination() {
List set = Arrays.asList(1, 2, 3);
List> combinations = Combinatorics.combinations(set, 3);
@@ -60,7 +61,7 @@ public class CombinatoricsUnitTest {
}
@Test
- public void givenFourElements_whenCalling2Combinations_ShouldReturnCombinations() {
+ void givenFourElements_whenCalling2Combinations_ShouldReturnCombinations() {
List set = Arrays.asList(1, 2, 3, 4);
List> combinations = Combinatorics.combinations(set, 2);
@@ -70,7 +71,7 @@ public class CombinatoricsUnitTest {
}
@Test
- public void givenFourElements_whenCallingPowerSet_ShouldReturn15Sets() {
+ void givenFourElements_whenCallingPowerSet_ShouldReturn15Sets() {
List sequence = Arrays.asList('a', 'b', 'c', 'd');
List> combinations = Combinatorics.powerSet(sequence);
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java
index be61802705..bb344e8b30 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java
@@ -1,27 +1,27 @@
package com.baeldung.algorithms.conversion;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.commons.codec.DecoderException;
import org.hamcrest.text.IsEqualIgnoringCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.conversion.HexStringConverter;
-public class ByteArrayConverterUnitTest {
+class ByteArrayConverterUnitTest {
private HexStringConverter hexStringConverter;
- @Before
+ @BeforeEach
public void setup() {
hexStringConverter = new HexStringConverter();
}
@Test
- public void shouldEncodeByteArrayToHexStringUsingBigIntegerToString() {
+ void shouldEncodeByteArrayToHexStringUsingBigIntegerToString() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
if(hexString.charAt(0) == '0') {
@@ -32,7 +32,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldEncodeByteArrayToHexStringUsingBigIntegerStringFormat() {
+ void shouldEncodeByteArrayToHexStringUsingBigIntegerStringFormat() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
String output = hexStringConverter.encodeUsingBigIntegerStringFormat(bytes);
@@ -40,7 +40,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldDecodeHexStringToByteArrayUsingBigInteger() {
+ void shouldDecodeHexStringToByteArrayUsingBigInteger() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
byte[] output = hexStringConverter.decodeUsingBigInteger(hexString);
@@ -48,7 +48,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldEncodeByteArrayToHexStringUsingCharacterConversion() {
+ void shouldEncodeByteArrayToHexStringUsingCharacterConversion() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
String output = hexStringConverter.encodeHexString(bytes);
@@ -56,20 +56,22 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldDecodeHexStringToByteArrayUsingCharacterConversion() {
+ void shouldDecodeHexStringToByteArrayUsingCharacterConversion() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
byte[] output = hexStringConverter.decodeHexString(hexString);
assertArrayEquals(bytes, output);
}
- @Test(expected=IllegalArgumentException.class)
- public void shouldDecodeHexToByteWithInvalidHexCharacter() {
- hexStringConverter.hexToByte("fg");
+ @Test
+ void shouldDecodeHexToByteWithInvalidHexCharacter() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ hexStringConverter.hexToByte("fg");
+ });
}
@Test
- public void shouldEncodeByteArrayToHexStringDataTypeConverter() {
+ void shouldEncodeByteArrayToHexStringDataTypeConverter() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
String output = hexStringConverter.encodeUsingDataTypeConverter(bytes);
@@ -77,7 +79,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldDecodeHexStringToByteArrayUsingDataTypeConverter() {
+ void shouldDecodeHexStringToByteArrayUsingDataTypeConverter() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
byte[] output = hexStringConverter.decodeUsingDataTypeConverter(hexString);
@@ -85,7 +87,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldEncodeByteArrayToHexStringUsingGuava() {
+ void shouldEncodeByteArrayToHexStringUsingGuava() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
String output = hexStringConverter.encodeUsingGuava(bytes);
@@ -93,7 +95,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldDecodeHexStringToByteArrayUsingGuava() {
+ void shouldDecodeHexStringToByteArrayUsingGuava() {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
byte[] output = hexStringConverter.decodeUsingGuava(hexString);
@@ -101,7 +103,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldEncodeByteArrayToHexStringUsingApacheCommons() throws DecoderException {
+ void shouldEncodeByteArrayToHexStringUsingApacheCommons() throws DecoderException {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
String output = hexStringConverter.encodeUsingApacheCommons(bytes);
@@ -109,7 +111,7 @@ public class ByteArrayConverterUnitTest {
}
@Test
- public void shouldDecodeHexStringToByteArrayUsingApacheCommons() throws DecoderException {
+ void shouldDecodeHexStringToByteArrayUsingApacheCommons() throws DecoderException {
byte[] bytes = getSampleBytes();
String hexString = getSampleHexString();
byte[] output = hexStringConverter.decodeUsingApacheCommons(hexString);
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java
index bcea4ebba8..b37ef5af7d 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/integerstreammedian/MedianOfIntegerStreamUnitTest.java
@@ -1,16 +1,18 @@
package com.baeldung.algorithms.integerstreammedian;
-import org.junit.Test;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.LinkedHashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
-public class MedianOfIntegerStreamUnitTest {
+class MedianOfIntegerStreamUnitTest {
@Test
- public void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach1() {
+ void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach1() {
MedianOfIntegerStream mis = new MedianOfIntegerStream();
for (Map.Entry e : testcaseFixture().entrySet()) {
mis.add(e.getKey());
@@ -19,7 +21,7 @@ public class MedianOfIntegerStreamUnitTest {
}
@Test
- public void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach2() {
+ void givenStreamOfIntegers_whenAnElementIsRead_thenMedianChangesWithApproach2() {
MedianOfIntegerStream2 mis = new MedianOfIntegerStream2();
for (Map.Entry e : testcaseFixture().entrySet()) {
mis.add(e.getKey());
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java
index b168e6b1eb..f6d802f50b 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java
@@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-public class KnapsackUnitTest {
+class KnapsackUnitTest {
@Test
- public void givenWeightsandValues_whenCalculateMax_thenOutputCorrectResult() {
+ void givenWeightsandValues_whenCalculateMax_thenOutputCorrectResult() {
final int[] w = new int[] { 23, 26, 20, 18, 32, 27, 29, 26, 30, 27 };
final int[] v = new int[] { 505, 352, 458, 220, 354, 414, 498, 545, 473, 543 };
final int n = 10;
@@ -19,7 +19,7 @@ public class KnapsackUnitTest {
}
@Test
- public void givenZeroItems_whenCalculateMax_thenOutputZero() {
+ void givenZeroItems_whenCalculateMax_thenOutputZero() {
final int[] w = new int[] {};
final int[] v = new int[] {};
final int n = 0;
@@ -31,7 +31,7 @@ public class KnapsackUnitTest {
}
@Test
- public void givenZeroWeightLimit_whenCalculateMax_thenOutputZero() {
+ void givenZeroWeightLimit_whenCalculateMax_thenOutputZero() {
final int[] w = new int[] { 23, 26, 20, 18, 32, 27, 29, 26, 30, 27 };
final int[] v = new int[] { 505, 352, 458, 220, 354, 414, 498, 545, 473, 543 };
final int n = 10;
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java
index 76eeb7b116..ca6824fd15 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/mergesortedarrays/SortedArraysUnitTest.java
@@ -5,10 +5,10 @@ import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.mergesortedarrays.SortedArrays;
-public class SortedArraysUnitTest {
+class SortedArraysUnitTest {
@Test
- public void givenTwoSortedArrays_whenMerged_thenReturnMergedSortedArray() {
+ void givenTwoSortedArrays_whenMerged_thenReturnMergedSortedArray() {
int[] foo = { 3, 7 };
int[] bar = { 4, 8, 11 };
@@ -18,7 +18,7 @@ public class SortedArraysUnitTest {
}
@Test
- public void givenTwoSortedArraysWithDuplicates_whenMerged_thenReturnMergedSortedArray() {
+ void givenTwoSortedArraysWithDuplicates_whenMerged_thenReturnMergedSortedArray() {
int[] foo = { 3, 3, 7 };
int[] bar = { 4, 8, 8, 11 };
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java
index fac3b3a81f..a5eb6f4d89 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java
@@ -1,14 +1,15 @@
package com.baeldung.algorithms.prim;
-import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-public class PrimUnitTest {
+import org.junit.jupiter.api.Test;
+
+class PrimUnitTest {
@Test
- public void givenAGraph_whenPrimRuns_thenPrintMST() {
+ void givenAGraph_whenPrimRuns_thenPrintMST() {
Prim prim = new Prim(createGraph());
System.out.println(prim.originalGraphToString());
System.out.println("----------------");
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java
index 84bb2620af..8218649e98 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/relativelyprime/RelativelyPrimeUnitTest.java
@@ -1,49 +1,49 @@
package com.baeldung.algorithms.relativelyprime;
-import org.junit.Test;
-
import static com.baeldung.algorithms.relativelyprime.RelativelyPrime.*;
import static org.assertj.core.api.Assertions.assertThat;
-public class RelativelyPrimeUnitTest {
+import org.junit.jupiter.api.Test;
+
+class RelativelyPrimeUnitTest {
@Test
- public void givenNonRelativelyPrimeNumbers_whenCheckingIteratively_shouldReturnFalse() {
+ void givenNonRelativelyPrimeNumbers_whenCheckingIteratively_shouldReturnFalse() {
boolean result = iterativeRelativelyPrime(45, 35);
assertThat(result).isFalse();
}
@Test
- public void givenRelativelyPrimeNumbers_whenCheckingIteratively_shouldReturnTrue() {
+ void givenRelativelyPrimeNumbers_whenCheckingIteratively_shouldReturnTrue() {
boolean result = iterativeRelativelyPrime(500, 501);
assertThat(result).isTrue();
}
@Test
- public void givenNonRelativelyPrimeNumbers_whenCheckingRecursively_shouldReturnFalse() {
+ void givenNonRelativelyPrimeNumbers_whenCheckingRecursively_shouldReturnFalse() {
boolean result = recursiveRelativelyPrime(45, 35);
assertThat(result).isFalse();
}
@Test
- public void givenRelativelyPrimeNumbers_whenCheckingRecursively_shouldReturnTrue() {
+ void givenRelativelyPrimeNumbers_whenCheckingRecursively_shouldReturnTrue() {
boolean result = recursiveRelativelyPrime(500, 501);
assertThat(result).isTrue();
}
@Test
- public void givenNonRelativelyPrimeNumbers_whenCheckingUsingBigIntegers_shouldReturnFalse() {
+ void givenNonRelativelyPrimeNumbers_whenCheckingUsingBigIntegers_shouldReturnFalse() {
boolean result = bigIntegerRelativelyPrime(45, 35);
assertThat(result).isFalse();
}
@Test
- public void givenRelativelyPrimeNumbers_whenCheckingBigIntegers_shouldReturnTrue() {
+ void givenRelativelyPrimeNumbers_whenCheckingBigIntegers_shouldReturnTrue() {
boolean result = bigIntegerRelativelyPrime(500, 501);
assertThat(result).isTrue();
diff --git a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java
index 44fac57361..2366a897c6 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/reversingtree/TreeReverserUnitTest.java
@@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
-public class TreeReverserUnitTest {
+class TreeReverserUnitTest {
@Test
- public void givenTreeWhenReversingRecursivelyThenReversed() {
+ void givenTreeWhenReversingRecursivelyThenReversed() {
TreeReverser reverser = new TreeReverser();
TreeNode treeNode = createBinaryTree();
@@ -19,7 +19,7 @@ public class TreeReverserUnitTest {
}
@Test
- public void givenTreeWhenReversingIterativelyThenReversed() {
+ void givenTreeWhenReversingIterativelyThenReversed() {
TreeReverser reverser = new TreeReverser();
TreeNode treeNode = createBinaryTree();
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java
index 4c0a56dabc..b7a6a6470e 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingDequeUnitTest.java
@@ -1,80 +1,81 @@
package com.baeldung.algorithms.balancedbrackets;
-import org.junit.Before;
-import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
-public class BalancedBracketsUsingDequeUnitTest {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class BalancedBracketsUsingDequeUnitTest {
private BalancedBracketsUsingDeque balancedBracketsUsingDeque;
- @Before
+ @BeforeEach
public void setup() {
balancedBracketsUsingDeque = new BalancedBracketsUsingDeque();
}
@Test
- public void givenNullInput_whenCheckingForBalance_shouldReturnFalse() {
+ void givenNullInput_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced(null);
assertThat(result).isFalse();
}
@Test
- public void givenEmptyString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenEmptyString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingDeque.isBalanced("");
assertThat(result).isTrue();
}
@Test
- public void givenInvalidCharacterString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenInvalidCharacterString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced("abc[](){}");
assertThat(result).isFalse();
}
@Test
- public void givenOddLengthString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenOddLengthString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced("{{[]()}}}");
assertThat(result).isFalse();
}
@Test
- public void givenEvenLengthString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenEvenLengthString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced("{{[]()}}}}");
assertThat(result).isFalse();
}
@Test
- public void givenEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced("{[(])}");
assertThat(result).isFalse();
}
@Test
- public void givenAnotherEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenAnotherEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced("{{}(");
assertThat(result).isFalse();
}
@Test
- public void givenEvenLengthBalancedString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenEvenLengthBalancedString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingDeque.isBalanced("{[()]}");
assertThat(result).isTrue();
}
@Test
- public void givenBalancedString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenBalancedString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingDeque.isBalanced("{{[[(())]]}}");
assertThat(result).isTrue();
}
@Test
- public void givenAnotherBalancedString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenAnotherBalancedString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingDeque.isBalanced("{{([])}}");
assertThat(result).isTrue();
}
@Test
- public void givenUnBalancedString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenUnBalancedString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingDeque.isBalanced("{{)[](}}");
assertThat(result).isFalse();
}
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java
index bda85a75ce..71bd91c39a 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/balancedbrackets/BalancedBracketsUsingStringUnitTest.java
@@ -1,80 +1,81 @@
package com.baeldung.algorithms.balancedbrackets;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-public class BalancedBracketsUsingStringUnitTest {
+class BalancedBracketsUsingStringUnitTest {
private BalancedBracketsUsingString balancedBracketsUsingString;
- @Before
+ @BeforeEach
public void setup() {
balancedBracketsUsingString = new BalancedBracketsUsingString();
}
@Test
- public void givenNullInput_whenCheckingForBalance_shouldReturnFalse() {
+ void givenNullInput_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced(null);
assertThat(result).isFalse();
}
@Test
- public void givenEmptyString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenEmptyString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingString.isBalanced("");
assertThat(result).isTrue();
}
@Test
- public void givenInvalidCharacterString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenInvalidCharacterString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced("abc[](){}");
assertThat(result).isFalse();
}
@Test
- public void givenOddLengthString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenOddLengthString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced("{{[]()}}}");
assertThat(result).isFalse();
}
@Test
- public void givenEvenLengthString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenEvenLengthString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced("{{[]()}}}}");
assertThat(result).isFalse();
}
@Test
- public void givenEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced("{[(])}");
assertThat(result).isFalse();
}
@Test
- public void givenAnotherEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenAnotherEvenLengthUnbalancedString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced("{{}(");
assertThat(result).isFalse();
}
@Test
- public void givenEvenLengthBalancedString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenEvenLengthBalancedString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingString.isBalanced("{[()]}");
assertThat(result).isTrue();
}
@Test
- public void givenBalancedString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenBalancedString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingString.isBalanced("{{[[(())]]}}");
assertThat(result).isTrue();
}
@Test
- public void givenAnotherBalancedString_whenCheckingForBalance_shouldReturnTrue() {
+ void givenAnotherBalancedString_whenCheckingForBalance_shouldReturnTrue() {
boolean result = balancedBracketsUsingString.isBalanced("{{([])}}");
assertThat(result).isTrue();
}
@Test
- public void givenUnBalancedString_whenCheckingForBalance_shouldReturnFalse() {
+ void givenUnBalancedString_whenCheckingForBalance_shouldReturnFalse() {
boolean result = balancedBracketsUsingString.isBalanced("{{)[](}}");
assertThat(result).isFalse();
}
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java
index e61e1e668d..7261dfffc6 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/boruvka/BoruvkaUnitTest.java
@@ -2,17 +2,17 @@ package com.baeldung.algorithms.boruvka;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.google.common.graph.MutableValueGraph;
import com.google.common.graph.ValueGraphBuilder;
-public class BoruvkaUnitTest {
+class BoruvkaUnitTest {
private MutableValueGraph graph;
- @Before
+ @BeforeEach
public void setup() {
graph = ValueGraphBuilder.undirected()
.build();
@@ -26,7 +26,7 @@ public class BoruvkaUnitTest {
}
@Test
- public void givenInputGraph_whenBoruvkaPerformed_thenMinimumSpanningTree() {
+ void givenInputGraph_whenBoruvkaPerformed_thenMinimumSpanningTree() {
BoruvkaMST boruvkaMST = new BoruvkaMST(graph);
MutableValueGraph mst = boruvkaMST.getMST();
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java
index 34d3e188f2..d7aa952037 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/gradientdescent/GradientDescentUnitTest.java
@@ -1,15 +1,15 @@
package com.baeldung.algorithms.gradientdescent;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.function.Function;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class GradientDescentUnitTest {
+class GradientDescentUnitTest {
@Test
- public void givenFunction_whenStartingPointIsOne_thenLocalMinimumIsFound() {
+ void givenFunction_whenStartingPointIsOne_thenLocalMinimumIsFound() {
Function df = x ->
StrictMath.abs(StrictMath.pow(x, 3)) - (3 * StrictMath.pow(x, 2)) + x;
GradientDescent gd = new GradientDescent();
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java
index a503b006de..ea90ea14c1 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java
@@ -1,13 +1,14 @@
package com.baeldung.algorithms.greedy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
import java.util.Arrays;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-public class GreedyAlgorithmUnitTest {
+
+class GreedyAlgorithmUnitTest {
private SocialConnector prepareNetwork() {
SocialConnector sc = new SocialConnector();
@@ -35,21 +36,21 @@ public class GreedyAlgorithmUnitTest {
}
@Test
- public void greedyAlgorithmTest() {
+ void greedyAlgorithmTest() {
GreedyAlgorithm ga = new GreedyAlgorithm(prepareNetwork());
assertEquals(ga.findMostFollowersPath("root"), 5);
}
@Test
- public void nongreedyAlgorithmTest() {
+ void nongreedyAlgorithmTest() {
NonGreedyAlgorithm nga = new NonGreedyAlgorithm(prepareNetwork(), 0);
- Assertions.assertThrows(IllegalStateException.class, () -> {
+ assertThrows(IllegalStateException.class, () -> {
nga.findMostFollowersPath("root");
});
}
@Test
- public void nongreedyAlgorithmUnboundedTest() {
+ void nongreedyAlgorithmUnboundedTest() {
SocialConnector sc = prepareNetwork();
sc.switchCounter();
NonGreedyAlgorithm nga = new NonGreedyAlgorithm(sc, 0);
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
index a7206c6cd0..9367942dc6 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/kruskal/KruskalUnitTest.java
@@ -1,21 +1,23 @@
package com.baeldung.algorithms.kruskal;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import com.google.common.graph.MutableValueGraph;
import com.google.common.graph.ValueGraph;
import com.google.common.graph.ValueGraphBuilder;
import com.baeldung.algorithms.kruskal.Kruskal;
-public class KruskalUnitTest {
+class KruskalUnitTest {
private MutableValueGraph graph;
- @Before
+ @BeforeEach
public void setup() {
graph = ValueGraphBuilder.undirected().build();
graph.putEdgeValue(0, 1, 8.0);
@@ -28,7 +30,7 @@ public class KruskalUnitTest {
}
@Test
- public void givenGraph_whenMinimumSpanningTree_thenOutputCorrectResult() {
+ void givenGraph_whenMinimumSpanningTree_thenOutputCorrectResult() {
final Kruskal kruskal = new Kruskal();
ValueGraph spanningTree = kruskal.minSpanningTree(graph);
@@ -47,7 +49,7 @@ public class KruskalUnitTest {
}
@Test
- public void givenGraph_whenMaximumSpanningTree_thenOutputCorrectResult() {
+ void givenGraph_whenMaximumSpanningTree_thenOutputCorrectResult() {
final Kruskal kruskal = new Kruskal();
ValueGraph spanningTree = kruskal.maxSpanningTree(graph);
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java
index 0940677959..0d222c0841 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/linkedlist/LinkedListReversalUnitTest.java
@@ -1,13 +1,13 @@
package com.baeldung.algorithms.linkedlist;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
-public class LinkedListReversalUnitTest {
+class LinkedListReversalUnitTest {
@Test
- public void givenLinkedList_whenIterativeReverse_thenOutputCorrectResult() {
+ void givenLinkedList_whenIterativeReverse_thenOutputCorrectResult() {
ListNode head = constructLinkedList();
ListNode node = head;
for (int i = 1; i <= 5; i++) {
@@ -25,7 +25,7 @@ public class LinkedListReversalUnitTest {
}
@Test
- public void givenLinkedList_whenRecursiveReverse_thenOutputCorrectResult() {
+ void givenLinkedList_whenRecursiveReverse_thenOutputCorrectResult() {
ListNode head = constructLinkedList();
ListNode node = head;
for (int i = 1; i <= 5; i++) {
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java
index f84c860dcc..c5b78bbf48 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java
@@ -2,17 +2,17 @@ package com.baeldung.algorithms.minheapmerge;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MinHeapUnitTest {
+class MinHeapUnitTest {
private final int[][] inputArray = { { 0, 6 }, { 1, 5, 10, 100 }, { 2, 4, 200, 650 } };
private final int[] expectedArray = { 0, 1, 2, 4, 5, 6, 10, 100, 200, 650 };
@Test
- public void givenSortedArrays_whenMerged_thenShouldReturnASingleSortedarray() {
+ void givenSortedArrays_whenMerged_thenShouldReturnASingleSortedarray() {
int[] resultArray = MinHeap.merge(inputArray);
assertThat(resultArray.length, is(equalTo(10)));
diff --git a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java
index 41fa5e067e..d979d1c856 100644
--- a/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-6/src/test/java/com/baeldung/algorithms/topkelements/TopKElementsFinderUnitTest.java
@@ -1,13 +1,13 @@
package com.baeldung.algorithms.topkelements;
-import org.junit.Test;
-
import java.util.Arrays;
import java.util.List;
import static org.assertj.core.api.Java6Assertions.assertThat;
-public class TopKElementsFinderUnitTest {
+import org.junit.jupiter.api.Test;
+
+class TopKElementsFinderUnitTest {
private final TopKElementsFinder bruteForceFinder = new BruteForceTopKElementsFinder();
private final TopKElementsFinder maxHeapFinder = new MaxHeapTopKElementsFinder();
private final TopKElementsFinder treeSetFinder = new TreeSetTopKElementsFinder();
@@ -20,27 +20,27 @@ public class TopKElementsFinderUnitTest {
@Test
- public void givenArrayDistinctIntegers_whenBruteForceFindTopK_thenReturnKLargest() {
+ void givenArrayDistinctIntegers_whenBruteForceFindTopK_thenReturnKLargest() {
assertThat(bruteForceFinder.findTopK(distinctIntegers, k)).containsOnlyElementsOf(distinctIntegersTopK);
}
@Test
- public void givenArrayDistinctIntegers_whenMaxHeapFindTopK_thenReturnKLargest() {
+ void givenArrayDistinctIntegers_whenMaxHeapFindTopK_thenReturnKLargest() {
assertThat(maxHeapFinder.findTopK(distinctIntegers, k)).containsOnlyElementsOf(distinctIntegersTopK);
}
@Test
- public void givenArrayDistinctIntegers_whenTreeSetFindTopK_thenReturnKLargest() {
+ void givenArrayDistinctIntegers_whenTreeSetFindTopK_thenReturnKLargest() {
assertThat(treeSetFinder.findTopK(distinctIntegers, k)).containsOnlyElementsOf(distinctIntegersTopK);
}
@Test
- public void givenArrayNonDistinctIntegers_whenBruteForceFindTopK_thenReturnKLargest() {
+ void givenArrayNonDistinctIntegers_whenBruteForceFindTopK_thenReturnKLargest() {
assertThat(bruteForceFinder.findTopK(nonDistinctIntegers, k)).containsOnlyElementsOf(nonDistinctIntegersTopK);
}
@Test
- public void givenArrayNonDistinctIntegers_whenMaxHeapFindTopK_thenReturnKLargest() {
+ void givenArrayNonDistinctIntegers_whenMaxHeapFindTopK_thenReturnKLargest() {
assertThat(maxHeapFinder.findTopK(nonDistinctIntegers, k)).containsOnlyElementsOf(nonDistinctIntegersTopK);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/README.md b/algorithms-modules/algorithms-miscellaneous-7/README.md
index 918fcd21dd..ab07d655f9 100644
--- a/algorithms-modules/algorithms-miscellaneous-7/README.md
+++ b/algorithms-modules/algorithms-miscellaneous-7/README.md
@@ -1,4 +1,6 @@
### Relevant Articles:
- [Algorithm to Identify and Validate a Credit Card Number](https://www.baeldung.com/java-validate-cc-number)
+- [Find the N Most Frequent Elements in a Java Array](https://www.baeldung.com/java-n-most-frequent-elements-array)
+- [Getting Pixel Array From Image in Java](https://www.baeldung.com/java-getting-pixel-array-from-image)
- More articles: [[<-- prev]](/algorithms-miscellaneous-6)
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsFinder.java b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsFinder.java
new file mode 100644
index 0000000000..0d78691bcc
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsFinder.java
@@ -0,0 +1,93 @@
+package com.baeldung.algorithms.frequentelements;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class MostFrequentElementsFinder {
+
+ public static List findByHashMapAndPriorityQueue(Integer[] array, int n) {
+ Map countMap = new HashMap<>();
+
+ // For each element i in the array, add it to the countMap and increment its count.
+ for (Integer i : array) {
+ countMap.put(i, countMap.getOrDefault(i, 0) + 1);
+ }
+
+ // Create a max heap (priority queue) that will prioritize elements with higher counts.
+ PriorityQueue heap = new PriorityQueue<>(
+ (a, b) -> countMap.get(b) - countMap.get(a));
+
+ // Add all the unique elements in the array to the heap.
+ heap.addAll(countMap.keySet());
+
+ List result = new ArrayList<>();
+ for (int i = 0; i < n && !heap.isEmpty(); i++) {
+ // Poll the highest-count element from the heap and add it to the result list.
+ result.add(heap.poll());
+ }
+
+ return result;
+ }
+
+ public static List findByStream(Integer[] arr, int n) {
+ return Arrays.stream(arr).collect(Collectors.groupingBy(i -> i, Collectors.counting()))
+ .entrySet().stream()
+ .sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+ .map(Map.Entry::getKey)
+ .limit(n)
+ .collect(Collectors.toList());
+ }
+
+ public static List findByTreeMap(Integer[] arr, int n) {
+ // Create a TreeMap and use a reverse order comparator to sort the entries by frequency in descending order
+ Map countMap = new TreeMap<>(Collections.reverseOrder());
+
+ for (int i : arr) {
+ countMap.put(i, countMap.getOrDefault(i, 0) + 1);
+ }
+
+ // Create a list of the map entries and sort them by value (i.e. by frequency) in descending order
+ List> sortedEntries = new ArrayList<>(countMap.entrySet());
+ sortedEntries.sort((e1, e2) -> e2.getValue().compareTo(e1.getValue()));
+
+ // Extract the n most frequent elements from the sorted list of entries
+ List result = new ArrayList<>();
+ for (int i = 0; i < n && i < sortedEntries.size(); i++) {
+ result.add(sortedEntries.get(i).getKey());
+ }
+
+ return result;
+ }
+
+ public static List findByBucketSort(Integer[] arr, int n) {
+ List result = new ArrayList<>();
+ Map freqMap = new HashMap<>();
+ List[] bucket = new List[arr.length + 1];
+
+ // Loop through the input array and update the frequency count of each element in the HashMap
+ for (int num : arr) {
+ freqMap.put(num, freqMap.getOrDefault(num, 0) + 1);
+ }
+
+ // Loop through the HashMap and add each element to its corresponding bucket based on its frequency count
+ for (int num : freqMap.keySet()) {
+ int freq = freqMap.get(num);
+ if (bucket[freq] == null) {
+ bucket[freq] = new ArrayList<>();
+ }
+ bucket[freq].add(num);
+ }
+
+ // Loop through the bucket array in reverse order and add the elements to the result list
+ // until we have found the n most frequent elements
+ for (int i = bucket.length - 1; i >= 0 && result.size() < n; i--) {
+ if (bucket[i] != null) {
+ result.addAll(bucket[i]);
+ }
+ }
+
+ // Return a sublist of the result list containing only the first n elements
+ return result.subList(0, n);
+ }
+
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/pixelarray/GetPixelArray.java b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/pixelarray/GetPixelArray.java
new file mode 100644
index 0000000000..ba7fe44808
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/pixelarray/GetPixelArray.java
@@ -0,0 +1,65 @@
+package com.baeldung.algorithms.pixelarray;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferByte;
+public class GetPixelArray {
+
+ public static int[][] get2DPixelArraySlow(BufferedImage sampleImage) {
+ int width = sampleImage.getWidth();
+ int height = sampleImage.getHeight();
+ int[][] result = new int[height][width];
+
+ for (int row = 0; row < height; row++) {
+ for (int col = 0; col < width; col++) {
+ result[row][col] = sampleImage.getRGB(col, row);
+ }
+ }
+
+ return result;
+ }
+
+ public static int[][] get2DPixelArrayFast(BufferedImage image) {
+ final byte[] pixelData = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+ final int width = image.getWidth();
+ final int height = image.getHeight();
+ final boolean hasAlphaChannel = image.getAlphaRaster() != null;
+
+ int[][] result = new int[height][width];
+ if (hasAlphaChannel) {
+ final int numberOfValues = 4;
+ for (int valueIndex = 0, row = 0, col = 0; valueIndex + numberOfValues - 1 < pixelData.length; valueIndex += numberOfValues) {
+ // Getting the values for each pixel from the pixelData array.
+ int argb = 0;
+ argb += (((int) pixelData[valueIndex] & 0xff) << 24); // alpha value
+ argb += ((int) pixelData[valueIndex + 1] & 0xff); // blue value
+ argb += (((int) pixelData[valueIndex + 2] & 0xff) << 8); // green value
+ argb += (((int) pixelData[valueIndex + 3] & 0xff) << 16); // red value
+ result[row][col] = argb;
+
+ col++;
+ if (col == width) {
+ col = 0;
+ row++;
+ }
+ }
+ } else {
+ final int numberOfValues = 3;
+ for (int valueIndex = 0, row = 0, col = 0; valueIndex + numberOfValues - 1 < pixelData.length; valueIndex += numberOfValues) {
+ int argb = 0;
+ argb += -16777216; // 255 alpha value (fully opaque)
+ argb += ((int) pixelData[valueIndex] & 0xff); // blue value
+ argb += (((int) pixelData[valueIndex + 1] & 0xff) << 8); // green value
+ argb += (((int) pixelData[valueIndex + 2] & 0xff) << 16); // red value
+ result[row][col] = argb;
+
+ col++;
+ if (col == width) {
+ col = 0;
+ row++;
+ }
+ }
+ }
+
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsUnitTest.java b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsUnitTest.java
new file mode 100644
index 0000000000..9fa4862163
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.algorithms.frequentelements;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class MostFrequentElementsUnitTest {
+
+ private final Integer[] inputArray = {1, 2, 3, 4, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 9, 9, 9, 9, 9};
+ private final int n = 3;
+ private final Integer[] outputArray = {9, 7, 5};
+
+ @Test
+ void givenIntegersArray_UseFindByHashMapAndPriorityQueueMethod_thenReturnMostFrequentElements() {
+ assertThat(MostFrequentElementsFinder.findByHashMapAndPriorityQueue(inputArray, n)).containsExactly(outputArray);
+ }
+
+ @Test
+ void givenIntegersArray_UseFindByBucketSortMethod_thenReturnMostFrequentElements() {
+ assertThat(MostFrequentElementsFinder.findByBucketSort(inputArray, n)).containsExactly(outputArray);
+ }
+
+ @Test
+ void givenIntegersArray_UseFindByStreamMethod_thenReturnMostFrequentElements() {
+ assertThat(MostFrequentElementsFinder.findByStream(inputArray, n)).containsExactly(outputArray);
+ }
+
+ @Test
+ void givenIntegersArray_UseFindByTreeMapMethod_thenReturnMostFrequentElements() {
+ assertThat(MostFrequentElementsFinder.findByTreeMap(inputArray, n)).containsExactly(outputArray);
+ }
+
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/luhn/LuhnCheckerUnitTest.java b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/luhn/LuhnCheckerUnitTest.java
index dd1b184b81..9f7c93c1b3 100644
--- a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/luhn/LuhnCheckerUnitTest.java
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/luhn/LuhnCheckerUnitTest.java
@@ -1,63 +1,66 @@
package com.baeldung.algorithms.luhn;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-public class LuhnCheckerUnitTest {
+import org.junit.jupiter.api.Test;
+
+class LuhnCheckerUnitTest {
@Test
- public void whenCardNumberDoesMeetLuhnCriteria_thenCheckLuhnReturnsTrue() {
+ void whenCardNumberDoesMeetLuhnCriteria_thenCheckLuhnReturnsTrue() {
String cardNumber = "8649";
boolean result = LuhnChecker.checkLuhn(cardNumber);
- Assert.assertTrue(result);
+ assertTrue(result);
}
@Test
- public void whenCardNumberDoesNotMeetLuhnCriteria_thenCheckLuhnReturnsFalse() {
+ void whenCardNumberDoesNotMeetLuhnCriteria_thenCheckLuhnReturnsFalse() {
String cardNumber = "8642";
boolean result = LuhnChecker.checkLuhn(cardNumber);
- Assert.assertFalse(result);
+ assertFalse(result);
}
@Test
- public void whenCardNumberHasNoSecondDigits_thenCheckLuhnCalculatesCorrectly() {
+ void whenCardNumberHasNoSecondDigits_thenCheckLuhnCalculatesCorrectly() {
String cardNumber = "0505050505050505";
boolean result = LuhnChecker.checkLuhn(cardNumber);
- Assert.assertTrue(result);
+ assertTrue(result);
}
@Test
- public void whenCardNumberHasSecondDigits_thenCheckLuhnCalculatesCorrectly() {
+ void whenCardNumberHasSecondDigits_thenCheckLuhnCalculatesCorrectly() {
String cardNumber = "75757575757575";
boolean result = LuhnChecker.checkLuhn(cardNumber);
- Assert.assertTrue(result);
+ assertTrue(result);
}
@Test
- public void whenDoubleAndSumDigitsIsCalled_thenOutputIsCorrect() {
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(0), 0);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(1), 2);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(2), 4);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(3), 6);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(4), 8);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(5), 1);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(6), 3);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(7), 5);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(8), 7);
- Assert.assertEquals(LuhnChecker.doubleAndSumDigits(9), 9);
+ void whenDoubleAndSumDigitsIsCalled_thenOutputIsCorrect() {
+ assertEquals(0,LuhnChecker.doubleAndSumDigits(0));
+ assertEquals(2,LuhnChecker.doubleAndSumDigits(1));
+ assertEquals(4, LuhnChecker.doubleAndSumDigits(2));
+ assertEquals(6, LuhnChecker.doubleAndSumDigits(3));
+ assertEquals(8, LuhnChecker.doubleAndSumDigits(4));
+ assertEquals(1, LuhnChecker.doubleAndSumDigits(5));
+ assertEquals(3, LuhnChecker.doubleAndSumDigits(6));
+ assertEquals(5, LuhnChecker.doubleAndSumDigits(7));
+ assertEquals(7, LuhnChecker.doubleAndSumDigits(8));
+ assertEquals(9, LuhnChecker.doubleAndSumDigits(9));
}
@Test
- public void whenCardNumberNonNumeric_thenCheckLuhnReturnsFalse() {
+ void whenCardNumberNonNumeric_thenCheckLuhnReturnsFalse() {
String cardNumber = "test";
boolean result = LuhnChecker.checkLuhn(cardNumber);
- Assert.assertFalse(result);
+ assertFalse(result);
}
@Test
- public void whenCardNumberIsNull_thenCheckLuhnReturnsFalse() {
+ void whenCardNumberIsNull_thenCheckLuhnReturnsFalse() {
String cardNumber = null;
boolean result = LuhnChecker.checkLuhn(cardNumber);
- Assert.assertFalse(result);
+ assertFalse(result);
}
}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/pixelarray/GetPixelArrayUnitTest.java b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/pixelarray/GetPixelArrayUnitTest.java
new file mode 100644
index 0000000000..b7bbb462dd
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/pixelarray/GetPixelArrayUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.algorithms.pixelarray;
+
+import static com.baeldung.algorithms.pixelarray.GetPixelArray.get2DPixelArrayFast;
+import static com.baeldung.algorithms.pixelarray.GetPixelArray.get2DPixelArraySlow;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class GetPixelArrayUnitTest {
+ @Test
+ public void givenImage_whenGetPixelArray_thenBothMethodsReturnEqualValues() {
+ BufferedImage sampleImage = null;
+ try {
+ sampleImage = ImageIO.read(new File("src/main/resources/images/sampleImage.jpg"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ int[][] firstResult = get2DPixelArraySlow(sampleImage);
+ int[][] secondResult = get2DPixelArrayFast(sampleImage);
+
+ assertTrue(Arrays.deepEquals(firstResult, secondResult));
+ }
+}
diff --git a/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java
index 4623dbb7a4..49cf3fe2bd 100644
--- a/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java
+++ b/algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java
@@ -23,7 +23,7 @@ public class Graph {
adjVertices.get(src).add(dest);
}
- public void dfsWithoutRecursion(int start) {
+ public boolean[] dfsWithoutRecursion(int start) {
Stack stack = new Stack();
boolean[] isVisited = new boolean[adjVertices.size()];
stack.push(start);
@@ -38,20 +38,22 @@ public class Graph {
}
}
}
+ return isVisited;
}
- public void dfs(int start) {
+ public boolean[] dfs(int start) {
boolean[] isVisited = new boolean[adjVertices.size()];
- dfsRecursive(start, isVisited);
+ return dfsRecursive(start, isVisited);
}
- private void dfsRecursive(int current, boolean[] isVisited) {
+ private boolean[] dfsRecursive(int current, boolean[] isVisited) {
isVisited[current] = true;
visit(current);
for (int dest : adjVertices.get(current)) {
if (!isVisited[dest])
dfsRecursive(dest, isVisited);
}
+ return isVisited;
}
public List topologicalSort(int start) {
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java
index eb3fb4f718..8a4dbb2141 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/binarysearch/BinarySearchUnitTest.java
@@ -1,11 +1,13 @@
package com.baeldung.algorithms.binarysearch;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
-public class BinarySearchUnitTest {
+import org.junit.jupiter.api.Test;
+
+class BinarySearchUnitTest {
int[] sortedArray = { 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9 };
int key = 6;
@@ -15,27 +17,27 @@ public class BinarySearchUnitTest {
List sortedList = Arrays.asList(0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9);
@Test
- public void givenASortedArrayOfIntegers_whenBinarySearchRunIterativelyForANumber_thenGetIndexOfTheNumber() {
+ void givenASortedArrayOfIntegers_whenBinarySearchRunIterativelyForANumber_thenGetIndexOfTheNumber() {
BinarySearch binSearch = new BinarySearch();
- Assert.assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchIteratively(sortedArray, key, low, high));
+ assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchIteratively(sortedArray, key, low, high));
}
@Test
- public void givenASortedArrayOfIntegers_whenBinarySearchRunRecursivelyForANumber_thenGetIndexOfTheNumber() {
+ void givenASortedArrayOfIntegers_whenBinarySearchRunRecursivelyForANumber_thenGetIndexOfTheNumber() {
BinarySearch binSearch = new BinarySearch();
- Assert.assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchRecursively(sortedArray, key, low, high));
+ assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchRecursively(sortedArray, key, low, high));
}
@Test
- public void givenASortedArrayOfIntegers_whenBinarySearchRunUsingArraysClassStaticMethodForANumber_thenGetIndexOfTheNumber() {
+ void givenASortedArrayOfIntegers_whenBinarySearchRunUsingArraysClassStaticMethodForANumber_thenGetIndexOfTheNumber() {
BinarySearch binSearch = new BinarySearch();
- Assert.assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchUsingJavaArrays(sortedArray, key));
+ assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchUsingJavaArrays(sortedArray, key));
}
@Test
- public void givenASortedListOfIntegers_whenBinarySearchRunUsingCollectionsClassStaticMethodForANumber_thenGetIndexOfTheNumber() {
+ void givenASortedListOfIntegers_whenBinarySearchRunUsingCollectionsClassStaticMethodForANumber_thenGetIndexOfTheNumber() {
BinarySearch binSearch = new BinarySearch();
- Assert.assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchUsingJavaCollections(sortedList, key));
+ assertEquals(expectedIndexForSearchKey, binSearch.runBinarySearchUsingJavaCollections(sortedList, key));
}
}
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java
index f98b4377ed..dc83d8eac8 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/BinaryTreeUnitTest.java
@@ -1,15 +1,15 @@
package com.baeldung.algorithms.dfs;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
-public class BinaryTreeUnitTest {
+class BinaryTreeUnitTest {
@Test
- public void givenABinaryTree_WhenAddingElements_ThenTreeNotEmpty() {
+ void givenABinaryTree_WhenAddingElements_ThenTreeNotEmpty() {
BinaryTree bt = createBinaryTree();
@@ -17,7 +17,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenAddingElements_ThenTreeContainsThoseElements() {
+ void givenABinaryTree_WhenAddingElements_ThenTreeContainsThoseElements() {
BinaryTree bt = createBinaryTree();
@@ -28,7 +28,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenAddingExistingElement_ThenElementIsNotAdded() {
+ void givenABinaryTree_WhenAddingExistingElement_ThenElementIsNotAdded() {
BinaryTree bt = createBinaryTree();
@@ -40,7 +40,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenLookingForNonExistingElement_ThenReturnsFalse() {
+ void givenABinaryTree_WhenLookingForNonExistingElement_ThenReturnsFalse() {
BinaryTree bt = createBinaryTree();
@@ -48,7 +48,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenDeletingElements_ThenTreeDoesNotContainThoseElements() {
+ void givenABinaryTree_WhenDeletingElements_ThenTreeDoesNotContainThoseElements() {
BinaryTree bt = createBinaryTree();
@@ -58,7 +58,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenDeletingNonExistingElement_ThenTreeDoesNotDelete() {
+ void givenABinaryTree_WhenDeletingNonExistingElement_ThenTreeDoesNotDelete() {
BinaryTree bt = createBinaryTree();
@@ -71,7 +71,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void it_deletes_the_root() {
+ void it_deletes_the_root() {
int value = 12;
BinaryTree bt = new BinaryTree();
bt.add(value);
@@ -82,7 +82,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenTraversingInOrder_ThenPrintValues() {
+ void givenABinaryTree_WhenTraversingInOrder_ThenPrintValues() {
BinaryTree bt = createBinaryTree();
@@ -92,7 +92,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenTraversingPreOrder_ThenPrintValues() {
+ void givenABinaryTree_WhenTraversingPreOrder_ThenPrintValues() {
BinaryTree bt = createBinaryTree();
@@ -102,7 +102,7 @@ public class BinaryTreeUnitTest {
}
@Test
- public void givenABinaryTree_WhenTraversingPostOrder_ThenPrintValues() {
+ void givenABinaryTree_WhenTraversingPostOrder_ThenPrintValues() {
BinaryTree bt = createBinaryTree();
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java
index 7af25a85ca..2761062e91 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java
@@ -1,24 +1,31 @@
package com.baeldung.algorithms.dfs;
+import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
-public class GraphUnitTest {
+class GraphUnitTest {
@Test
- public void givenDirectedGraph_whenDFS_thenPrintAllValues() {
+ void givenDirectedGraph_whenDFS_thenPrintAllValues() {
Graph graph = createDirectedGraph();
- graph.dfs(0);
- System.out.println();
- graph.dfsWithoutRecursion(0);
+ boolean[] visited;
+ visited = graph.dfs(0);
+ boolean[] expected = new boolean[]{true, true, true, true, true, true};
+ Assert.assertArrayEquals(expected, visited);
+ visited = graph.dfsWithoutRecursion(0);
+ Assert.assertArrayEquals(expected, visited);
}
@Test
- public void givenDirectedGraph_whenGetTopologicalSort_thenPrintValuesSorted() {
+ void givenDirectedGraph_whenGetTopologicalSort_thenPrintValuesSorted() {
Graph graph = createDirectedGraph();
List list = graph.topologicalSort(0);
System.out.println(list);
+ List expected = Arrays.asList(0, 2, 1, 3, 4, 5);
+ Assert.assertEquals(expected, list);
}
private Graph createDirectedGraph() {
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java
index cabedcefad..c9e95b0cc9 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/interpolationsearch/InterpolationSearchUnitTest.java
@@ -1,27 +1,28 @@
package com.baeldung.algorithms.interpolationsearch;
-import org.junit.Before;
-import org.junit.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class InterpolationSearchUnitTest {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class InterpolationSearchUnitTest {
private int[] myData;
- @Before
+ @BeforeEach
public void setUp() {
myData = new int[]{13,21,34,55,69,73,84,101};
}
@Test
- public void givenSortedArray_whenLookingFor84_thenReturn6() {
+ void givenSortedArray_whenLookingFor84_thenReturn6() {
int pos = InterpolationSearch.interpolationSearch(myData, 84);
assertEquals(6, pos);
}
@Test
- public void givenSortedArray_whenLookingFor19_thenReturnMinusOne() {
+ void givenSortedArray_whenLookingFor19_thenReturnMinusOne() {
int pos = InterpolationSearch.interpolationSearch(myData, 19);
assertEquals(-1, pos);
}
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java
index 740e89d8e7..1349be59c0 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/kthsmallest/KthSmallestUnitTest.java
@@ -9,13 +9,13 @@ import java.util.*;
import static com.baeldung.algorithms.kthsmallest.KthSmallest.*;
import static org.junit.jupiter.api.Assertions.*;
-public class KthSmallestUnitTest {
+class KthSmallestUnitTest {
@Nested
class Exceptions {
@Test
- public void when_at_least_one_list_is_null_then_an_exception_is_thrown() {
+ void when_at_least_one_list_is_null_then_an_exception_is_thrown() {
Executable executable1 = () -> findKthSmallestElement(1, null, null);
Executable executable2 = () -> findKthSmallestElement(1, new int[]{2}, null);
@@ -27,7 +27,7 @@ public class KthSmallestUnitTest {
}
@Test
- public void when_at_least_one_list_is_empty_then_an_exception_is_thrown() {
+ void when_at_least_one_list_is_empty_then_an_exception_is_thrown() {
Executable executable1 = () -> findKthSmallestElement(1, new int[]{}, new int[]{2});
Executable executable2 = () -> findKthSmallestElement(1, new int[]{2}, new int[]{});
@@ -39,19 +39,19 @@ public class KthSmallestUnitTest {
}
@Test
- public void when_k_is_smaller_than_0_then_an_exception_is_thrown() {
+ void when_k_is_smaller_than_0_then_an_exception_is_thrown() {
Executable executable1 = () -> findKthSmallestElement(-1, new int[]{2}, new int[]{2});
assertThrows(IllegalArgumentException.class, executable1);
}
@Test
- public void when_k_is_smaller_than_1_then_an_exception_is_thrown() {
+ void when_k_is_smaller_than_1_then_an_exception_is_thrown() {
Executable executable1 = () -> findKthSmallestElement(0, new int[]{2}, new int[]{2});
assertThrows(IllegalArgumentException.class, executable1);
}
@Test
- public void when_k_bigger_then_the_two_lists_then_an_exception_is_thrown() {
+ void when_k_bigger_then_the_two_lists_then_an_exception_is_thrown() {
Executable executable1 = () -> findKthSmallestElement(6, new int[]{1, 5, 6}, new int[]{2, 5});
assertThrows(NoSuchElementException.class, executable1);
}
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java
index 59afed65de..3770ca4ddd 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/mcts/MCTSUnitTest.java
@@ -1,12 +1,13 @@
package com.baeldung.algorithms.mcts;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.baeldung.algorithms.mcts.montecarlo.MonteCarloTreeSearch;
import com.baeldung.algorithms.mcts.montecarlo.State;
@@ -15,31 +16,31 @@ import com.baeldung.algorithms.mcts.tictactoe.Board;
import com.baeldung.algorithms.mcts.tictactoe.Position;
import com.baeldung.algorithms.mcts.tree.Tree;
-public class MCTSUnitTest {
+class MCTSUnitTest {
private Tree gameTree;
private MonteCarloTreeSearch mcts;
- @Before
+ @BeforeEach
public void initGameTree() {
gameTree = new Tree();
mcts = new MonteCarloTreeSearch();
}
@Test
- public void givenStats_whenGetUCTForNode_thenUCTMatchesWithManualData() {
+ void givenStats_whenGetUCTForNode_thenUCTMatchesWithManualData() {
double uctValue = 15.79;
assertEquals(UCT.uctValue(600, 300, 20), uctValue, 0.01);
}
@Test
- public void giveninitBoardState_whenGetAllPossibleStates_thenNonEmptyList() {
+ void giveninitBoardState_whenGetAllPossibleStates_thenNonEmptyList() {
State initState = gameTree.getRoot().getState();
List possibleStates = initState.getAllPossibleStates();
assertTrue(possibleStates.size() > 0);
}
@Test
- public void givenEmptyBoard_whenPerformMove_thenLessAvailablePossitions() {
+ void givenEmptyBoard_whenPerformMove_thenLessAvailablePossitions() {
Board board = new Board();
int initAvailablePositions = board.getEmptyPositions().size();
board.performMove(Board.P1, new Position(1, 1));
@@ -48,7 +49,7 @@ public class MCTSUnitTest {
}
@Test
- public void givenEmptyBoard_whenSimulateInterAIPlay_thenGameDraw() {
+ void givenEmptyBoard_whenSimulateInterAIPlay_thenGameDraw() {
Board board = new Board();
int player = Board.P1;
@@ -61,11 +62,11 @@ public class MCTSUnitTest {
player = 3 - player;
}
int winStatus = board.checkStatus();
- assertEquals(winStatus, Board.DRAW);
+ assertEquals(Board.DRAW, winStatus);
}
@Test
- public void givenEmptyBoard_whenLevel1VsLevel3_thenLevel3WinsOrDraw() {
+ void givenEmptyBoard_whenLevel1VsLevel3_thenLevel3WinsOrDraw() {
Board board = new Board();
MonteCarloTreeSearch mcts1 = new MonteCarloTreeSearch();
mcts1.setLevel(1);
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java
index 4389795ffb..6bb8ad3e09 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java
@@ -1,21 +1,22 @@
package com.baeldung.algorithms.quadtree;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class QuadTreeSearchUnitTest {
+class QuadTreeSearchUnitTest {
private static final Logger LOGGER = LoggerFactory.getLogger(QuadTreeSearchUnitTest.class);
private static QuadTree quadTree;
- @BeforeClass
+ @BeforeAll
public static void setUp() {
Region area = new Region(0, 0, 400, 400);
quadTree = new QuadTree(area);
@@ -32,30 +33,30 @@ public class QuadTreeSearchUnitTest {
}
@Test
- public void givenQuadTree_whenSearchingForRange_thenReturn1MatchingItem() {
+ void givenQuadTree_whenSearchingForRange_thenReturn1MatchingItem() {
Region searchArea = new Region(200, 200, 250, 250);
List result = quadTree.search(searchArea, null, "");
LOGGER.debug(result.toString());
LOGGER.debug(quadTree.printSearchTraversePath());
- Assert.assertEquals(1, result.size());
- Assert.assertArrayEquals(new float[] { 245, 238 },
+ assertEquals(1, result.size());
+ assertArrayEquals(new float[] { 245, 238 },
new float[]{result.get(0).getX(), result.get(0).getY() }, 0);
}
@Test
- public void givenQuadTree_whenSearchingForRange_thenReturn2MatchingItems() {
+ void givenQuadTree_whenSearchingForRange_thenReturn2MatchingItems() {
Region searchArea = new Region(0, 0, 100, 100);
List result = quadTree.search(searchArea, null, "");
LOGGER.debug(result.toString());
LOGGER.debug(quadTree.printSearchTraversePath());
- Assert.assertEquals(2, result.size());
- Assert.assertArrayEquals(new float[] { 21, 25 },
+ assertEquals(2, result.size());
+ assertArrayEquals(new float[] { 21, 25 },
new float[]{result.get(0).getX(), result.get(0).getY() }, 0);
- Assert.assertArrayEquals(new float[] { 55, 53 },
+ assertArrayEquals(new float[] { 55, 53 },
new float[]{result.get(1).getX(), result.get(1).getY() }, 0);
}
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java
index d9a4f2962c..7ae9a6fcc4 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/suffixtree/SuffixTreeUnitTest.java
@@ -1,71 +1,72 @@
package com.baeldung.algorithms.suffixtree;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SuffixTreeUnitTest {
+class SuffixTreeUnitTest {
private static final Logger LOGGER = LoggerFactory.getLogger(SuffixTreeUnitTest.class);
private static SuffixTree suffixTree;
- @BeforeClass
+ @BeforeAll
public static void setUp() {
suffixTree = new SuffixTree("havanabanana");
printTree();
}
@Test
- public void givenSuffixTree_whenSearchingForA_thenReturn6Matches() {
+ void givenSuffixTree_whenSearchingForA_thenReturn6Matches() {
List matches = suffixTree.searchText("a");
matches.stream()
.forEach(m -> LOGGER.debug(m));
- Assert.assertArrayEquals(new String[] { "h[a]vanabanana", "hav[a]nabanana", "havan[a]banana", "havanab[a]nana", "havanaban[a]na", "havanabanan[a]" }, matches.toArray());
+ assertArrayEquals(new String[] { "h[a]vanabanana", "hav[a]nabanana", "havan[a]banana", "havanab[a]nana", "havanaban[a]na", "havanabanan[a]" }, matches.toArray());
}
@Test
- public void givenSuffixTree_whenSearchingForNab_thenReturn1Match() {
+ void givenSuffixTree_whenSearchingForNab_thenReturn1Match() {
List matches = suffixTree.searchText("nab");
matches.stream()
.forEach(m -> LOGGER.debug(m));
- Assert.assertArrayEquals(new String[] { "hava[nab]anana" }, matches.toArray());
+ assertArrayEquals(new String[] { "hava[nab]anana" }, matches.toArray());
}
@Test
- public void givenSuffixTree_whenSearchingForNag_thenReturnNoMatches() {
+ void givenSuffixTree_whenSearchingForNag_thenReturnNoMatches() {
List matches = suffixTree.searchText("nag");
matches.stream()
.forEach(m -> LOGGER.debug(m));
- Assert.assertArrayEquals(new String[] {}, matches.toArray());
+ assertArrayEquals(new String[] {}, matches.toArray());
}
@Test
- public void givenSuffixTree_whenSearchingForBanana_thenReturn2Matches() {
+ void givenSuffixTree_whenSearchingForBanana_thenReturn2Matches() {
List matches = suffixTree.searchText("ana");
matches.stream()
.forEach(m -> LOGGER.debug(m));
- Assert.assertArrayEquals(new String[] { "hav[ana]banana", "havanab[ana]na", "havanaban[ana]" }, matches.toArray());
+ assertArrayEquals(new String[] { "hav[ana]banana", "havanab[ana]na", "havanaban[ana]" }, matches.toArray());
}
@Test
- public void givenSuffixTree_whenSearchingForNa_thenReturn4Matches() {
+ void givenSuffixTree_whenSearchingForNa_thenReturn4Matches() {
List matches = suffixTree.searchText("na");
matches.stream()
.forEach(m -> LOGGER.debug(m));
- Assert.assertArrayEquals(new String[] { "hava[na]banana", "havanaba[na]na", "havanabana[na]" }, matches.toArray());
+ assertArrayEquals(new String[] { "hava[na]banana", "havanaba[na]na", "havanabana[na]" }, matches.toArray());
}
@Test
- public void givenSuffixTree_whenSearchingForX_thenReturnNoMatches() {
+ void givenSuffixTree_whenSearchingForX_thenReturnNoMatches() {
List matches = suffixTree.searchText("x");
matches.stream()
.forEach(m -> LOGGER.debug(m));
- Assert.assertArrayEquals(new String[] {}, matches.toArray());
+ assertArrayEquals(new String[] {}, matches.toArray());
}
private static void printTree() {
diff --git a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java
index 543ccb912f..a1a5e9cbbe 100644
--- a/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java
+++ b/algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/textsearch/TextSearchAlgorithmsUnitTest.java
@@ -1,23 +1,24 @@
package com.baeldung.algorithms.textsearch;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class TextSearchAlgorithmsUnitTest {
+class TextSearchAlgorithmsUnitTest {
@Test
- public void testStringSearchAlgorithms() {
+ void testStringSearchAlgorithms() {
String text = "This is some nice text.";
String pattern = "some";
int realPosition = text.indexOf(pattern);
- Assert.assertTrue(realPosition == TextSearchAlgorithms.simpleTextSearch(pattern.toCharArray(), text.toCharArray()));
- Assert.assertTrue(realPosition == TextSearchAlgorithms.RabinKarpMethod(pattern.toCharArray(), text.toCharArray()));
- Assert.assertTrue(realPosition == TextSearchAlgorithms.KnuthMorrisPrattSearch(pattern.toCharArray(), text.toCharArray()));
- Assert.assertTrue(realPosition == TextSearchAlgorithms.BoyerMooreHorspoolSimpleSearch(pattern.toCharArray(), text.toCharArray()));
- Assert.assertTrue(realPosition == TextSearchAlgorithms.BoyerMooreHorspoolSearch(pattern.toCharArray(), text.toCharArray()));
+ assertEquals(TextSearchAlgorithms.simpleTextSearch(pattern.toCharArray(), text.toCharArray()), realPosition);
+ assertEquals(TextSearchAlgorithms.RabinKarpMethod(pattern.toCharArray(), text.toCharArray()), realPosition);
+ assertEquals(TextSearchAlgorithms.KnuthMorrisPrattSearch(pattern.toCharArray(), text.toCharArray()) , realPosition);
+ assertEquals(TextSearchAlgorithms.BoyerMooreHorspoolSimpleSearch(pattern.toCharArray(), text.toCharArray()), realPosition);
+ assertEquals(TextSearchAlgorithms.BoyerMooreHorspoolSearch(pattern.toCharArray(), text.toCharArray()), realPosition);
}
}
diff --git a/algorithms-modules/algorithms-sorting-2/README.md b/algorithms-modules/algorithms-sorting-2/README.md
index b31cfceb42..f8a675ed8a 100644
--- a/algorithms-modules/algorithms-sorting-2/README.md
+++ b/algorithms-modules/algorithms-sorting-2/README.md
@@ -4,4 +4,5 @@
- [Sorting Strings by Contained Numbers in Java](https://www.baeldung.com/java-sort-strings-contained-numbers)
- [Guide to In-Place Sorting Algorithm Works with a Java Implementation](https://www.baeldung.com/java-in-place-sorting)
- [Partitioning and Sorting Arrays with Many Repeated Entries with Java Examples](https://www.baeldung.com/java-sorting-arrays-with-repeated-entries)
+- [Gravity/Bead Sort in Java](https://www.baeldung.com/java-gravity-bead-sort)
- More articles: [[<-- prev]](/algorithms-sorting)
diff --git a/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/gravitysort/GravitySort.java b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/gravitysort/GravitySort.java
new file mode 100644
index 0000000000..4d60dbbf25
--- /dev/null
+++ b/algorithms-modules/algorithms-sorting-2/src/main/java/com/baeldung/algorithms/gravitysort/GravitySort.java
@@ -0,0 +1,60 @@
+package com.baeldung.algorithms.gravitysort;
+
+public class GravitySort {
+
+ public static int findMax(int[] A) {
+ int max = A[0];
+ for (int i = 1; i< A.length; i++) {
+ if (A[i] > max) {
+ max = A[i];
+ }
+ }
+ return max;
+ }
+
+ public static boolean[][] setupAbacus(int[] A, int m) {
+ boolean[][] abacus = new boolean[A.length][m];
+ for (int i = 0; i < abacus.length; i++) {
+ int number = A[i];
+ for (int j = 0; j < abacus[0].length && j < number; j++) {
+ abacus[A.length - 1 - i][j] = true;
+ }
+ }
+ return abacus;
+ }
+
+ public static void dropBeads(boolean[][] abacus, int[] A, int m) {
+ for (int i = 1; i < A.length; i++) {
+ for (int j = m - 1; j >= 0; j--) {
+ if (abacus[i][j] == true) {
+ int x = i;
+ while (x > 0 && abacus[x - 1][j] == false) {
+ boolean temp = abacus[x - 1][j];
+ abacus[x - 1][j] = abacus[x][j];
+ abacus[x][j] = temp;
+ x--;
+ }
+ }
+ }
+ }
+ }
+
+ public static void transformToList(boolean[][] abacus, int[] A) {
+ int index = 0;
+ for (int i = abacus.length - 1; i >= 0; i--) {
+ int beads = 0;
+ for (int j = 0; j < abacus[0].length && abacus[i][j] == true; j++) {
+ beads++;
+ }
+ A[index++] = beads;
+ }
+ }
+
+ public static void sort(int[] A) {
+ int m = findMax(A);
+ boolean[][] abacus = setupAbacus(A, m);
+ dropBeads(abacus, A, m);
+ // transform abacus into sorted list
+ transformToList(abacus, A);
+ }
+}
diff --git a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java
index aaa5de87e1..d8b9887605 100644
--- a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java
+++ b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/bynumber/NaturalOrderComparatorsUnitTest.java
@@ -1,17 +1,19 @@
package com.baeldung.algorithms.bynumber;
-import org.junit.Test;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
-public class NaturalOrderComparatorsUnitTest {
+class NaturalOrderComparatorsUnitTest {
@Test
- public void givenSimpleStringsContainingIntsAndDoubles_whenSortedByRegex_checkSortingCorrect() {
+ void givenSimpleStringsContainingIntsAndDoubles_whenSortedByRegex_checkSortingCorrect() {
List testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.4", "d2.3d");
@@ -25,7 +27,7 @@ public class NaturalOrderComparatorsUnitTest {
}
@Test
- public void givenSimpleStringsContainingIntsAndDoublesWithAnInvalidNumber_whenSortedByRegex_checkSortingCorrect() {
+ void givenSimpleStringsContainingIntsAndDoublesWithAnInvalidNumber_whenSortedByRegex_checkSortingCorrect() {
List testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.4", "d2.3.3d");
@@ -39,7 +41,7 @@ public class NaturalOrderComparatorsUnitTest {
}
@Test
- public void givenAllForseenProblems_whenSortedByRegex_checkSortingCorrect() {
+ void givenAllForseenProblems_whenSortedByRegex_checkSortingCorrect() {
List testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.f4", "d2.3.3d");
@@ -53,7 +55,7 @@ public class NaturalOrderComparatorsUnitTest {
}
@Test
- public void givenComplexStringsContainingSeparatedNumbers_whenSortedByRegex_checkNumbersCondensedAndSorted() {
+ void givenComplexStringsContainingSeparatedNumbers_whenSortedByRegex_checkNumbersCondensedAndSorted() {
List testStrings = Arrays.asList("a1b2c5", "b3ght3.2", "something65.thensomething5"); //125, 33.2, 65.5
@@ -66,7 +68,7 @@ public class NaturalOrderComparatorsUnitTest {
}
@Test
- public void givenStringsNotContainingNumbers_whenSortedByRegex_checkOrderNotChanged() {
+ void givenStringsNotContainingNumbers_whenSortedByRegex_checkOrderNotChanged() {
List testStrings = Arrays.asList("a", "c", "d", "e");
List expected = new ArrayList<>(testStrings);
diff --git a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/gravitysort/GravitySortUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/gravitysort/GravitySortUnitTest.java
new file mode 100644
index 0000000000..c1ef611ab6
--- /dev/null
+++ b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/gravitysort/GravitySortUnitTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.algorithms.gravitysort;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import org.junit.jupiter.api.Test;
+
+class GravitySortUnitTest {
+
+ @Test
+ void givenIntegerArray_whenSortedWithGravitySort_thenGetSortedArray() {
+ int[] actual = { 9, 9, 100, 3, 57, 12, 3, 78, 0, 2, 2, 40, 21, 9 };
+ int[] expected = { 0, 2, 2, 3, 3, 9, 9, 9, 12, 21, 40, 57, 78, 100 };
+ GravitySort.sort(actual);
+ assertArrayEquals(expected, actual);
+ }
+}
diff --git a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java
index 321b905f68..2d87dfaf1e 100644
--- a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java
@@ -1,23 +1,22 @@
package com.baeldung.algorithms.inoutsort;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class InOutSortUnitTest {
+class InOutSortUnitTest {
@Test
- public void givenArray_whenInPlaceSort_thenReversed() {
+ void givenArray_whenInPlaceSort_thenReversed() {
int[] input = {1, 2, 3, 4, 5, 6, 7};
int[] expected = {7, 6, 5, 4, 3, 2, 1};
- assertArrayEquals("the two arrays are not equal", expected, InOutSort.reverseInPlace(input));
+ assertArrayEquals(expected, InOutSort.reverseInPlace(input), "the two arrays are not equal");
}
@Test
- public void givenArray_whenOutOfPlaceSort_thenReversed() {
+ void givenArray_whenOutOfPlaceSort_thenReversed() {
int[] input = {1, 2, 3, 4, 5, 6, 7};
int[] expected = {7, 6, 5, 4, 3, 2, 1};
- assertArrayEquals("the two arrays are not equal", expected, InOutSort.reverseOutOfPlace(input));
+ assertArrayEquals(expected, InOutSort.reverseOutOfPlace(input), "the two arrays are not equal");
}
}
diff --git a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java
index 847f7f8acb..02cb01ab71 100644
--- a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java
+++ b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/BentleyMcilroyPartitioningUnitTest.java
@@ -1,16 +1,17 @@
package com.baeldung.algorithms.quicksort;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class BentleyMcilroyPartitioningUnitTest {
+import org.junit.jupiter.api.Test;
+
+class BentleyMcilroyPartitioningUnitTest {
@Test
- public void given_IntegerArray_whenSortedWithBentleyMcilroyPartitioning_thenGetSortedArray() {
+ void given_IntegerArray_whenSortedWithBentleyMcilroyPartitioning_thenGetSortedArray() {
int[] actual = {3, 2, 2, 2, 3, 7, 7, 3, 2, 2, 7, 3, 3};
int[] expected = {2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 7, 7, 7};
BentleyMcIlroyPartioning.quicksort(actual, 0, actual.length - 1);
- Assert.assertArrayEquals(expected, actual);
+ assertArrayEquals(expected, actual);
}
}
diff --git a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java
index a8e27253cc..f8eec55e8f 100644
--- a/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting-2/src/test/java/com/baeldung/algorithms/quicksort/DNFThreeWayQuickSortUnitTest.java
@@ -1,15 +1,16 @@
package com.baeldung.algorithms.quicksort;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class DNFThreeWayQuickSortUnitTest {
+import org.junit.jupiter.api.Test;
+
+class DNFThreeWayQuickSortUnitTest {
@Test
- public void givenIntegerArray_whenSortedWithThreeWayQuickSort_thenGetSortedArray() {
+ void givenIntegerArray_whenSortedWithThreeWayQuickSort_thenGetSortedArray() {
int[] actual = {3, 5, 5, 5, 3, 7, 7, 3, 5, 5, 7, 3, 3};
int[] expected = {3, 3, 3, 3, 3, 5, 5, 5, 5, 5, 7, 7, 7};
DutchNationalFlagPartioning.quicksort(actual, 0, actual.length - 1);
- Assert.assertArrayEquals(expected, actual);
+ assertArrayEquals(expected, actual);
}
}
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
index 210ee2378a..edbd352020 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
@@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import org.junit.jupiter.api.Test;
-public class BubbleSortUnitTest {
+class BubbleSortUnitTest {
@Test
- public void givenIntegerArray_whenSortedWithBubbleSort_thenGetSortedArray() {
+ void givenIntegerArray_whenSortedWithBubbleSort_thenGetSortedArray() {
Integer[] array = { 2, 1, 4, 6, 3, 5 };
Integer[] sortedArray = { 1, 2, 3, 4, 5, 6 };
BubbleSort bubbleSort = new BubbleSort();
@@ -16,7 +16,7 @@ public class BubbleSortUnitTest {
}
@Test
- public void givenIntegerArray_whenSortedWithOptimizedBubbleSort_thenGetSortedArray() {
+ void givenIntegerArray_whenSortedWithOptimizedBubbleSort_thenGetSortedArray() {
Integer[] array = { 2, 1, 4, 6, 3, 5 };
Integer[] sortedArray = { 1, 2, 3, 4, 5, 6 };
BubbleSort bubbleSort = new BubbleSort();
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
index 4671819673..3916834c83 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
@@ -1,24 +1,26 @@
package com.baeldung.algorithms.bucketsort;
-import static org.junit.Assert.assertEquals;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class IntegerBucketSorterUnitTest {
+class IntegerBucketSorterUnitTest {
private IntegerBucketSorter sorter;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
sorter = new IntegerBucketSorter();
}
@Test
- public void givenUnsortedList_whenSortedUsingBucketSorter_checkSortingCorrect() {
+ void givenUnsortedList_whenSortedUsingBucketSorter_checkSortingCorrect() {
List unsorted = Arrays.asList(80,50,60,30,20,10,70,0,40,500,600,602,200,15);
List expected = Arrays.asList(0,10,15,20,30,40,50,60,70,80,200,500,600,602);
@@ -26,7 +28,5 @@ public class IntegerBucketSorterUnitTest {
List actual = sorter.sort(unsorted);
assertEquals(expected, actual);
-
-
}
}
\ No newline at end of file
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java
index 96e4936eaf..b4240f0287 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java
@@ -1,16 +1,16 @@
package com.baeldung.algorithms.heapsort;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class HeapUnitTest {
+class HeapUnitTest {
@Test
- public void givenNotEmptyHeap_whenPopCalled_thenItShouldReturnSmallestElement() {
+ void givenNotEmptyHeap_whenPopCalled_thenItShouldReturnSmallestElement() {
// given
Heap heap = Heap.of(3, 5, 1, 4, 2);
@@ -22,7 +22,7 @@ public class HeapUnitTest {
}
@Test
- public void givenNotEmptyIterable_whenSortCalled_thenItShouldReturnElementsInSortedList() {
+ void givenNotEmptyIterable_whenSortCalled_thenItShouldReturnElementsInSortedList() {
// given
List elements = Arrays.asList(3, 5, 1, 4, 2);
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java
index b3d7e8c534..5845df45ae 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java
@@ -1,25 +1,25 @@
package com.baeldung.algorithms.insertionsort;
-import com.baeldung.algorithms.insertionsort.InsertionSort;
-import org.junit.Test;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class InsertionSortUnitTest {
+import org.junit.jupiter.api.Test;
+
+class InsertionSortUnitTest {
@Test
- public void givenUnsortedArray_whenInsertionSortImperative_thenSortedAsc() {
+ void givenUnsortedArray_whenInsertionSortImperative_thenSortedAsc() {
int[] input = {6, 2, 3, 4, 5, 1};
InsertionSort.insertionSortImperative(input);
int[] expected = {1, 2, 3, 4, 5, 6};
- assertArrayEquals("the two arrays are not equal", expected, input);
+ assertArrayEquals(expected, input, "the two arrays are not equal");
}
@Test
- public void givenUnsortedArray_whenInsertionSortRecursive_thenSortedAsc() {
+ void givenUnsortedArray_whenInsertionSortRecursive_thenSortedAsc() {
int[] input = {6, 4, 5, 2, 3, 1};
InsertionSort.insertionSortRecursive(input);
int[] expected = {1, 2, 3, 4, 5, 6};
- assertArrayEquals("the two arrays are not equal", expected, input);
+ assertArrayEquals( expected, input, "the two arrays are not equal");
}
}
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java
index 5cd14b7bd0..cc663458bd 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java
@@ -1,17 +1,17 @@
package com.baeldung.algorithms.mergesort;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MergeSortUnitTest {
+class MergeSortUnitTest {
@Test
- public void positiveTest() {
+ void positiveTest() {
int[] actual = { 5, 1, 6, 2, 3, 4 };
int[] expected = { 1, 2, 3, 4, 5, 6 };
MergeSort.mergeSort(actual, actual.length);
- Assert.assertArrayEquals(expected, actual);
+ assertArrayEquals(expected, actual);
}
}
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java
index c9af5b4bf8..c4e53cc50b 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java
@@ -1,17 +1,17 @@
package com.baeldung.algorithms.quicksort;
-import com.baeldung.algorithms.quicksort.QuickSort;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class QuickSortUnitTest {
+import org.junit.jupiter.api.Test;
+
+class QuickSortUnitTest {
@Test
- public void givenIntegerArray_whenSortedWithQuickSort_thenGetSortedArray() {
+ void givenIntegerArray_whenSortedWithQuickSort_thenGetSortedArray() {
int[] actual = { 9, 5, 1, 0, 6, 2, 3, 4, 7, 8 };
int[] expected = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
QuickSort.quickSort(actual, 0, actual.length-1);
- Assert.assertArrayEquals(expected, actual);
+ assertArrayEquals(expected, actual);
}
}
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java
index cd8c7c1241..bb0b5c6bd3 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java
@@ -1,15 +1,16 @@
package com.baeldung.algorithms.quicksort;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class ThreeWayQuickSortUnitTest {
+import org.junit.jupiter.api.Test;
+
+class ThreeWayQuickSortUnitTest {
@Test
public void givenIntegerArray_whenSortedWithThreeWayQuickSort_thenGetSortedArray() {
int[] actual = { 3, 5, 5, 5, 3, 7, 7, 3, 5, 5, 7, 3, 3 };
int[] expected = { 3, 3, 3, 3, 3, 5, 5, 5, 5, 5, 7, 7, 7 };
ThreeWayQuickSort.threeWayQuickSort(actual, 0, actual.length-1);
- Assert.assertArrayEquals(expected, actual);
+ assertArrayEquals(expected, actual);
}
}
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java
index 0f6c751ade..66225344cd 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java
@@ -1,13 +1,13 @@
package com.baeldung.algorithms.radixsort;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class RadixSortUnitTest {
+class RadixSortUnitTest {
@Test
- public void givenUnsortedArray_whenRadixSort_thenArraySorted() {
+ void givenUnsortedArray_whenRadixSort_thenArraySorted() {
int[] numbers = { 387, 468, 134, 123, 68, 221, 769, 37, 7 };
RadixSort.sort(numbers);
int[] numbersSorted = { 7, 37, 68, 123, 134, 221, 387, 468, 769 };
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
index 85efd1d3da..3cbc88e128 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
@@ -1,25 +1,24 @@
package com.baeldung.algorithms.selectionsort;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SelectionSortUnitTest {
+class SelectionSortUnitTest {
@Test
- public void givenUnsortedArray_whenSelectionSort_SortAscending_thenSortedAsc() {
+ void givenUnsortedArray_whenSelectionSort_SortAscending_thenSortedAsc() {
int[] input = { 5, 4, 1, 6, 2 };
SelectionSort.sortAscending(input);
int[] expected = {1, 2, 4, 5, 6};
- assertArrayEquals("the two arrays are not equal", expected, input);
+ assertArrayEquals(expected, input, "the two arrays are not equal");
}
@Test
- public void givenUnsortedArray_whenSelectionSort_SortDescending_thenSortedDesc() {
+ void givenUnsortedArray_whenSelectionSort_SortDescending_thenSortedDesc() {
int[] input = { 5, 4, 1, 6, 2 };
SelectionSort.sortDescending(input);
int[] expected = {6, 5, 4, 2, 1};
- assertArrayEquals("the two arrays are not equal", expected, input);
+ assertArrayEquals(expected, input, "the two arrays are not equal");
}
}
diff --git a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
index 91a27c41d0..38a861c2c0 100644
--- a/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
+++ b/algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
@@ -1,17 +1,17 @@
package com.baeldung.algorithms.shellsort;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertArrayEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class ShellSortUnitTest {
+import org.junit.jupiter.api.Test;
+
+class ShellSortUnitTest {
@Test
- public void givenUnsortedArray_whenShellSort_thenSortedAsc() {
+ void givenUnsortedArray_whenShellSort_thenSortedAsc() {
int[] input = {41, 15, 82, 5, 65, 19, 32, 43, 8};
ShellSort.sort(input);
int[] expected = {5, 8, 15, 19, 32, 41, 43, 65, 82};
- assertArrayEquals("the two arrays are not equal", expected, input);
+ assertArrayEquals( expected, input, "the two arrays are not equal");
}
}
diff --git a/apache-cxf-modules/README.md b/apache-cxf-modules/README.md
deleted file mode 100644
index cd45c371fe..0000000000
--- a/apache-cxf-modules/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Apache CXF
-
-This module contains articles about Apache CXF
-
-## Relevant Articles:
-
-- [Introduction to Apache CXF Aegis Data Binding](https://www.baeldung.com/aegis-data-binding-in-apache-cxf)
diff --git a/apache-cxf-modules/cxf-aegis/pom.xml b/apache-cxf-modules/cxf-aegis/pom.xml
index d013aabc65..6b9e026cdd 100644
--- a/apache-cxf-modules/cxf-aegis/pom.xml
+++ b/apache-cxf-modules/cxf-aegis/pom.xml
@@ -20,4 +20,8 @@
+
+ 4.0.0
+
+
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java b/apache-cxf-modules/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java
index b28b987cfa..9c89d769e0 100644
--- a/apache-cxf-modules/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java
+++ b/apache-cxf-modules/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java
@@ -80,16 +80,20 @@ public class BaeldungIntegrationTest {
private void marshalCourseRepo(CourseRepo courseRepo) throws Exception {
AegisWriter writer = context.createXMLStreamWriter();
AegisType aegisType = context.getTypeMapping().getType(CourseRepo.class);
- XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(new FileOutputStream(fileName));
+ final FileOutputStream stream = new FileOutputStream(fileName);
+ XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(stream);
writer.write(courseRepo, new QName("http://aegis.cxf.baeldung.com", "baeldung"), false, xmlWriter, aegisType);
xmlWriter.close();
+ stream.close();
}
private CourseRepo unmarshalCourseRepo() throws Exception {
AegisReader reader = context.createXMLStreamReader();
- XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader(new FileInputStream(fileName));
+ final FileInputStream stream = new FileInputStream(fileName);
+ XMLStreamReader xmlReader = XMLInputFactory.newInstance().createXMLStreamReader(stream);
CourseRepo courseRepo = (CourseRepo) reader.read(xmlReader, context.getTypeMapping().getType(CourseRepo.class));
xmlReader.close();
+ stream.close();
return courseRepo;
}
@@ -97,7 +101,7 @@ public class BaeldungIntegrationTest {
public void cleanup(){
File testFile = new File(fileName);
if (testFile.exists()) {
- testFile.delete();
+ testFile.deleteOnExit();
}
}
}
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-introduction/pom.xml b/apache-cxf-modules/cxf-introduction/pom.xml
index fe7b917c6f..fdcd100cc5 100644
--- a/apache-cxf-modules/cxf-introduction/pom.xml
+++ b/apache-cxf-modules/cxf-introduction/pom.xml
@@ -23,6 +23,16 @@
cxf-rt-transports-http-jetty
${cxf.version}
+
+ jakarta.xml.ws
+ jakarta.xml.ws-api
+ ${jakarta-xml.version}
+
+
+ jakarta.jws
+ jakarta.jws-api
+ ${jakarta.jws.version}
+
@@ -37,4 +47,10 @@
+
+ 4.0.0
+ 4.0.0
+ 3.0.0
+
+
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java
index 472d38b8e1..cd482af0db 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java
@@ -2,8 +2,8 @@ package com.baeldung.cxf.introduction;
import java.util.Map;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@WebService
public interface Baeldung {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java
index 240f6bb1da..04a6243cc2 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java
@@ -3,7 +3,7 @@ package com.baeldung.cxf.introduction;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(endpointInterface = "com.baeldung.cxf.introduction.Baeldung")
public class BaeldungImpl implements Baeldung {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java
index 2ac649f4c5..f00a64a055 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java
@@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
public static void main(String args[]) throws InterruptedException {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java
index cad8f94d97..0605956bbc 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java
@@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlJavaTypeAdapter(StudentAdapter.class)
public interface Student {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java
index 29b829d808..7885c953a5 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java
@@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StudentAdapter extends XmlAdapter {
public StudentImpl marshal(Student student) throws Exception {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java
index bc9dd27afe..041418befb 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java
@@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name = "Student")
public class StudentImpl implements Student {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java
index 4c40886c42..aa17b0cf4f 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java
@@ -3,8 +3,8 @@ package com.baeldung.cxf.introduction;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name = "StudentMap")
public class StudentMap {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java
index f156676a5f..3bf1bfd2ff 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java
@@ -3,7 +3,7 @@ package com.baeldung.cxf.introduction;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StudentMapAdapter extends XmlAdapter> {
public StudentMap marshal(Map boundMap) throws Exception {
diff --git a/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java b/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java
index 60fc0a10e7..89b127a742 100644
--- a/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java
+++ b/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java
@@ -5,8 +5,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.soap.SOAPBinding;
import org.junit.Before;
import org.junit.Test;
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml b/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml
index cc5eba4025..8418853b1e 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml
@@ -16,12 +16,28 @@
org.apache.cxf
cxf-rt-frontend-jaxrs
- ${cxf.version}
+ 4.0.0
org.apache.cxf
cxf-rt-transports-http-jetty
- ${cxf.version}
+ 4.0.0
+
+
+ jakarta.xml.ws
+ jakarta.xml.ws-api
+ ${jakarta-xml.version}
+
+
+ jakarta.jws
+ jakarta.jws-api
+ ${jakarta-jws.version}
+
+
+ jakarta.platform
+ jakarta.jakartaee-web-api
+ ${jakarta-platform.version}
+ compile
org.apache.httpcomponents
@@ -50,6 +66,9 @@
4.5.2
+ 4.0.0
+ 3.0.0
+ 9.0.0
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java
index dba9b9c661..9f2ba2e837 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java
@@ -1,8 +1,8 @@
package com.baeldung.cxf.jaxrs.implementation;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java
index a2fd6be435..e527180440 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java
@@ -1,7 +1,7 @@
package com.baeldung.cxf.jaxrs.implementation;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java
index bd3dad0f5e..f6c4e32cdd 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java
@@ -1,6 +1,6 @@
package com.baeldung.cxf.jaxrs.implementation;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Student")
public class Student {
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java
index 29c34ae16b..a9f71930f2 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java
@@ -7,7 +7,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpDelete;
diff --git a/apache-cxf-modules/cxf-spring/pom.xml b/apache-cxf-modules/cxf-spring/pom.xml
index ebbebd7f3b..1c87ae4bfb 100644
--- a/apache-cxf-modules/cxf-spring/pom.xml
+++ b/apache-cxf-modules/cxf-spring/pom.xml
@@ -40,10 +40,22 @@
spring-webmvc
${spring.version}
+
+ com.sun.xml.ws
+ jaxws-ri
+ 2.3.3
+ pom
+
javax.servlet
javax.servlet-api
- ${javax.servlet-api.version}
+ 4.0.1
+ provided
+
+
+ javax.servlet
+ jstl
+ 1.2
@@ -103,8 +115,9 @@
- 4.3.4.RELEASE
+ 5.3.25
1.6.1
+ 3.3.2
\ No newline at end of file
diff --git a/apache-cxf-modules/sse-jaxrs/README.md b/apache-cxf-modules/sse-jaxrs/README.md
index 4d39560b46..ee85940b8a 100644
--- a/apache-cxf-modules/sse-jaxrs/README.md
+++ b/apache-cxf-modules/sse-jaxrs/README.md
@@ -1,3 +1,3 @@
### Relevant Articles:
-- [Server-Sent Events (SSE) In JAX-RS](https://www.baeldung.com/java-ee-jax-rs-sse)
+- [Server-Sent Events (SSE) in JAX-RS](https://www.baeldung.com/java-ee-jax-rs-sse)
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml
index 26c8a87c2b..ce2b0059c3 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml
@@ -23,6 +23,11 @@
cxf-rt-rs-sse
${cxf-version}
+
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta-ws.version}
+
@@ -55,7 +60,8 @@
- 3.2.0
+ 4.0.0
+ 3.1.0
\ No newline at end of file
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
index 5d42b3a243..af9a9c7691 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
@@ -1,10 +1,10 @@
package com.baeldung.sse.jaxrs.client;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.sse.InboundSseEvent;
+import jakarta.ws.rs.sse.SseEventSource;
import java.util.function.Consumer;
public class SseClientApp {
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
index 9afc187a6d..4e3c236437 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
@@ -1,10 +1,10 @@
package com.baeldung.sse.jaxrs.client;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.sse.InboundSseEvent;
+import jakarta.ws.rs.sse.SseEventSource;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml
index 0467fd9e5d..3bd3e5cb27 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml
@@ -15,16 +15,14 @@
- javax.ws.rs
- javax.ws.rs-api
- ${rs-api.version}
- provided
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta-ws.version}
- javax.enterprise
- cdi-api
- ${cdi-api.version}
- provided
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+ ${jakarta-cdi-api}
javax.json.bind
@@ -37,6 +35,11 @@
${project.artifactId}
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ ${maven-war-plugin.version}
+
net.wasdev.wlp.maven.plugins
liberty-maven-plugin
@@ -78,9 +81,10 @@
2.4.2
false
18.0.0.2
- 2.1
- 2.0
+ 3.1.0
+ 4.0.1
1.0
+ 3.3.2
\ No newline at end of file
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
index 058d19f045..fdd1af632c 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
@@ -1,7 +1,7 @@
package com.baeldung.sse.jaxrs;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
@ApplicationPath("sse")
public class AppConfig extends Application {
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
index 1f60168a1b..3e211f109b 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
@@ -1,15 +1,15 @@
package com.baeldung.sse.jaxrs;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseBroadcaster;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseBroadcaster;
+import jakarta.ws.rs.sse.SseEventSink;
@ApplicationScoped
@Path("stock")
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
index 15818ead5d..721ef35678 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
@@ -1,11 +1,11 @@
package com.baeldung.sse.jaxrs;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
diff --git a/apache-httpclient-2/README.md b/apache-httpclient-2/README.md
index 45f1e41637..a19112476b 100644
--- a/apache-httpclient-2/README.md
+++ b/apache-httpclient-2/README.md
@@ -12,6 +12,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Reading an HTTP Response Body as a String in Java](https://www.baeldung.com/java-http-response-body-as-string)
- [How To Get Cookies From the Apache HttpClient Response](https://www.baeldung.com/java-apache-httpclient-cookies)
- [Enabling Logging for Apache HttpClient](https://www.baeldung.com/apache-httpclient-enable-logging)
-- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
- [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
+- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
- More articles: [[<-- prev]](../apache-httpclient)
diff --git a/apache-httpclient-2/pom.xml b/apache-httpclient-2/pom.xml
index c5b8195472..8b7217dbe1 100644
--- a/apache-httpclient-2/pom.xml
+++ b/apache-httpclient-2/pom.xml
@@ -21,17 +21,6 @@
${commons-lang3.version}
-
- org.apache.httpcomponents
- httpclient
- ${httpclient.version}
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.httpcomponents.client5
httpclient5
@@ -97,8 +86,7 @@
3.22.0
5.11.2
- 4.5.8
- 5.1.3
+ 5.2.1
11
11
2.1.7.RELEASE
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
index 404acb3098..ef57406705 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
@@ -1,46 +1,50 @@
package com.baeldung.httpclient.cookies;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.cookie.ClientCookie;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.cookie.BasicClientCookie;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieStore;
+
+import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+
+import org.apache.hc.client5.http.impl.cookie.BasicClientCookie;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
-
-
-public class HttpClientGettingCookieValueUnitTest {
+class HttpClientGettingCookieValueUnitTest {
private static Logger log = LoggerFactory.getLogger(HttpClientGettingCookieValueUnitTest.class);
- private static final String SAMPLE_URL = "http://www.baeldung.com/";
+ private static final String SAMPLE_URL = "http://www.github.com/";
@Test
- public final void whenSettingCustomCookieOnTheRequest_thenGettingTheSameCookieFromTheResponse() throws IOException {
+ void whenSettingCustomCookieOnTheRequest_thenGettingTheSameCookieFromTheResponse() throws IOException {
+
HttpClientContext context = HttpClientContext.create();
context.setAttribute(HttpClientContext.COOKIE_STORE, createCustomCookieStore());
- try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
- try (CloseableHttpResponse response = httpClient.execute(new HttpGet(SAMPLE_URL), context)) {
- CookieStore cookieStore = context.getCookieStore();
- Cookie customCookie = cookieStore.getCookies()
- .stream()
- .peek(cookie -> log.info("cookie name:{}", cookie.getName()))
- .filter(cookie -> "custom_cookie".equals(cookie.getName()))
- .findFirst()
- .orElseThrow(IllegalStateException::new);
+ final HttpGet request = new HttpGet(SAMPLE_URL);
- assertEquals("test_value", customCookie.getValue());
- }
+ try (CloseableHttpClient client = HttpClientBuilder.create()
+ .build()) {
+ client.execute(request, context, new BasicHttpClientResponseHandler());
+ CookieStore cookieStore = context.getCookieStore();
+ Cookie customCookie = cookieStore.getCookies()
+ .stream()
+ .peek(cookie -> log.info("cookie name:{}", cookie.getName()))
+ .filter(cookie -> "custom_cookie".equals(cookie.getName()))
+ .findFirst()
+ .orElseThrow(IllegalStateException::new);
+
+ assertEquals("test_value", customCookie.getValue());
}
}
@@ -48,7 +52,7 @@ public class HttpClientGettingCookieValueUnitTest {
BasicCookieStore cookieStore = new BasicCookieStore();
BasicClientCookie cookie = new BasicClientCookie("custom_cookie", "test_value");
cookie.setDomain("baeldung.com");
- cookie.setAttribute(ClientCookie.DOMAIN_ATTR, "true");
+ cookie.setAttribute("domain", "true");
cookie.setPath("/");
cookieStore.addCookie(cookie);
return cookieStore;
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandUrl/HttpClientExpandUrlLiveTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandUrl/HttpClientExpandUrlLiveTest.java
new file mode 100644
index 0000000000..c1bb5bdddb
--- /dev/null
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandUrl/HttpClientExpandUrlLiveTest.java
@@ -0,0 +1,126 @@
+package com.baeldung.httpclient.expandUrl;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import org.apache.hc.client5.http.classic.methods.HttpHead;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpHeaders;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+class HttpClientExpandUrlLiveTest {
+
+ private static CloseableHttpClient httpClient;
+
+ @BeforeAll
+ static void setup() {
+ httpClient = HttpClientBuilder.create()
+ .disableRedirectHandling()
+ .build();
+ }
+
+ @AfterAll
+ static void tearDown() throws IOException {
+ if (httpClient != null) {
+ httpClient.close();
+ }
+ }
+
+ @Test
+ void givenShortenedOnce_whenUrlIsExpanded_thenCorrectResult() throws IOException {
+ final String expectedResult = "https://www.baeldung.com/rest-versioning";
+ final String actualResult = expandSingleLevel("http://bit.ly/3LScTri");
+ assertThat(actualResult, equalTo(expectedResult));
+ }
+
+ @Test
+ void givenShortenedMultiple_whenUrlIsExpanded_thenCorrectResult() throws IOException {
+ final String expectedResult = "https://www.baeldung.com/rest-versioning";
+ final String actualResult = expand("http://t.co/e4rDDbnzmk");
+ assertThat(actualResult, equalTo(expectedResult));
+ }
+
+ private String expand(final String urlArg) throws IOException {
+ String originalUrl = urlArg;
+ String newUrl = expandSingleLevel(originalUrl);
+ while (!originalUrl.equals(newUrl)) {
+ originalUrl = newUrl;
+ newUrl = expandSingleLevel(originalUrl);
+ }
+
+ return newUrl;
+ }
+
+ final String expandSafe(final String urlArg) throws IOException {
+ String originalUrl = urlArg;
+ String newUrl = expandSingleLevelSafe(originalUrl).getRight();
+ final List alreadyVisited = Lists.newArrayList(originalUrl, newUrl);
+ while (!originalUrl.equals(newUrl)) {
+ originalUrl = newUrl;
+ final Pair statusAndUrl = expandSingleLevelSafe(originalUrl);
+ newUrl = statusAndUrl.getRight();
+ final boolean isRedirect = statusAndUrl.getLeft() == 301 || statusAndUrl.getLeft() == 302;
+ if (isRedirect && alreadyVisited.contains(newUrl)) {
+ throw new IllegalStateException("Likely a redirect loop");
+ }
+ alreadyVisited.add(newUrl);
+ }
+
+ return newUrl;
+ }
+
+ private Pair expandSingleLevelSafe(final String url) throws IOException {
+ try {
+ HttpHead request = new HttpHead(url);
+ Pair resp = httpClient.execute(request, response -> {
+ final int statusCode = response.getCode();
+ if (statusCode != 301 && statusCode != 302) {
+ return new ImmutablePair<>(statusCode, url);
+ }
+ final Header[] headers = response.getHeaders(HttpHeaders.LOCATION);
+ Preconditions.checkState(headers.length == 1);
+ final String newUrl = headers[0].getValue();
+
+ return new ImmutablePair<>(statusCode, newUrl);
+ });
+ return resp;
+ } catch (final IllegalArgumentException uriEx) {
+ return new ImmutablePair<>(500, url);
+ }
+ }
+
+ private String expandSingleLevel(final String url) throws IOException {
+ try {
+ HttpHead request = new HttpHead(url);
+ String expandedUrl = httpClient.execute(request, response -> {
+ final int statusCode = response.getCode();
+ if (statusCode != 301 && statusCode != 302) {
+ return url;
+ }
+ final Header[] headers = response.getHeaders(HttpHeaders.LOCATION);
+ Preconditions.checkState(headers.length == 1);
+
+ return headers[0].getValue();
+ });
+ return expandedUrl;
+ } catch (final IllegalArgumentException uriEx) {
+ return url;
+ }
+ }
+
+}
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
index 0d45eedc12..adf9a1a1a6 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
@@ -1,37 +1,39 @@
package com.baeldung.httpclient.httpclient;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
class ApacheHttpClientUnitTest extends GetRequestMockServer {
@Test
void givenDeveloperUsedHttpClient_whenExecutingGetRequest_thenStatusIsOkButSonarReportsAnIssue() throws IOException {
HttpClient httpClient = HttpClients.createDefault();
HttpGet httpGet = new HttpGet(serviceOneUrl);
- HttpResponse response = httpClient.execute(httpGet);
- assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+ httpClient.execute(httpGet, response -> {
+ assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+ return response;
+ });
}
@Test
void givenDeveloperUsedCloseableHttpClient_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
HttpGet httpGet = new HttpGet(serviceOneUrl);
- HttpResponse response = httpClient.execute(httpGet);
- assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+ httpClient.execute(httpGet, response -> {
+ assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+ return response;
+ });
}
}
@@ -39,20 +41,10 @@ class ApacheHttpClientUnitTest extends GetRequestMockServer {
void givenDeveloperUsedHttpClientBuilder_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
HttpGet httpGet = new HttpGet(serviceOneUrl);
- HttpResponse response = httpClient.execute(httpGet);
- assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
- }
- }
-
- @Test
- void givenDeveloperUsedCloseableHttpResponse_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
- try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
- HttpGet httpGet = new HttpGet(serviceOneUrl);
- try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
- HttpEntity entity = response.getEntity();
- EntityUtils.consume(entity);
+ httpClient.execute(httpGet, response -> {
assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
- }
+ return response;
+ });
}
}
@@ -60,18 +52,20 @@ class ApacheHttpClientUnitTest extends GetRequestMockServer {
void givenDeveloperUsedSingleClient_whenExecutingTwoGetRequest_thenStatusIsOk() throws IOException {
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
HttpGet httpGetOne = new HttpGet(serviceOneUrl);
- try (CloseableHttpResponse responseOne = httpClient.execute(httpGetOne)) {
+ httpClient.execute(httpGetOne, responseOne -> {
HttpEntity entityOne = responseOne.getEntity();
EntityUtils.consume(entityOne);
assertThat(responseOne.getCode()).isEqualTo(HttpStatus.SC_OK);
- }
+ return responseOne;
+ });
HttpGet httpGetTwo = new HttpGet(serviceTwoUrl);
- try (CloseableHttpResponse responseTwo = httpClient.execute(httpGetTwo)) {
- HttpEntity entityTwo = responseTwo.getEntity();
+ httpClient.execute(httpGetTwo, responseTwo -> {
+ HttpEntity entityTwo = httpGetTwo.getEntity();
EntityUtils.consume(entityTwo);
assertThat(responseTwo.getCode()).isEqualTo(HttpStatus.SC_OK);
- }
+ return responseTwo;
+ });
}
}
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java
index 35b21789ef..9a79cbf491 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java
@@ -1,29 +1,27 @@
package com.baeldung.httpclient.readresponsebodystring;
import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.ParseException;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+
public class ApacheHttpClient5UnitTest {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
public static final String DUMMY_URL = "https://postman-echo.com/get";
@Test
- public void whenUseApacheHttpClient_thenCorrect() throws IOException, ParseException {
+ public void whenUseApacheHttpClient_thenCorrect() throws IOException {
HttpGet request = new HttpGet(DUMMY_URL);
- try (CloseableHttpClient client = HttpClients.createDefault(); CloseableHttpResponse response = client.execute(request)) {
- HttpEntity entity = response.getEntity();
- logger.debug("Response -> {}", EntityUtils.toString(entity));
+ try (CloseableHttpClient client = HttpClients.createDefault()) {
+ String response = client.execute(request, new BasicHttpClientResponseHandler());
+ logger.debug("Response -> {}", response);
}
}
}
\ No newline at end of file
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
deleted file mode 100644
index 7625b415f2..0000000000
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung.httpclient.readresponsebodystring;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-public class ApacheHttpClientUnitTest {
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
- public static final String DUMMY_URL = "https://postman-echo.com/get";
-
- @Test
- public void whenUseApacheHttpClient_thenCorrect() throws IOException {
- HttpGet request = new HttpGet(DUMMY_URL);
-
- try (CloseableHttpClient client = HttpClients.createDefault(); CloseableHttpResponse response = client.execute(request)) {
- HttpEntity entity = response.getEntity();
- logger.debug("Response -> {}", EntityUtils.toString(entity));
- }
- }
-}
diff --git a/apache-httpclient/pom.xml b/apache-httpclient/pom.xml
index 26eb319ac0..5c3ea5b3b3 100644
--- a/apache-httpclient/pom.xml
+++ b/apache-httpclient/pom.xml
@@ -54,6 +54,48 @@
+
+ org.apache.httpcomponents.core5
+ httpcore5
+ ${httpcore5.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+ org.apache.httpcomponents.client5
+ httpclient5-fluent
+ ${httpclient5-fluent.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+ org.apache.httpcomponents.client5
+ httpclient5
+ ${httpclient5.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+ org.mock-server
+ mockserver-netty
+ ${mockserver.version}
+
+
com.github.tomakehurst
wiremock
@@ -76,8 +118,13 @@
4.1.4
+ 5.6.1
2.5.1
4.5.8
+
+ 5.2
+ 5.2
+ 5.2
-
\ No newline at end of file
+
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
new file mode 100644
index 0000000000..988a89e7af
--- /dev/null
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
@@ -0,0 +1,79 @@
+package com.baeldung.httpclient;
+
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URISyntaxException;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.integration.ClientAndServer;
+
+public class GetRequestMockServer {
+
+ public static ClientAndServer mockServer;
+ public static String serviceOneUrl;
+ public static String serviceTwoUrl;
+
+ public static int serverPort;
+
+ public static final String SERVER_ADDRESS = "127.0.0.1";
+ public static final String PATH_ONE = "/test1";
+ public static final String PATH_TWO = "/test2";
+ public static final String METHOD = "GET";
+
+ @BeforeAll
+ static void startServer() throws IOException {
+ serverPort = getFreePort();
+ System.out.println("Free port "+serverPort);
+ serviceOneUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_ONE;
+ serviceTwoUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_TWO;
+ mockServer = startClientAndServer(serverPort);
+ mockGetRequest();
+ }
+
+ @AfterAll
+ static void stopServer() {
+ mockServer.stop();
+ }
+
+ private static void mockGetRequest() {
+ new MockServerClient(SERVER_ADDRESS, serverPort)
+ .when(
+ request()
+ .withPath(PATH_ONE)
+ .withMethod(METHOD),
+ exactly(5)
+ )
+ .respond(
+ response()
+ .withStatusCode(HttpStatus.SC_OK)
+ .withBody("{\"status\":\"ok\"}")
+ );
+ new MockServerClient(SERVER_ADDRESS, serverPort)
+ .when(
+ request()
+ .withPath(PATH_TWO)
+ .withMethod(METHOD),
+ exactly(1)
+ )
+ .respond(
+ response()
+ .withStatusCode(HttpStatus.SC_OK)
+ .withBody("{\"status\":\"ok\"}")
+ );
+ }
+
+ private static int getFreePort () throws IOException {
+ try (ServerSocket serverSocket = new ServerSocket(0)) {
+ return serverSocket.getLocalPort();
+ }
+ }
+
+}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
index 082c282306..123c51bb86 100644
--- a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
@@ -1,7 +1,7 @@
package com.baeldung.httpclient;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
@@ -9,30 +9,37 @@ import java.util.concurrent.Future;
import javax.net.ssl.SSLContext;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.TrustStrategy;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.apache.http.impl.nio.client.HttpAsyncClients;
-import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
-import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.ssl.SSLContexts;
-import org.junit.Test;
+import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
+import org.junit.jupiter.api.Test;
-public class HttpAsyncClientLiveTest {
+import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
+import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
+import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
+import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
+import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.cookie.BasicClientCookie;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
+import org.apache.hc.core5.concurrent.FutureCallback;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.ssl.TrustStrategy;
+
+
+class HttpAsyncClientLiveTest extends GetRequestMockServer {
private static final String HOST = "http://www.google.com";
private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
@@ -48,23 +55,33 @@ public class HttpAsyncClientLiveTest {
// tests
@Test
- public void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
- final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
- client.start();
- final HttpGet request = new HttpGet(HOST);
+ void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
+ final HttpHost target = new HttpHost(HOST_WITH_COOKIE);
+ final SimpleHttpRequest request = SimpleRequestBuilder.get()
+ .setHttpHost(target)
+ .build();
- final Future future = client.execute(request, null);
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom().build();
+ client.start();
+
+
+ final Future future = client.execute(request, null);
final HttpResponse response = future.get();
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ assertThat(response.getCode(), equalTo(200));
client.close();
}
@Test
- public void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
- final ConnectingIOReactor ioReactor = new DefaultConnectingIOReactor();
- final PoolingNHttpClientConnectionManager cm = new PoolingNHttpClientConnectionManager(ioReactor);
- final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setConnectionManager(cm).build();
+ void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
+ final IOReactorConfig ioReactorConfig = IOReactorConfig
+ .custom()
+ .build();
+
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
+ .setIOReactorConfig(ioReactorConfig)
+ .build();
+
client.start();
final String[] toGet = { "http://www.google.com/", "http://www.apache.org/", "http://www.bing.com/" };
@@ -85,36 +102,53 @@ public class HttpAsyncClientLiveTest {
}
@Test
- public void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
- final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
+ void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
+ final HttpHost proxy = new HttpHost("127.0.0.1", GetRequestMockServer.serverPort);
+ DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
+ .setRoutePlanner(routePlanner)
+ .build();
client.start();
- final HttpHost proxy = new HttpHost("127.0.0.1", 8080);
- final RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
- final HttpGet request = new HttpGet(HOST_WITH_PROXY);
- request.setConfig(config);
- final Future future = client.execute(request, null);
- final HttpResponse response = future.get();
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+
+ final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,HOST_WITH_PROXY);
+ final Future future = client.execute(request, null);
+ final HttpResponse response = future.get();
+ assertThat(response.getCode(), equalTo(200));
client.close();
}
@Test
- public void whenUseSSLWithHttpAsyncClient_thenCorrect() throws Exception {
+ void whenUseSSLWithHttpAsyncClient_thenCorrect() throws Exception {
final TrustStrategy acceptingTrustStrategy = (certificate, authType) -> true;
- final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
- final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).setSSLContext(sslContext).build();
+ final SSLContext sslContext = SSLContexts.custom()
+ .loadTrustMaterial(null, acceptingTrustStrategy)
+ .build();
+
+ final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
+ .setSslContext(sslContext)
+ .build();
+
+ final PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder.create()
+ .setTlsStrategy(tlsStrategy)
+ .build();
+
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
+ .setConnectionManager(cm)
+ .build();
client.start();
- final HttpGet request = new HttpGet(HOST_WITH_SSL);
- final Future future = client.execute(request, null);
+
+ final SimpleHttpRequest request = new SimpleHttpRequest("GET",HOST_WITH_SSL);
+ final Future future = client.execute(request, null);
+
final HttpResponse response = future.get();
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ assertThat(response.getCode(), equalTo(200));
client.close();
}
@Test
- public void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception {
+ void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception {
final BasicCookieStore cookieStore = new BasicCookieStore();
final BasicClientCookie cookie = new BasicClientCookie(COOKIE_NAME, "1234");
cookie.setDomain(COOKIE_DOMAIN);
@@ -122,29 +156,36 @@ public class HttpAsyncClientLiveTest {
cookieStore.addCookie(cookie);
final CloseableHttpAsyncClient client = HttpAsyncClients.custom().build();
client.start();
- final HttpGet request = new HttpGet(HOST_WITH_COOKIE);
+ final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,HOST_WITH_COOKIE);
final HttpContext localContext = new BasicHttpContext();
localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
- final Future future = client.execute(request, localContext, null);
+ final Future future = client.execute(request, localContext, null);
+
final HttpResponse response = future.get();
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ assertThat(response.getCode(), equalTo(200));
client.close();
}
@Test
- public void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception {
- final CredentialsProvider provider = new BasicCredentialsProvider();
- final UsernamePasswordCredentials creds = new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS);
- provider.setCredentials(AuthScope.ANY, creds);
- final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setDefaultCredentialsProvider(provider).build();
+ void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception {
+ final BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
+ final UsernamePasswordCredentials credentials =
+ new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS.toCharArray());
+ credsProvider.setCredentials(new AuthScope(URL_SECURED_BY_BASIC_AUTHENTICATION, 80) ,credentials);
+ final CloseableHttpAsyncClient client = HttpAsyncClients
+ .custom()
+ .setDefaultCredentialsProvider(credsProvider).build();
+
+ final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,URL_SECURED_BY_BASIC_AUTHENTICATION);
- final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION);
client.start();
- final Future future = client.execute(request, null);
+
+ final Future future = client.execute(request, null);
+
final HttpResponse response = future.get();
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ assertThat(response.getCode(), equalTo(200));
client.close();
}
@@ -163,9 +204,9 @@ public class HttpAsyncClientLiveTest {
@Override
public void run() {
try {
- final Future future = client.execute(request, context, null);
+ final Future future = client.execute(SimpleHttpRequest.copy(request), context, null);
final HttpResponse response = future.get();
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ assertThat(response.getCode(), equalTo(200));
} catch (final Exception ex) {
System.out.println(ex.getLocalizedMessage());
}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
new file mode 100644
index 0000000000..d19e0e1d86
--- /dev/null
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.httpclient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+class HttpClientCancelRequestLiveTest {
+
+ private static final String SAMPLE_URL = "http://www.github.com";
+
+ @Test
+ void whenRequestIsCanceled_thenCorrect() throws IOException {
+ HttpGet request = new HttpGet(SAMPLE_URL);
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ httpClient.execute(request, response -> {
+ HttpEntity entity = response.getEntity();
+
+ System.out.println("----------------------------------------");
+ System.out.println(response.getCode());
+ if (entity != null) {
+ System.out.println("Response content length: " + entity.getContentLength());
+ }
+ System.out.println("----------------------------------------");
+ // Do not feel like reading the response body
+ // Call abort on the request object
+ request.abort();
+
+ assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+ return response;
+ });
+ }
+ }
+}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
index 7576e49034..720049378b 100644
--- a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
@@ -1,19 +1,24 @@
package com.baeldung.httpclient;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.mime.HttpMultipartMode;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.mime.FileBody;
+import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.client5.http.entity.mime.StringBody;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpStatus;
import java.io.BufferedReader;
import java.io.File;
@@ -22,14 +27,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import com.baeldung.httpclient.handler.CustomHttpClientResponseHandler;
-public class HttpClientMultipartLiveTest {
+class HttpClientMultipartLiveTest {
// No longer available
// private static final String SERVER = "http://echo.200please.com";
@@ -38,41 +39,16 @@ public class HttpClientMultipartLiveTest {
private static final String TEXTFILENAME = "temp.txt";
private static final String IMAGEFILENAME = "image.jpg";
private static final String ZIPFILENAME = "zipFile.zip";
- private static final Logger LOGGER = Logger.getLogger("com.baeldung.httpclient.HttpClientMultipartLiveTest");
- private CloseableHttpClient client;
private HttpPost post;
private BufferedReader rd;
- private CloseableHttpResponse response;
- @Before
- public final void before() {
- client = HttpClientBuilder.create()
- .build();
+ @BeforeEach
+ public void before() {
post = new HttpPost(SERVER);
}
- @After
- public final void after() throws IllegalStateException, IOException {
- post.completed();
- try {
- client.close();
- } catch (final IOException e1) {
- LOGGER.log(Level.SEVERE, e1.getMessage(), e1);
- throw e1;
- }
- try {
- rd.close();
- } catch (final IOException e) {
- LOGGER.log(Level.SEVERE, e.getMessage(), e);
- throw e;
- }
- ResponseUtil.closeResponse(response);
- }
-
- // tests
-
@Test
- public final void givenFileandMultipleTextParts_whenUploadwithAddPart_thenNoExceptions() throws IOException {
+ void givenFileandMultipleTextParts_whenUploadwithAddPart_thenNoExceptions() throws IOException {
final URL url = Thread.currentThread()
.getContextClassLoader()
.getResource("uploads/" + TEXTFILENAME);
@@ -83,53 +59,61 @@ public class HttpClientMultipartLiveTest {
final StringBody stringBody2 = new StringBody("This is message 2", ContentType.MULTIPART_FORM_DATA);
//
final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
- builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+ builder.setMode(HttpMultipartMode.LEGACY);
builder.addPart("file", fileBody);
builder.addPart("text1", stringBody1);
builder.addPart("text2", stringBody2);
final HttpEntity entity = builder.build();
- //
- post.setEntity(entity);
- response = client.execute(post);
- final int statusCode = response.getStatusLine()
- .getStatusCode();
- final String responseString = getContent();
- final String contentTypeInHeader = getContentTypeHeader();
- assertThat(statusCode, equalTo(HttpStatus.SC_OK));
- // assertTrue(responseString.contains("Content-Type: multipart/form-data;"));
- assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
- System.out.println(responseString);
- System.out.println("POST Content Type: " + contentTypeInHeader);
+ post.setEntity(entity);
+ try(CloseableHttpClient client = HttpClientBuilder.create()
+ .build();
+
+ CloseableHttpResponse response = (CloseableHttpResponse) client
+ .execute(post, new CustomHttpClientResponseHandler())){
+ final int statusCode = response.getCode();
+ final String responseString = getContent(response.getEntity());
+ final String contentTypeInHeader = getContentTypeHeader();
+
+ assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+ assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+ System.out.println(responseString);
+ System.out.println("POST Content Type: " + contentTypeInHeader);
+ }
}
@Test
- public final void givenFileandTextPart_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoExeption() throws IOException {
+ void givenFileandTextPart_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoExeption() throws IOException {
final URL url = Thread.currentThread()
.getContextClassLoader()
.getResource("uploads/" + TEXTFILENAME);
final File file = new File(url.getPath());
final String message = "This is a multipart post";
final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
- builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+ builder.setMode(HttpMultipartMode.LEGACY);
builder.addBinaryBody("file", file, ContentType.DEFAULT_BINARY, TEXTFILENAME);
builder.addTextBody("text", message, ContentType.DEFAULT_BINARY);
final HttpEntity entity = builder.build();
post.setEntity(entity);
- response = client.execute(post);
- final int statusCode = response.getStatusLine()
- .getStatusCode();
- final String responseString = getContent();
- final String contentTypeInHeader = getContentTypeHeader();
- assertThat(statusCode, equalTo(HttpStatus.SC_OK));
- // assertTrue(responseString.contains("Content-Type: multipart/form-data;"));
- assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
- System.out.println(responseString);
- System.out.println("POST Content Type: " + contentTypeInHeader);
+
+ try(CloseableHttpClient client = HttpClientBuilder.create()
+ .build();
+
+ CloseableHttpResponse response = (CloseableHttpResponse) client
+ .execute(post, new CustomHttpClientResponseHandler())){
+
+ final int statusCode = response.getCode();
+ final String responseString = getContent(response.getEntity());
+ final String contentTypeInHeader = getContentTypeHeader();
+ assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+ assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+ System.out.println(responseString);
+ System.out.println("POST Content Type: " + contentTypeInHeader);
+ }
}
@Test
- public final void givenFileAndInputStreamandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException {
+ void givenFileAndInputStreamandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException {
final URL url = Thread.currentThread()
.getContextClassLoader()
.getResource("uploads/" + ZIPFILENAME);
@@ -140,64 +124,75 @@ public class HttpClientMultipartLiveTest {
final File file = new File(url2.getPath());
final String message = "This is a multipart post";
final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
- builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+ builder.setMode(HttpMultipartMode.LEGACY);
builder.addBinaryBody("file", file, ContentType.DEFAULT_BINARY, IMAGEFILENAME);
builder.addBinaryBody("upstream", inputStream, ContentType.create("application/zip"), ZIPFILENAME);
builder.addTextBody("text", message, ContentType.TEXT_PLAIN);
final HttpEntity entity = builder.build();
post.setEntity(entity);
- response = client.execute(post);
- final int statusCode = response.getStatusLine()
- .getStatusCode();
- final String responseString = getContent();
- final String contentTypeInHeader = getContentTypeHeader();
- assertThat(statusCode, equalTo(HttpStatus.SC_OK));
- // assertTrue(responseString.contains("Content-Type: multipart/form-data;"));
- assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
- System.out.println(responseString);
- System.out.println("POST Content Type: " + contentTypeInHeader);
- inputStream.close();
+
+ try(CloseableHttpClient client = HttpClientBuilder.create()
+ .build();
+
+ CloseableHttpResponse response = (CloseableHttpResponse) client
+ .execute(post, new CustomHttpClientResponseHandler())){
+
+ final int statusCode = response.getCode();
+ final String responseString = getContent(response.getEntity());
+ final String contentTypeInHeader = getContentTypeHeader();
+ assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+ assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+ System.out.println(responseString);
+ System.out.println("POST Content Type: " + contentTypeInHeader);
+ inputStream.close();
+ }
}
@Test
- public final void givenCharArrayandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException {
+ void givenCharArrayandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException {
final String message = "This is a multipart post";
final byte[] bytes = "binary code".getBytes();
final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
- builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+ builder.setMode(HttpMultipartMode.LEGACY);
builder.addBinaryBody("file", bytes, ContentType.DEFAULT_BINARY, TEXTFILENAME);
builder.addTextBody("text", message, ContentType.TEXT_PLAIN);
final HttpEntity entity = builder.build();
post.setEntity(entity);
- response = client.execute(post);
- final int statusCode = response.getStatusLine()
- .getStatusCode();
- final String responseString = getContent();
- final String contentTypeInHeader = getContentTypeHeader();
- assertThat(statusCode, equalTo(HttpStatus.SC_OK));
- // assertTrue(responseString.contains("Content-Type: multipart/form-data;"));
- assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
- System.out.println(responseString);
- System.out.println("POST Content Type: " + contentTypeInHeader);
+
+ try(CloseableHttpClient client = HttpClientBuilder.create()
+ .build();
+
+ CloseableHttpResponse response = (CloseableHttpResponse) client
+ .execute(post, new CustomHttpClientResponseHandler())){
+
+ final int statusCode = response.getCode();
+ final String responseString = getContent(response.getEntity());
+ final String contentTypeInHeader = getContentTypeHeader();
+ assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+ assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+ System.out.println(responseString);
+ System.out.println("POST Content Type: " + contentTypeInHeader);
+ }
+
}
// UTIL
- private String getContent() throws IOException {
- rd = new BufferedReader(new InputStreamReader(response.getEntity()
- .getContent()));
+ private String getContent(HttpEntity httpEntity) throws IOException {
+ rd = new BufferedReader(new InputStreamReader(httpEntity.getContent()));
String body = "";
StringBuilder content = new StringBuilder();
while ((body = rd.readLine()) != null) {
- content.append(body).append("\n");
+ content.append(body)
+ .append("\n");
}
- return content.toString().trim();
+ return content.toString()
+ .trim();
}
- private String getContentTypeHeader() throws IOException {
+ private String getContentTypeHeader() {
return post.getEntity()
- .getContentType()
- .toString();
+ .getContentType();
}
}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
index 9a03ab02a5..04fad84333 100644
--- a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
@@ -1,98 +1,61 @@
package com.baeldung.httpclient;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.LaxRedirectStrategy;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
import java.io.IOException;
-import java.util.Arrays;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class HttpClientRedirectLiveTest {
-
- private CloseableHttpClient instance;
-
- private CloseableHttpResponse response;
-
- @Before
- public final void before() {
- instance = HttpClientBuilder.create().build();
- }
-
- @After
- public final void after() throws IllegalStateException, IOException {
- ResponseUtil.closeResponse(response);
- }
-
- // tests
+class HttpClientRedirectLiveTest {
@Test
- public final void givenRedirectsAreDisabledViaNewApi_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
- instance = HttpClients.custom().disableRedirectHandling().build();
+ void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
- final HttpGet httpGet = new HttpGet("http://t.co/I5YYd9tddw");
- response = instance.execute(httpGet);
+ final HttpGet request = new HttpGet("http://t.co/I5YYd9tddw");
- assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
+ try (CloseableHttpClient httpClient = HttpClients.custom()
+ .disableRedirectHandling()
+ .build()) {
+ httpClient.execute(request, response -> {
+ assertThat(response.getCode(), equalTo(301));
+ return response;
+ });
+ }
}
@Test
- public final void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
- instance = HttpClientBuilder.create().disableRedirectHandling().build();
- response = instance.execute(new HttpGet("http://t.co/I5YYd9tddw"));
- assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
- }
+ void givenRedirectingPOST_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
- // redirect with POST
+ final HttpPost request = new HttpPost("http://t.co/I5YYd9tddw");
- @Test
- public final void givenPostRequest_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
- instance = HttpClientBuilder.create().build();
- response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
- assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
+ try (CloseableHttpClient httpClient = HttpClientBuilder.create()
+ .build()) {
+ httpClient.execute(request, response -> {
+ assertThat(response.getCode(), equalTo(200));
+ return response;
+ });
+ }
}
@Test
- public final void givenRedirectingPOSTViaPost4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
- final CloseableHttpClient client = HttpClients.custom().setRedirectStrategy(new DefaultRedirectStrategy() {
- /** Redirectable methods. */
- private final String[] REDIRECT_METHODS = new String[]{HttpGet.METHOD_NAME, HttpPost.METHOD_NAME, HttpHead.METHOD_NAME};
+ void givenRedirectingPOST_whenUsingDefaultRedirectStrategy_thenRedirected() throws IOException {
- @Override
- protected boolean isRedirectable(final String method) {
- return Arrays.stream(REDIRECT_METHODS)
- .anyMatch(m -> m.equalsIgnoreCase(method));
- }
- }).build();
+ final HttpPost request = new HttpPost("http://t.co/I5YYd9tddw");
- response = client.execute(new HttpPost("http://t.co/I5YYd9tddw"));
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ try (CloseableHttpClient httpClient = HttpClientBuilder.create()
+ .setRedirectStrategy(new DefaultRedirectStrategy())
+ .build()) {
+ httpClient.execute(request, response -> {
+ assertThat(response.getCode(), equalTo(200));
+ return response;
+ });
+ }
}
-
- @Test
- public final void givenRedirectingPOSTVia4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
- final CloseableHttpClient client = HttpClients.custom().setRedirectStrategy(new LaxRedirectStrategy()).build();
-
- response = client.execute(new HttpPost("http://t.co/I5YYd9tddw"));
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
- }
-
- @Test
- public final void givenRedirectingPOST_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
- instance = HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
- response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
- assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
- }
-
}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
index ef12c37412..4173909f7d 100644
--- a/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
@@ -1,8 +1,8 @@
package com.baeldung.httpclient.base;
import com.baeldung.httpclient.ResponseUtil;
+
import org.apache.http.Header;
-import org.apache.http.HttpEntity;
import org.apache.http.HttpHeaders;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -10,7 +10,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.junit.After;
import org.junit.Before;
@@ -73,30 +72,4 @@ public class HttpClientLiveTest {
assertThat(headers, not(emptyArray()));
}
- // tests - cancel request
-
- @Test
- public final void whenRequestIsCanceled_thenCorrect() throws IOException {
- instance = HttpClients.custom().build();
- final HttpGet request = new HttpGet(SAMPLE_URL);
- response = instance.execute(request);
-
- try {
- final HttpEntity entity = response.getEntity();
-
- System.out.println("----------------------------------------");
- System.out.println(response.getStatusLine());
- if (entity != null) {
- System.out.println("Response content length: " + entity.getContentLength());
- }
- System.out.println("----------------------------------------");
-
- // Do not feel like reading the response body
- // Call abort on the request object
- request.abort();
- } finally {
- response.close();
- }
- }
-
}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/handler/CustomHttpClientResponseHandler.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/handler/CustomHttpClientResponseHandler.java
new file mode 100644
index 0000000000..0559854b35
--- /dev/null
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/handler/CustomHttpClientResponseHandler.java
@@ -0,0 +1,11 @@
+package com.baeldung.httpclient.handler;
+
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
+
+public class CustomHttpClientResponseHandler implements HttpClientResponseHandler {
+ @Override
+ public ClassicHttpResponse handleResponse(ClassicHttpResponse response) {
+ return response;
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/.gitignore b/apache-httpclient4/.gitignore
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/.gitignore
rename to apache-httpclient4/.gitignore
diff --git a/apache-httpclient4/README.md b/apache-httpclient4/README.md
new file mode 100644
index 0000000000..0bc4ac8e83
--- /dev/null
+++ b/apache-httpclient4/README.md
@@ -0,0 +1,19 @@
+## Apache HttpClient 4
+
+This module contains articles about Apache HttpClient 4.5
+
+### Relevant Articles
+
+- [Apache HttpClient – Cancel Request](https://www.baeldung.com/httpclient-cancel-request)
+- [Apache HttpClient with SSL](https://www.baeldung.com/httpclient-ssl)
+- [Apache HttpClient Timeout](https://www.baeldung.com/httpclient-timeout)
+- [Custom HTTP Header with the Apache HttpClient](https://www.baeldung.com/httpclient-custom-http-header)
+- [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
+- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
+- [Retrying Requests using Apache HttpClient](https://www.baeldung.com/java-retrying-requests-using-apache-httpclient)
+- [Apache HttpClient – Follow Redirects for POST](https://www.baeldung.com/httpclient-redirect-on-http-post)
+
+### Running the Tests
+To run the live tests, use the command: mvn clean install -Plive
+This will start an embedded Jetty server on port 8082 using the Cargo plugin configured in the pom.xml file,
+for the live Maven profile
diff --git a/apache-httpclient4/pom.xml b/apache-httpclient4/pom.xml
new file mode 100644
index 0000000000..e0bf9dd5f6
--- /dev/null
+++ b/apache-httpclient4/pom.xml
@@ -0,0 +1,298 @@
+
+
+ 4.0.0
+ apache-httpclient4
+ 0.1-SNAPSHOT
+ apache-httpclient4
+ war
+
+
+ com.baeldung
+ parent-spring-5
+ 0.0.1-SNAPSHOT
+ ../parent-spring-5
+
+
+
+
+
+ org.springframework.security
+ spring-security-web
+ ${spring-security.version}
+
+
+ org.springframework.security
+ spring-security-config
+ ${spring-security.version}
+
+
+
+ org.springframework
+ spring-core
+ ${spring.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.springframework
+ spring-context
+ ${spring.version}
+
+
+ org.springframework
+ spring-jdbc
+ ${spring.version}
+
+
+ org.springframework
+ spring-beans
+ ${spring.version}
+
+
+ org.springframework
+ spring-aop
+ ${spring.version}
+
+
+ org.springframework
+ spring-tx
+ ${spring.version}
+
+
+ org.springframework
+ spring-expression
+ ${spring.version}
+
+
+ org.springframework
+ spring-web
+ ${spring.version}
+
+
+ org.springframework
+ spring-webmvc
+ ${spring.version}
+
+
+ org.springframework
+ spring-oxm
+ ${spring.version}
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}
+
+
+ org.apache.httpcomponents
+ httpcore
+ ${httpcore.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ ${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.apache.httpcomponents
+ fluent-hc
+ ${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.apache.httpcomponents
+ httpmime
+ ${httpclient.version}
+
+
+ commons-codec
+ commons-codec
+ ${commons-codec.version}
+
+
+ org.apache.httpcomponents
+ httpasyncclient
+ ${httpasyncclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.mock-server
+ mockserver-netty
+ ${mockserver.version}
+
+
+ com.github.tomakehurst
+ wiremock
+ ${wiremock.version}
+ test
+
+
+
+ javax.servlet
+ javax.servlet-api
+ ${javax.servlet-api.version}
+ provided
+
+
+ javax.servlet
+ jstl
+ ${jstl.version}
+ runtime
+
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+
+ org.springframework
+ spring-test
+ ${spring.version}
+ test
+
+
+
+
+ httpclient-simple
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ ${maven-war-plugin.version}
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
+ ${cargo-maven2-plugin.version}
+
+ true
+
+ jetty8x
+ embedded
+
+
+
+
+
+
+ 8082
+
+
+
+
+
+
+
+
+
+ live
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
+
+
+ start-server
+ pre-integration-test
+
+ start
+
+
+
+ stop-server
+ post-integration-test
+
+ stop
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ integration-test
+
+ test
+
+
+
+ none
+
+
+ **/*LiveTest.java
+
+
+ cargo
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.10
+ 4.1.5
+
+ 2.5.1
+ 4.4.16
+ 4.5.14
+ 5.11.2
+
+ 1.6.1
+ 3.3.2
+
+
+
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java b/apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
new file mode 100644
index 0000000000..cafd8cfb7b
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
@@ -0,0 +1,30 @@
+package com.baeldung.basic;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MyBasicAuthenticationEntryPoint extends BasicAuthenticationEntryPoint {
+
+ @Override
+ public void commence(final HttpServletRequest request, final HttpServletResponse response, final AuthenticationException authException) throws IOException {
+ response.addHeader("WWW-Authenticate", "Basic realm=\"" + getRealmName() + "\"");
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ final PrintWriter writer = response.getWriter();
+ writer.println("HTTP Status " + HttpServletResponse.SC_UNAUTHORIZED + " - " + authException.getMessage());
+ }
+
+ @Override
+ public void afterPropertiesSet() {
+ setRealmName("Baeldung");
+ super.afterPropertiesSet();
+ }
+
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
new file mode 100644
index 0000000000..81f82a2c1c
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
@@ -0,0 +1,39 @@
+package com.baeldung.client;
+
+import java.net.URI;
+
+import org.apache.http.HttpHost;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+
+public class HttpComponentsClientHttpRequestFactoryBasicAuth extends HttpComponentsClientHttpRequestFactory {
+
+ HttpHost host;
+
+ public HttpComponentsClientHttpRequestFactoryBasicAuth(HttpHost host) {
+ super();
+ this.host = host;
+ }
+
+ protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) {
+ return createHttpContext();
+ }
+
+ private HttpContext createHttpContext() {
+
+ AuthCache authCache = new BasicAuthCache();
+
+ BasicScheme basicAuth = new BasicScheme();
+ authCache.put(host, basicAuth);
+
+ BasicHttpContext localcontext = new BasicHttpContext();
+ localcontext.setAttribute(HttpClientContext.AUTH_CACHE, authCache);
+ return localcontext;
+ }
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java b/apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
new file mode 100644
index 0000000000..aac4f8cebd
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
@@ -0,0 +1,44 @@
+package com.baeldung.client;
+
+import org.apache.http.HttpHost;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class RestTemplateFactory implements FactoryBean, InitializingBean {
+ private RestTemplate restTemplate;
+
+ public RestTemplateFactory() {
+ super();
+ }
+
+ // API
+
+ @Override
+ public RestTemplate getObject() {
+ return restTemplate;
+ }
+
+ @Override
+ public Class getObjectType() {
+ return RestTemplate.class;
+ }
+
+ @Override
+ public boolean isSingleton() {
+ return true;
+ }
+
+ @Override
+ public void afterPropertiesSet() {
+ HttpHost host = new HttpHost("localhost", 8082, "http");
+ final ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactoryBasicAuth(host);
+ restTemplate = new RestTemplate(requestFactory);
+ restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor("user1", "user1Pass"));
+ }
+
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java b/apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
new file mode 100644
index 0000000000..03994b55a5
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
@@ -0,0 +1,16 @@
+package com.baeldung.client.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("com.baeldung.client")
+public class ClientConfig {
+
+ public ClientConfig() {
+ super();
+ }
+
+ // beans
+
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
new file mode 100644
index 0000000000..6bb12610fa
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
@@ -0,0 +1,18 @@
+package com.baeldung.filter;
+
+import org.springframework.web.filter.GenericFilterBean;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
+
+public class CustomFilter extends GenericFilterBean {
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ chain.doFilter(request, response);
+ }
+
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
new file mode 100644
index 0000000000..fb597e46c8
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
@@ -0,0 +1,49 @@
+package com.baeldung.filter;
+
+import com.baeldung.security.RestAuthenticationEntryPoint;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+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.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+public class CustomWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
+
+ @Autowired private RestAuthenticationEntryPoint authenticationEntryPoint;
+
+ @Autowired
+ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+ auth
+ .inMemoryAuthentication()
+ .withUser("user1")
+ .password(passwordEncoder().encode("user1Pass"))
+ .authorities("ROLE_USER");
+ }
+
+ @Override
+ protected void configure(HttpSecurity http) throws Exception {
+ http
+ .authorizeRequests()
+ .antMatchers("/securityNone")
+ .permitAll()
+ .anyRequest()
+ .authenticated()
+ .and()
+ .httpBasic()
+ .authenticationEntryPoint(authenticationEntryPoint);
+
+ http.addFilterAfter(new CustomFilter(), BasicAuthenticationFilter.class);
+ }
+
+ @Bean
+ public PasswordEncoder passwordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java b/apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
new file mode 100644
index 0000000000..7dc53e3e1e
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
@@ -0,0 +1,48 @@
+package com.baeldung.security;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
+import org.springframework.security.web.savedrequest.RequestCache;
+import org.springframework.security.web.savedrequest.SavedRequest;
+import org.springframework.util.StringUtils;
+
+public class MySavedRequestAwareAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
+
+ private RequestCache requestCache = new HttpSessionRequestCache();
+
+ @Override
+ public void onAuthenticationSuccess(final HttpServletRequest request, final HttpServletResponse response, final Authentication authentication) throws ServletException, IOException {
+ final SavedRequest savedRequest = requestCache.getRequest(request, response);
+
+ if (savedRequest == null) {
+ super.onAuthenticationSuccess(request, response, authentication);
+
+ return;
+ }
+ final String targetUrlParameter = getTargetUrlParameter();
+ if (isAlwaysUseDefaultTargetUrl() || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
+ requestCache.removeRequest(request, response);
+ super.onAuthenticationSuccess(request, response, authentication);
+
+ return;
+ }
+
+ clearAuthenticationAttributes(request);
+
+ // Use the DefaultSavedRequest URL
+ // final String targetUrl = savedRequest.getRedirectUrl();
+ // logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
+ // getRedirectStrategy().sendRedirect(request, response, targetUrl);
+ }
+
+ public void setRequestCache(final RequestCache requestCache) {
+ this.requestCache = requestCache;
+ }
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java b/apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
new file mode 100644
index 0000000000..1ae89adb89
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
@@ -0,0 +1,23 @@
+package com.baeldung.security;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+/**
+ * The Entry Point will not redirect to any sort of Login - it will return the 401
+ */
+@Component
+public final class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
+
+ @Override
+ public void commence(final HttpServletRequest request, final HttpServletResponse response, final AuthenticationException authException) throws IOException {
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
+ }
+
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
new file mode 100644
index 0000000000..4ba9d47f8d
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+
+@Configuration
+@ImportResource({ "classpath:webSecurityConfig.xml" })
+@ComponentScan("com.baeldung.security")
+public class SecSecurityConfig {
+
+ public SecSecurityConfig() {
+ super();
+ }
+
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java b/apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
new file mode 100644
index 0000000000..8d5c1dc7f1
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
@@ -0,0 +1,30 @@
+package com.baeldung.spring;
+
+import java.util.List;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan("com.baeldung.web")
+public class WebConfig implements WebMvcConfigurer {
+
+ public WebConfig() {
+ super();
+ }
+
+ // beans
+
+ @Override
+ public void configureMessageConverters(final List> converters) {
+ converters.add(new MappingJackson2HttpMessageConverter());
+ }
+
+ //
+
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java b/apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
new file mode 100644
index 0000000000..02e6af03af
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
@@ -0,0 +1,31 @@
+package com.baeldung.web.controller;
+
+import com.baeldung.web.dto.Bar;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "/bars")
+public class BarController {
+
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
+
+ public BarController() {
+ super();
+ }
+
+ // API
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+ @ResponseBody
+ public Bar findOne(@PathVariable("id") final Long id) {
+ return new Bar();
+ }
+
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java b/apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
new file mode 100644
index 0000000000..461a5e351a
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
@@ -0,0 +1,33 @@
+package com.baeldung.web.controller;
+
+import com.baeldung.web.dto.Foo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "/foos")
+public class FooController {
+
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
+
+ public FooController() {
+ super();
+ }
+
+ // API
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+ @ResponseBody
+ @PreAuthorize("hasRole('ROLE_USER')")
+ public Foo findOne(@PathVariable("id") final Long id) {
+ return new Foo();
+ }
+
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
new file mode 100644
index 0000000000..eb139b0ec1
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
@@ -0,0 +1,14 @@
+package com.baeldung.web.dto;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Bar implements Serializable {
+
+ public Bar() {
+ super();
+ }
+
+}
diff --git a/apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
new file mode 100644
index 0000000000..23cfab132d
--- /dev/null
+++ b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
@@ -0,0 +1,14 @@
+package com.baeldung.web.dto;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Foo implements Serializable {
+
+ public Foo() {
+ super();
+ }
+
+}
diff --git a/core-java-modules/core-java/src/main/resources/logback.xml b/apache-httpclient4/src/main/resources/logback.xml
similarity index 100%
rename from core-java-modules/core-java/src/main/resources/logback.xml
rename to apache-httpclient4/src/main/resources/logback.xml
diff --git a/apache-httpclient4/src/main/resources/webSecurityConfig.xml b/apache-httpclient4/src/main/resources/webSecurityConfig.xml
new file mode 100644
index 0000000000..2ff9a1de15
--- /dev/null
+++ b/apache-httpclient4/src/main/resources/webSecurityConfig.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml b/apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
new file mode 100644
index 0000000000..1dbff70b83
--- /dev/null
+++ b/apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/apache-httpclient4/src/main/webapp/WEB-INF/web.xml b/apache-httpclient4/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..4b2dd54266
--- /dev/null
+++ b/apache-httpclient4/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,43 @@
+
+
+
+ Spring Security Custom Application
+
+
+
+ contextClass
+ org.springframework.web.context.support.AnnotationConfigWebApplicationContext
+
+
+ contextConfigLocation
+ com.baeldung.spring
+
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+
+
+ api
+ org.springframework.web.servlet.DispatcherServlet
+ 1
+
+
+ api
+ /api/*
+
+
+
+
+ springSecurityFilterChain
+ org.springframework.web.filter.DelegatingFilterProxy
+
+
+ springSecurityFilterChain
+ /*
+
+
+
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
new file mode 100644
index 0000000000..2785bc5d08
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
@@ -0,0 +1,99 @@
+package com.baeldung.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContexts;
+
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+
+class ClientLiveTest {
+
+ final String urlOverHttps = "http://localhost:8082/httpclient-simple/api/bars/1";
+
+ @Test
+ void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk_2() throws GeneralSecurityException {
+
+ final TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
+ final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
+ final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+ final Registry socketFactoryRegistry = RegistryBuilder. create()
+ .register("https", sslsf)
+ .register("http", new PlainConnectionSocketFactory())
+ .build();
+
+ final BasicHttpClientConnectionManager connectionManager = new BasicHttpClientConnectionManager(socketFactoryRegistry);
+ final CloseableHttpClient httpClient = HttpClients.custom()
+ .setSSLSocketFactory(sslsf)
+ .setConnectionManager(connectionManager)
+ .build();
+
+ final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+ final ResponseEntity response = new RestTemplate(requestFactory).exchange(urlOverHttps, HttpMethod.GET, null, String.class);
+ assertThat(response.getStatusCode().value(), equalTo(200));
+ }
+
+ @Test
+ void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenCorrect() throws IOException {
+ final HttpGet getMethod = new HttpGet(urlOverHttps);
+
+ try (final CloseableHttpClient httpClient = HttpClients.custom()
+ .setSSLHostnameVerifier(new NoopHostnameVerifier())
+ .build()) {
+
+ final HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+ }
+ }
+
+ @Test
+ void givenAcceptingAllCertificates_whenUsingRestTemplate_thenCorrect() {
+ final CloseableHttpClient httpClient = HttpClients.custom()
+ .setSSLHostnameVerifier(new NoopHostnameVerifier())
+ .build();
+ final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+ requestFactory.setHttpClient(httpClient);
+
+ final ResponseEntity response = new RestTemplate(requestFactory).exchange(urlOverHttps, HttpMethod.GET, null, String.class);
+ assertThat(response.getStatusCode().value(), equalTo(200));
+ }
+
+ @Test
+ void whenHttpsUrlIsConsumed_thenException() {
+ String urlOverHttps = "https://localhost:8082/httpclient-simple";
+ HttpGet getMethod = new HttpGet(urlOverHttps);
+
+ assertThrows(SSLPeerUnverifiedException.class, () -> {
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+ });
+ }
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java b/apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
new file mode 100644
index 0000000000..c336e6a068
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
@@ -0,0 +1,92 @@
+package com.baeldung.client;
+
+import static org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import javax.net.ssl.SSLContext;
+
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContexts;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * This test requires a localhost server over HTTPS
+ * It should only be manually run, not part of the automated build
+ * */
+public class RestClientV4LiveManualTest {
+
+ final String urlOverHttps = "http://localhost:8082/httpclient-simple/api/bars/1";
+
+ @Test
+ void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk_2() throws GeneralSecurityException {
+
+ final TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
+ final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
+ final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+ final Registry socketFactoryRegistry = RegistryBuilder. create()
+ .register("https", sslsf)
+ .register("http", new PlainConnectionSocketFactory())
+ .build();
+
+ final BasicHttpClientConnectionManager connectionManager = new BasicHttpClientConnectionManager(socketFactoryRegistry);
+ final CloseableHttpClient httpClient = HttpClients.custom()
+ .setSSLSocketFactory(sslsf)
+ .setConnectionManager(connectionManager)
+ .build();
+
+ final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+ final ResponseEntity response = new RestTemplate(requestFactory).exchange(urlOverHttps, HttpMethod.GET, null, String.class);
+ assertThat(response.getStatusCode().value(), equalTo(200));
+ }
+
+ @Test
+ void givenAcceptingAllCertificatesUsing4_4_whenHttpsUrlIsConsumed_thenCorrect() throws IOException {
+ final CloseableHttpClient httpClient = HttpClients.custom().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+
+ final HttpGet getMethod = new HttpGet(urlOverHttps);
+ final HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ }
+
+ @Test
+ void givenAcceptingAllCertificatesUsing4_4_whenUsingRestTemplate_thenCorrect(){
+ final CloseableHttpClient httpClient = HttpClients.custom().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+ final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+ requestFactory.setHttpClient(httpClient);
+
+ final ResponseEntity response = new RestTemplate(requestFactory).exchange(urlOverHttps, HttpMethod.GET, null, String.class);
+ assertThat(response.getStatusCode().value(), equalTo(200));
+ }
+
+ @Test
+ public void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException {
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ String urlOverHttps = "https://localhost:8082/httpclient-simple";
+ HttpGet getMethod = new HttpGet(urlOverHttps);
+ HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ }
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
new file mode 100644
index 0000000000..ae432e68f0
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
@@ -0,0 +1,77 @@
+package com.baeldung.httpclient;
+
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URISyntaxException;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.integration.ClientAndServer;
+
+public class GetRequestMockServer {
+
+ public static ClientAndServer mockServer;
+ public static String serviceOneUrl;
+ public static String serviceTwoUrl;
+
+ public static int serverPort;
+
+ public static final String SERVER_ADDRESS = "127.0.0.1";
+ public static final String PATH_ONE = "/test1";
+ public static final String PATH_TWO = "/test2";
+ public static final String METHOD = "GET";
+
+ @BeforeAll
+ static void startServer() throws IOException, URISyntaxException {
+ serverPort = getFreePort();
+ serviceOneUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_ONE;
+ serviceTwoUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_TWO;
+ mockServer = startClientAndServer(serverPort);
+ mockGetRequest();
+ }
+
+ @AfterAll
+ static void stopServer() {
+ mockServer.stop();
+ }
+
+ private static void mockGetRequest() {
+ new MockServerClient(SERVER_ADDRESS, serverPort)
+ .when(
+ request()
+ .withPath(PATH_ONE)
+ .withMethod(METHOD),
+ exactly(5)
+ )
+ .respond(
+ response()
+ .withStatusCode(HttpStatus.SC_OK)
+ .withBody("{\"status\":\"ok\"}")
+ );
+ new MockServerClient(SERVER_ADDRESS, serverPort)
+ .when(
+ request()
+ .withPath(PATH_TWO)
+ .withMethod(METHOD),
+ exactly(1)
+ )
+ .respond(
+ response()
+ .withStatusCode(HttpStatus.SC_OK)
+ .withBody("{\"status\":\"ok\"}")
+ );
+ }
+
+ private static int getFreePort () throws IOException {
+ try (ServerSocket serverSocket = new ServerSocket(0)) {
+ return serverSocket.getLocalPort();
+ }
+ }
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpAsyncClientV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpAsyncClientV4LiveTest.java
new file mode 100644
index 0000000000..e097f9f511
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpAsyncClientV4LiveTest.java
@@ -0,0 +1,175 @@
+package com.baeldung.httpclient;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
+import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
+import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.http.nio.reactor.ConnectingIOReactor;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.ssl.SSLContexts;
+import org.junit.jupiter.api.Test;
+
+
+class HttpAsyncClientV4LiveTest extends GetRequestMockServer {
+
+ private static final String HOST = "http://www.google.com";
+ private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
+ private static final String HOST_WITH_PROXY = "http://httpbin.org/";
+ private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://browserspy.dk/password-ok.php";// "http://localhost:8080/spring-security-rest-basic-auth/api/foos/1";
+ private static final String DEFAULT_USER = "test";// "user1";
+ private static final String DEFAULT_PASS = "test";// "user1Pass";
+
+ private static final String HOST_WITH_COOKIE = "http://yuilibrary.com/yui/docs/cookie/cookie-simple-example.html"; // "http://github.com";
+ private static final String COOKIE_DOMAIN = ".yuilibrary.com"; // ".github.com";
+ private static final String COOKIE_NAME = "example"; // "JSESSIONID";
+
+ // tests
+
+ @Test
+ void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
+ final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
+ client.start();
+ final HttpGet request = new HttpGet(HOST);
+
+ final Future future = client.execute(request, null);
+ final HttpResponse response = future.get();
+
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ client.close();
+ }
+
+ @Test
+ void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
+ final ConnectingIOReactor ioReactor = new DefaultConnectingIOReactor();
+ final PoolingNHttpClientConnectionManager cm = new PoolingNHttpClientConnectionManager(ioReactor);
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setConnectionManager(cm).build();
+ client.start();
+ final String[] toGet = { "http://www.google.com/", "http://www.apache.org/", "http://www.bing.com/" };
+
+ final GetThread[] threads = new GetThread[toGet.length];
+ for (int i = 0; i < threads.length; i++) {
+ final HttpGet request = new HttpGet(toGet[i]);
+ threads[i] = new GetThread(client, request);
+ }
+
+ for (final GetThread thread : threads) {
+ thread.start();
+ }
+
+ for (final GetThread thread : threads) {
+ thread.join();
+ }
+
+ }
+
+ @Test
+ void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
+ final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
+ client.start();
+ final HttpHost proxy = new HttpHost("127.0.0.1", GetRequestMockServer.serverPort);
+ final RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
+ final HttpGet request = new HttpGet(HOST_WITH_PROXY);
+ request.setConfig(config);
+ final Future future = client.execute(request, null);
+ final HttpResponse response = future.get();
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ client.close();
+ }
+
+ @Test
+ void whenUseSSLWithHttpAsyncClient_thenCorrect() throws Exception {
+ final TrustStrategy acceptingTrustStrategy = (certificate, authType) -> true;
+ final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
+
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).setSSLContext(sslContext).build();
+
+ client.start();
+ final HttpGet request = new HttpGet(HOST_WITH_SSL);
+ final Future future = client.execute(request, null);
+ final HttpResponse response = future.get();
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ client.close();
+ }
+
+ @Test
+ void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception {
+ final BasicCookieStore cookieStore = new BasicCookieStore();
+ final BasicClientCookie cookie = new BasicClientCookie(COOKIE_NAME, "1234");
+ cookie.setDomain(COOKIE_DOMAIN);
+ cookie.setPath("/");
+ cookieStore.addCookie(cookie);
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom().build();
+ client.start();
+ final HttpGet request = new HttpGet(HOST_WITH_COOKIE);
+
+ final HttpContext localContext = new BasicHttpContext();
+ localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
+
+ final Future future = client.execute(request, localContext, null);
+ final HttpResponse response = future.get();
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ client.close();
+ }
+
+ @Test
+ void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception {
+ final CredentialsProvider provider = new BasicCredentialsProvider();
+ final UsernamePasswordCredentials creds = new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS);
+ provider.setCredentials(AuthScope.ANY, creds);
+ final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setDefaultCredentialsProvider(provider).build();
+
+ final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION);
+ client.start();
+ final Future future = client.execute(request, null);
+ final HttpResponse response = future.get();
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ client.close();
+ }
+
+ static class GetThread extends Thread {
+
+ private final CloseableHttpAsyncClient client;
+ private final HttpContext context;
+ private final HttpGet request;
+
+ GetThread(final CloseableHttpAsyncClient client, final HttpGet request) {
+ this.client = client;
+ context = HttpClientContext.create();
+ this.request = request;
+ }
+
+ @Override
+ public void run() {
+ try {
+ final Future future = client.execute(request, context, null);
+ final HttpResponse response = future.get();
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ } catch (final Exception ex) {
+ System.out.println(ex.getLocalizedMessage());
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java
new file mode 100644
index 0000000000..226a7b8cf7
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java
@@ -0,0 +1,57 @@
+package com.baeldung.httpclient;
+
+import java.io.IOException;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class HttpClientCancelRequestV4LiveTest {
+
+ private static final String SAMPLE_URL = "http://www.github.com";
+
+ private CloseableHttpClient instance;
+
+ private CloseableHttpResponse response;
+
+ @Before
+ public final void before() {
+ instance = HttpClientBuilder.create().build();
+ }
+
+ @After
+ public final void after() throws IllegalStateException, IOException {
+ ResponseUtil.closeResponse(response);
+ }
+
+ @Test
+ public final void whenRequestIsCanceled_thenCorrect() throws IOException {
+ instance = HttpClients.custom().build();
+ final HttpGet request = new HttpGet(SAMPLE_URL);
+ response = instance.execute(request);
+
+ try {
+ final HttpEntity entity = response.getEntity();
+
+ System.out.println("----------------------------------------");
+ System.out.println(response.getStatusLine());
+ if (entity != null) {
+ System.out.println("Response content length: " + entity.getContentLength());
+ }
+ System.out.println("----------------------------------------");
+
+ // Do not feel like reading the response body
+ // Call abort on the request object
+ request.abort();
+ } finally {
+ response.close();
+ }
+ }
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
new file mode 100644
index 0000000000..eef813b3ff
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.httpclient;
+
+import java.io.IOException;
+import org.apache.http.HttpHeaders;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.junit.jupiter.api.Test;
+
+class HttpClientHeaderV4LiveTest {
+
+ private static final String SAMPLE_URL = "http://www.github.com";
+
+ @Test
+ void givenRequestBuildWithBuilder_whenRequestHasCustomContentType_thenCorrect() throws IOException {
+ HttpClient client = HttpClients.custom().build();
+ HttpUriRequest request = RequestBuilder.get()
+ .setUri(SAMPLE_URL)
+ .setHeader(HttpHeaders.CONTENT_TYPE, "application/json")
+ .build();
+ client.execute(request);
+ }
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientRedirectV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientRedirectV4LiveTest.java
new file mode 100644
index 0000000000..f6d65a8d8f
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientRedirectV4LiveTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.httpclient;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.LaxRedirectStrategy;
+
+class HttpClientRedirectV4LiveTest {
+ private CloseableHttpClient instance;
+
+ private CloseableHttpResponse response;
+
+ @BeforeEach
+ public final void before() {
+ instance = HttpClientBuilder.create()
+ .build();
+ }
+
+ @AfterEach
+ public final void after() throws IllegalStateException, IOException {
+ ResponseUtil.closeResponse(response);
+ }
+
+ @Test
+ void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
+ instance = HttpClients.custom()
+ .disableRedirectHandling()
+ .build();
+
+ final HttpGet httpGet = new HttpGet("http://t.co/I5YYd9tddw");
+ response = instance.execute(httpGet);
+
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(301));
+ }
+
+ // redirect with POST
+
+ @Test
+ void givenPostRequest_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
+ instance = HttpClientBuilder.create()
+ .build();
+ response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(301));
+ }
+
+ @Test
+ void givenRedirectingPOST_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
+ instance = HttpClientBuilder.create()
+ .setRedirectStrategy(new LaxRedirectStrategy())
+ .build();
+ response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+ }
+
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
new file mode 100644
index 0000000000..4d4dd7be15
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
@@ -0,0 +1,116 @@
+package com.baeldung.httpclient;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+class HttpClientTimeoutV4LiveTest {
+
+ private CloseableHttpResponse response;
+
+ @AfterEach
+ public final void after() throws IllegalStateException, IOException {
+ ResponseUtil.closeResponse(response);
+ }
+
+
+ @Test
+ void givenUsingNewApi_whenSettingTimeoutViaRequestConfig_thenCorrect() throws IOException {
+ final int timeout = 2;
+ final RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout * 1000).setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
+ final CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+ final HttpGet request = new HttpGet("http://www.github.com");
+
+ response = client.execute(request);
+
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ }
+
+ @Test
+ void givenUsingNewApi_whenSettingTimeoutViaSocketConfig_thenCorrect() throws IOException {
+ final int timeout = 2;
+
+ final SocketConfig config = SocketConfig.custom().setSoTimeout(timeout * 1000).build();
+ final CloseableHttpClient client = HttpClientBuilder.create().setDefaultSocketConfig(config).build();
+
+ final HttpGet request = new HttpGet("http://www.github.com");
+
+ response = client.execute(request);
+
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ }
+
+ @Test
+ void givenUsingNewApi_whenSettingTimeoutViaHighLevelApi_thenCorrect() throws IOException {
+ final int timeout = 5;
+
+ final RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout * 1000).setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
+ final CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+
+ final HttpGet request = new HttpGet("http://www.github.com");
+
+ response = client.execute(request);
+
+ assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+ }
+
+ /**
+ * This simulates a timeout against a domain with multiple routes/IPs to it (not a single raw IP)
+ */
+ @Test
+ @Disabled
+ void givenTimeoutIsConfigured_whenTimingOut_thenTimeoutException() throws IOException {
+ final int timeout = 3;
+
+ final RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout * 1000).setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
+ final CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+
+ final HttpGet request = new HttpGet("http://www.google.com:81");
+
+ assertThrows(ConnectTimeoutException.class, () -> {
+ client.execute(request);
+ });
+
+ }
+
+ @Test
+ void whenSecuredRestApiIsConsumed_then200OK() throws IOException {
+ CloseableHttpClient httpClient = HttpClientBuilder.create().build();
+
+ int timeout = 20; // seconds
+ RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout * 1000)
+ .setConnectTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
+ HttpGet getMethod = new HttpGet("http://localhost:8082/httpclient-simple/api/bars/1");
+ getMethod.setConfig(requestConfig);
+
+ int hardTimeout = 5; // seconds
+ TimerTask task = new TimerTask() {
+ @Override
+ public void run() {
+ getMethod.abort();
+ }
+ };
+ new Timer(true).schedule(task, hardTimeout * 1000);
+
+ HttpResponse response = httpClient.execute(getMethod);
+ System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode());
+ }
+
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
new file mode 100644
index 0000000000..6c7bcf9b08
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
@@ -0,0 +1,111 @@
+package com.baeldung.httpclient;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.ssl.SSLContexts;
+import org.junit.jupiter.api.Test;
+
+class HttpsClientV4SslLiveTest {
+
+
+ // "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1" // local
+ // "https://mms.nw.ru/" // hosted
+ private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
+
+ // tests
+
+ @Test
+ void whenHttpsUrlIsConsumed_thenException() {
+ final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
+
+ assertThrows(SSLHandshakeException.class, () -> {
+ final CloseableHttpClient httpClient = HttpClientBuilder
+ .create()
+ .build();
+ final HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+ });
+ }
+
+
+ @Test
+ void whenAcceptingAllCertificates_thenCanConsumeHttpsUriWithSelfSignedCertificate() throws IOException, GeneralSecurityException {
+ final TrustStrategy acceptingTrustStrategy = (certificate, authType) -> true;
+ final SSLContext sslContext = SSLContexts.custom()
+ .loadTrustMaterial(null, acceptingTrustStrategy)
+ .build();
+
+ final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+
+ final CloseableHttpClient httpClient = HttpClients.custom()
+ .setSSLSocketFactory(sslsf)
+ .build();
+
+ final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
+ final HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+
+ httpClient.close();
+ }
+
+ @Test
+ void using_builder_whenAcceptingAllCertificates_thenCanConsumeHttpsUriWithSelfSignedCertificate() throws IOException, GeneralSecurityException {
+ final SSLContext sslContext = new SSLContextBuilder()
+ .loadTrustMaterial(null, new TrustSelfSignedStrategy())
+ .build();
+ final NoopHostnameVerifier hostnameVerifier = new NoopHostnameVerifier();
+
+ final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
+ final CloseableHttpClient httpClient = HttpClients.custom()
+ .setSSLHostnameVerifier(hostnameVerifier)
+ .setSSLSocketFactory(sslsf)
+ .build();
+
+ final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
+ final HttpResponse response = httpClient.execute(getMethod);
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+ httpClient.close();
+
+ }
+
+ @Test
+ void givenIgnoringCertificates_whenHttpsUrlIsConsumed_thenCorrect() throws Exception {
+ final SSLContext sslContext = new SSLContextBuilder()
+ .loadTrustMaterial(null, (certificate, authType) -> true)
+ .build();
+
+ final CloseableHttpClient client = HttpClients.custom()
+ .setSSLContext(sslContext)
+ .setSSLHostnameVerifier(new NoopHostnameVerifier())
+ .build();
+ final HttpGet httpGet = new HttpGet(HOST_WITH_SSL);
+ httpGet.setHeader("Accept", "application/xml");
+
+ final HttpResponse response = client.execute(httpGet);
+ assertThat(response.getStatusLine()
+ .getStatusCode(), equalTo(200));
+ }
+
+}
\ No newline at end of file
diff --git a/httpclient-simple/src/test/java/com/baeldung/httpclient/ResponseUtil.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 100%
rename from httpclient-simple/src/test/java/com/baeldung/httpclient/ResponseUtil.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
similarity index 100%
rename from apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
new file mode 100644
index 0000000000..0d394b4ce7
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.httpclient.httpclient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.junit.jupiter.api.Test;
+
+class ApacheHttpClientUnitTest extends GetRequestMockServer {
+
+
+ @Test
+ void givenDeveloperUsedCloseableHttpResponse_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
+ try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+ HttpGet httpGet = new HttpGet(serviceOneUrl);
+ try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
+ HttpEntity entity = response.getEntity();
+ EntityUtils.consume(entity);
+ assertThat(response.getStatusLine().getStatusCode()).isEqualTo(HttpStatus.SC_OK);
+ }
+ }
+ }
+
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
new file mode 100644
index 0000000000..3473117cef
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
@@ -0,0 +1,78 @@
+package com.baeldung.httpclient.httpclient;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.integration.ClientAndServer;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URISyntaxException;
+
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+public class GetRequestMockServer {
+
+ public static ClientAndServer mockServer;
+ public static String serviceOneUrl;
+ public static String serviceTwoUrl;
+
+ private static int serverPort;
+
+ public static final String SERVER_ADDRESS = "127.0.0.1";
+ public static final String PATH_ONE = "/test1";
+ public static final String PATH_TWO = "/test2";
+ public static final String METHOD = "GET";
+
+ @BeforeAll
+ static void startServer() throws IOException, URISyntaxException {
+ serverPort = getFreePort();
+ serviceOneUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_ONE;
+ serviceTwoUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_TWO;
+ mockServer = startClientAndServer(serverPort);
+ mockGetRequest();
+ }
+
+ @AfterAll
+ static void stopServer() {
+ mockServer.stop();
+ }
+
+ private static void mockGetRequest() {
+ new MockServerClient(SERVER_ADDRESS, serverPort)
+ .when(
+ request()
+ .withPath(PATH_ONE)
+ .withMethod(METHOD),
+ exactly(5)
+ )
+ .respond(
+ response()
+ .withStatusCode(HttpStatus.SC_OK)
+ .withBody("{\"status\":\"ok\"}")
+ );
+ new MockServerClient(SERVER_ADDRESS, serverPort)
+ .when(
+ request()
+ .withPath(PATH_TWO)
+ .withMethod(METHOD),
+ exactly(1)
+ )
+ .respond(
+ response()
+ .withStatusCode(HttpStatus.SC_OK)
+ .withBody("{\"status\":\"ok\"}")
+ );
+ }
+
+ private static int getFreePort () throws IOException {
+ try (ServerSocket serverSocket = new ServerSocket(0)) {
+ return serverSocket.getLocalPort();
+ }
+ }
+
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
new file mode 100644
index 0000000000..4d88211d0d
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.httpclient.readresponsebodystring;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class ApacheHttpClientUnitTest {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+ public static final String DUMMY_URL = "https://postman-echo.com/get";
+
+ @Test
+ public void whenUseApacheHttpClient_thenCorrect() throws IOException {
+ HttpGet request = new HttpGet(DUMMY_URL);
+
+ try (CloseableHttpClient client = HttpClients.createDefault(); CloseableHttpResponse response = client.execute(request)) {
+ HttpEntity entity = response.getEntity();
+ logger.debug("Response -> {}", EntityUtils.toString(entity));
+ }
+ }
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryLiveTest.java
new file mode 100644
index 0000000000..3a8ff252c2
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryLiveTest.java
@@ -0,0 +1,168 @@
+package com.baeldung.httpclient.retry;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.Objects;
+
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPatch;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ApacheHttpClientRetryLiveTest {
+
+ private Integer requestCounter;
+ private CloseableHttpClient httpClient;
+
+ @BeforeEach
+ void setUp() {
+ requestCounter = 0;
+ }
+
+ @AfterEach
+ void tearDown() throws IOException {
+ if (httpClient != null) {
+ httpClient.close();
+ }
+ }
+
+ private void createDefaultApacheHttpClient() {
+ this.httpClient = HttpClientBuilder
+ .create()
+ .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> {
+ requestCounter++;
+ }).build();
+ }
+
+ private void createFailingHttpClient() {
+ this.httpClient = HttpClientBuilder
+ .create()
+ .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+ .addInterceptorLast((HttpResponseInterceptor) (httpResponse, httpContext) -> {
+ throw new IOException();
+ })
+ .build();
+ }
+
+ private void createHttpClientWithRetryHandler() {
+ this.httpClient = HttpClientBuilder
+ .create()
+ .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+ .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+ .setRetryHandler(new DefaultHttpRequestRetryHandler(6, true))
+ .build();
+ }
+
+ private void createHttpClientWithCustomRetryHandler() {
+ this.httpClient = HttpClientBuilder
+ .create()
+ .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+ .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+ .setRetryHandler((exception, executionCount, context) -> {
+ if (executionCount < 5 && Objects.equals("GET", ((HttpClientContext) context).getRequest().getRequestLine().getMethod())) {
+ return true;
+ } else {
+ return false;
+ }
+ })
+ .build();
+ }
+
+ private void createHttpClientWithRetriesDisabled() {
+ this.httpClient = HttpClientBuilder
+ .create()
+ .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+ .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+ .disableAutomaticRetries()
+ .build();
+ }
+
+ @Test
+ public void givenDefaultConfiguration_whenReceivedIOException_thenRetriesPerformed() {
+ createFailingHttpClient();
+ assertThrows(IOException.class, () -> httpClient.execute(new HttpGet("https://httpstat.us/200")));
+ assertThat(requestCounter).isEqualTo(4);
+ }
+
+ @Test
+ public void givenDefaultConfiguration_whenDomainNameNotResolved_thenNoRetryApplied() {
+ createDefaultApacheHttpClient();
+ HttpGet request = new HttpGet(URI.create("http://domain.that.does.not.exist:80/api/v1"));
+
+ assertThrows(UnknownHostException.class, () -> httpClient.execute(request));
+ assertThat(requestCounter).isEqualTo(1);
+ }
+
+ @Test
+ public void givenDefaultConfiguration_whenGotInternalServerError_thenNoRetryLogicApplied() throws IOException {
+ createDefaultApacheHttpClient();
+ HttpGet request = new HttpGet(URI.create("https://httpstat.us/500"));
+
+ CloseableHttpResponse response = assertDoesNotThrow(() -> httpClient.execute(request));
+ assertThat(response.getStatusLine().getStatusCode()).isEqualTo(500);
+ assertThat(requestCounter).isEqualTo(1);
+ response.close();
+ }
+
+ @Test
+ public void givenDefaultConfiguration_whenHttpPatchRequest_thenRetryIsNotApplied() {
+ createFailingHttpClient();
+ HttpPatch request = new HttpPatch(URI.create("https://httpstat.us/500"));
+
+ assertThrows(IOException.class, () -> httpClient.execute(request));
+ assertThat(requestCounter).isEqualTo(1);
+ }
+
+ @Test
+ public void givenDefaultConfiguration_whenHttpPutRequest_thenRetryIsNotApplied() {
+ createFailingHttpClient();
+ HttpPut request = new HttpPut(URI.create("https://httpstat.us/500"));
+
+ assertThrows(IOException.class, () -> httpClient.execute(request));
+ assertThat(requestCounter).isEqualTo(1);
+ }
+
+ @Test
+ public void givenConfiguredRetryHandler_whenHttpPostRequest_thenRetriesPerformed() {
+ createHttpClientWithRetryHandler();
+
+ HttpPost request = new HttpPost(URI.create("https://httpstat.us/200"));
+
+ assertThrows(IOException.class, () -> httpClient.execute(request));
+ assertThat(requestCounter).isEqualTo(7);
+ }
+
+ @Test
+ public void givenCustomRetryHandler_whenUnknownHostException_thenRetryAnyway() {
+ createHttpClientWithCustomRetryHandler();
+
+ HttpGet request = new HttpGet(URI.create("https://domain.that.does.not.exist/200"));
+
+ assertThrows(IOException.class, () -> httpClient.execute(request));
+ assertThat(requestCounter).isEqualTo(5);
+ }
+
+ @Test
+ public void givenDisabledRetries_whenExecutedHttpRequestEndUpWithIOException_thenRetryIsNotApplied() {
+ createHttpClientWithRetriesDisabled();
+ HttpGet request = new HttpGet(URI.create("https://httpstat.us/200"));
+
+ assertThrows(IOException.class, () -> httpClient.execute(request));
+ assertThat(requestCounter).isEqualTo(1);
+ }
+}
diff --git a/core-java-modules/core-java/src/test/resources/.gitignore b/apache-httpclient4/src/test/resources/.gitignore
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/.gitignore
rename to apache-httpclient4/src/test/resources/.gitignore
diff --git a/apache-httpclient4/src/test/resources/test.in b/apache-httpclient4/src/test/resources/test.in
new file mode 100644
index 0000000000..95d09f2b10
--- /dev/null
+++ b/apache-httpclient4/src/test/resources/test.in
@@ -0,0 +1 @@
+hello world
\ No newline at end of file
diff --git a/apache-kafka-2/README.md b/apache-kafka-2/README.md
index ec9e8e2adc..9a5f6e15ae 100644
--- a/apache-kafka-2/README.md
+++ b/apache-kafka-2/README.md
@@ -7,3 +7,7 @@ You can build the project from the command line using: *mvn clean install*, or i
### Relevant Articles:
- [Guide to Check if Apache Kafka Server Is Running](https://www.baeldung.com/apache-kafka-check-server-is-running)
+- [Add Custom Headers to a Kafka Message](https://www.baeldung.com/java-kafka-custom-headers)
+- [Get Last N Messages in Apache Kafka Topic](https://www.baeldung.com/java-apache-kafka-get-last-n-messages)
+- [Is a Key Required as Part of Sending Messages to Kafka?](https://www.baeldung.com/java-kafka-message-key)
+- [Read Data From the Beginning Using Kafka Consumer API](https://www.baeldung.com/java-kafka-consumer-api-read)
diff --git a/apache-kafka-2/src/main/java/com/baeldung/kafka/consumer/ConsumeFromBeginning.java b/apache-kafka-2/src/main/java/com/baeldung/kafka/consumer/ConsumeFromBeginning.java
new file mode 100644
index 0000000000..569c5aa9e9
--- /dev/null
+++ b/apache-kafka-2/src/main/java/com/baeldung/kafka/consumer/ConsumeFromBeginning.java
@@ -0,0 +1,81 @@
+package com.baeldung.kafka.consumer;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ConsumeFromBeginning {
+
+ private static Logger logger = LoggerFactory.getLogger(ConsumeFromBeginning.class);
+
+ private static String TOPIC = "baeldung";
+ private static int messagesInTopic = 10;
+
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+
+ public static void main(String[] args) {
+ setup();
+
+ publishMessages();
+
+ consumeFromBeginning();
+ }
+
+ private static void consumeFromBeginning() {
+ consumer.subscribe(Arrays.asList(TOPIC));
+
+ ConsumerRecords records = consumer.poll(Duration.ofSeconds(10));
+
+ for (ConsumerRecord record : records) {
+ logger.info(record.value());
+ }
+
+ consumer.seekToBeginning(consumer.assignment());
+
+ records = consumer.poll(Duration.ofSeconds(10));
+
+ for (ConsumerRecord record : records) {
+ logger.info(record.value());
+ }
+ }
+
+ private static void publishMessages() {
+ for (int i = 1; i <= messagesInTopic; i++) {
+ ProducerRecord record = new ProducerRecord<>(TOPIC, String.valueOf(i));
+ producer.send(record);
+ }
+ }
+
+ private static void setup() {
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
+ .toString());
+
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+ }
+
+}
diff --git a/apache-kafka-2/src/main/java/com/baeldung/kafka/headers/KafkaMessageHeaders.java b/apache-kafka-2/src/main/java/com/baeldung/kafka/headers/KafkaMessageHeaders.java
new file mode 100644
index 0000000000..2c8c14bfc5
--- /dev/null
+++ b/apache-kafka-2/src/main/java/com/baeldung/kafka/headers/KafkaMessageHeaders.java
@@ -0,0 +1,88 @@
+package com.baeldung.kafka.headers;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.header.internals.RecordHeader;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class KafkaMessageHeaders {
+
+ private static Logger logger = LoggerFactory.getLogger(KafkaMessageHeaders.class);
+
+ private static String TOPIC = "baeldung";
+ private static String MESSAGE_KEY = "message";
+ private static String MESSAGE_VALUE = "Hello World";
+ private static String HEADER_KEY = "website";
+ private static String HEADER_VALUE = "baeldung.com";
+
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+
+ public static void main(String[] args) {
+ setup();
+
+ publishMessageWithCustomHeaders();
+
+ consumeMessageWithCustomHeaders();
+ }
+
+ private static void consumeMessageWithCustomHeaders() {
+ consumer.subscribe(Arrays.asList(TOPIC));
+
+ ConsumerRecords records = consumer.poll(Duration.ofMinutes(1));
+ for (ConsumerRecord record : records) {
+ logger.info(record.key());
+ logger.info(record.value());
+
+ Headers headers = record.headers();
+ for (Header header : headers) {
+ logger.info(header.key());
+ logger.info(new String(header.value()));
+ }
+ }
+ }
+
+ private static void publishMessageWithCustomHeaders() {
+ List headers = new ArrayList<>();
+ headers.add(new RecordHeader(HEADER_KEY, HEADER_VALUE.getBytes()));
+
+ ProducerRecord record1 = new ProducerRecord<>(TOPIC, null, MESSAGE_KEY, MESSAGE_VALUE, headers);
+ producer.send(record1);
+
+ ProducerRecord record2 = new ProducerRecord<>(TOPIC, null, System.currentTimeMillis(), MESSAGE_KEY, MESSAGE_VALUE, headers);
+ producer.send(record2);
+ }
+
+ private static void setup() {
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, "ConsumerGroup1");
+
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+ }
+
+}
diff --git a/apache-kafka-2/src/main/java/com/baeldung/kafka/message/MessageWithKey.java b/apache-kafka-2/src/main/java/com/baeldung/kafka/message/MessageWithKey.java
new file mode 100644
index 0000000000..b03c1e1adc
--- /dev/null
+++ b/apache-kafka-2/src/main/java/com/baeldung/kafka/message/MessageWithKey.java
@@ -0,0 +1,106 @@
+package com.baeldung.kafka.message;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.kafka.clients.admin.Admin;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MessageWithKey {
+
+ private static Logger logger = LoggerFactory.getLogger(MessageWithKey.class);
+
+ private static String TOPIC = "baeldung";
+ private static int PARTITIONS = 5;
+ private static short REPLICATION_FACTOR = 1;
+
+ private static String MESSAGE_KEY = "message-key";
+
+ private static Admin admin;
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+
+ public static void main(String[] args) throws ExecutionException, InterruptedException {
+ setup();
+
+ publishMessagesWithoutKey();
+
+ consumeMessages();
+
+ publishMessagesWithKey();
+
+ consumeMessages();
+ }
+
+ private static void consumeMessages() {
+ consumer.subscribe(Arrays.asList(TOPIC));
+
+ ConsumerRecords records = consumer.poll(Duration.ofSeconds(5));
+ for (ConsumerRecord record : records) {
+ logger.info("Key : {}, Value : {}", record.key(), record.value());
+ }
+ }
+
+ private static void publishMessagesWithKey() throws ExecutionException, InterruptedException {
+ for (int i = 1; i <= 10; i++) {
+ ProducerRecord record = new ProducerRecord<>(TOPIC, MESSAGE_KEY, String.valueOf(i));
+ Future future = producer.send(record);
+ RecordMetadata metadata = future.get();
+
+ logger.info(String.valueOf(metadata.partition()));
+ }
+ }
+
+ private static void publishMessagesWithoutKey() throws ExecutionException, InterruptedException {
+ for (int i = 1; i <= 10; i++) {
+ ProducerRecord record = new ProducerRecord<>(TOPIC, String.valueOf(i));
+ Future future = producer.send(record);
+ RecordMetadata metadata = future.get();
+
+ logger.info(String.valueOf(metadata.partition()));
+ }
+ }
+
+ private static void setup() {
+ Properties adminProperties = new Properties();
+ adminProperties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
+ .toString());
+
+ admin = Admin.create(adminProperties);
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+
+ admin.createTopics(Collections.singleton(new NewTopic(TOPIC, PARTITIONS, REPLICATION_FACTOR)));
+ }
+
+}
\ No newline at end of file
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessages.java b/apache-kafka-2/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessages.java
new file mode 100644
index 0000000000..94f5907525
--- /dev/null
+++ b/apache-kafka-2/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessages.java
@@ -0,0 +1,138 @@
+package com.baeldung.kafka;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Testcontainers
+public class KafaConsumeLastNMessages {
+
+ private static String TOPIC1 = "baeldung-github";
+ private static String TOPIC2 = "baeldung-blog";
+ private static String MESSAGE_KEY = "message";
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+ private static KafkaProducer transactionalProducer;
+
+ @Container
+ private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
+
+ @BeforeAll
+ static void setup() {
+ KAFKA_CONTAINER.addExposedPort(9092);
+
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, "ConsumerGroup1");
+
+ Properties transactionalProducerProprieties = new Properties();
+ transactionalProducerProprieties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ transactionalProducerProprieties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ transactionalProducerProprieties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ transactionalProducerProprieties.put(ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG, "true");
+ transactionalProducerProprieties.put(ProducerConfig.TRANSACTIONAL_ID_CONFIG, "prod-0");
+
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+ transactionalProducer = new KafkaProducer<>(transactionalProducerProprieties);
+ }
+
+ @AfterAll
+ static void destroy() {
+ KAFKA_CONTAINER.stop();
+ }
+
+ @Test
+ void whenSeekingKafkaTopicCursorToEnd_consumerRetrievesOnlyDesiredNumberOfMessages() throws ExecutionException, InterruptedException {
+ int messagesInTopic = 100;
+ int messagesToRetrieve = 20;
+
+ for (int i = 0; i < messagesInTopic; i++) {
+ producer.send(new ProducerRecord<>(TOPIC1, null, MESSAGE_KEY, String.valueOf(i)))
+ .get();
+ }
+
+ TopicPartition partition = new TopicPartition(TOPIC1, 0);
+ List partitions = new ArrayList<>();
+ partitions.add(partition);
+ consumer.assign(partitions);
+
+ consumer.seekToEnd(partitions);
+ long startIndex = consumer.position(partition) - messagesToRetrieve;
+ consumer.seek(partition, startIndex);
+
+ ConsumerRecords records = consumer.poll(Duration.ofMinutes(1));
+ int recordsReceived = 0;
+ for (ConsumerRecord record : records) {
+ assertEquals(MESSAGE_KEY, record.key());
+ assertTrue(Integer.parseInt(record.value()) >= (messagesInTopic - messagesToRetrieve));
+ recordsReceived++;
+ }
+
+ assertEquals(messagesToRetrieve, recordsReceived);
+ }
+
+ @Test
+ void havingTransactionalProducer_whenSeekingKafkaTopicCursorToEnd_consumerRetrievesLessMessages() throws ExecutionException, InterruptedException {
+ int messagesInTopic = 100;
+ int messagesToRetrieve = 20;
+
+ transactionalProducer.initTransactions();
+ for (int i = 0; i < messagesInTopic; i++) {
+ transactionalProducer.beginTransaction();
+ transactionalProducer.send(new ProducerRecord<>(TOPIC2, null, MESSAGE_KEY, String.valueOf(i)))
+ .get();
+ transactionalProducer.commitTransaction();
+ }
+
+ TopicPartition partition = new TopicPartition(TOPIC2, 0);
+ List partitions = new ArrayList<>();
+ partitions.add(partition);
+ consumer.assign(partitions);
+
+ consumer.seekToEnd(partitions);
+ long startIndex = consumer.position(partition) - messagesToRetrieve;
+ consumer.seek(partition, startIndex);
+
+ ConsumerRecords records = consumer.poll(Duration.ofMinutes(1));
+ int recordsReceived = 0;
+ for (ConsumerRecord record : records) {
+ assertEquals(MESSAGE_KEY, record.key());
+ assertTrue(Integer.parseInt(record.value()) >= (messagesInTopic - messagesToRetrieve));
+ recordsReceived++;
+ }
+
+ assertTrue(messagesToRetrieve > recordsReceived);
+ }
+
+}
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/consumer/ConsumeFromBeginningLiveTest.java b/apache-kafka-2/src/test/java/com/baeldung/kafka/consumer/ConsumeFromBeginningLiveTest.java
new file mode 100644
index 0000000000..6bfba1eca9
--- /dev/null
+++ b/apache-kafka-2/src/test/java/com/baeldung/kafka/consumer/ConsumeFromBeginningLiveTest.java
@@ -0,0 +1,109 @@
+package com.baeldung.kafka.consumer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+// This live test needs a Docker Daemon running so that a kafka container can be created
+
+@Testcontainers
+public class ConsumeFromBeginningLiveTest {
+
+ private static Logger logger = LoggerFactory.getLogger(ConsumeFromBeginningLiveTest.class);
+
+ private static String TOPIC = "baeldung";
+ private static int messagesInTopic = 10;
+
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+
+ @Container
+ private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
+
+ @BeforeAll
+ static void setup() {
+ KAFKA_CONTAINER.addExposedPort(9092);
+
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
+ .toString());
+
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+ }
+
+ private static void publishMessages() throws ExecutionException, InterruptedException {
+ for (int i = 1; i <= messagesInTopic; i++) {
+ ProducerRecord record = new ProducerRecord<>(TOPIC, String.valueOf(i));
+ producer.send(record)
+ .get();
+ }
+ }
+
+ @AfterAll
+ static void destroy() {
+ KAFKA_CONTAINER.stop();
+ }
+
+ @Test
+ void givenMessages_whenConsumedFromBeginning_thenCheckIfConsumedFromBeginning() throws ExecutionException, InterruptedException {
+
+ publishMessages();
+
+ consumer.subscribe(Arrays.asList(TOPIC));
+
+ ConsumerRecords records = consumer.poll(Duration.ofSeconds(10));
+
+ int messageCount = 0;
+ for (ConsumerRecord record : records) {
+ logger.info(record.value());
+ messageCount++;
+ }
+
+ assertEquals(messagesInTopic, messageCount);
+
+ consumer.seekToBeginning(consumer.assignment());
+
+ records = consumer.poll(Duration.ofSeconds(10));
+
+ messageCount = 0;
+ for (ConsumerRecord record : records) {
+ logger.info(record.value());
+ messageCount++;
+ }
+
+ assertEquals(messagesInTopic, messageCount);
+ }
+}
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/headers/KafkaMessageHeadersLiveTest.java b/apache-kafka-2/src/test/java/com/baeldung/kafka/headers/KafkaMessageHeadersLiveTest.java
new file mode 100644
index 0000000000..42cc572e07
--- /dev/null
+++ b/apache-kafka-2/src/test/java/com/baeldung/kafka/headers/KafkaMessageHeadersLiveTest.java
@@ -0,0 +1,104 @@
+package com.baeldung.kafka.headers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.header.internals.RecordHeader;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+// This live test needs a Docker Daemon running so that a kafka container can be created
+
+@Testcontainers
+public class KafkaMessageHeadersLiveTest {
+
+ private static String TOPIC = "baeldung";
+ private static String MESSAGE_KEY = "message";
+ private static String MESSAGE_VALUE = "Hello World";
+ private static String HEADER_KEY = "website";
+ private static String HEADER_VALUE = "baeldung.com";
+
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+
+ @Container
+ private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
+
+ @BeforeAll
+ static void setup() {
+ KAFKA_CONTAINER.addExposedPort(9092);
+
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, "ConsumerGroup1");
+
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+ }
+
+ @AfterAll
+ static void destroy() {
+ KAFKA_CONTAINER.stop();
+ }
+
+ @Test
+ void givenAMessageWithCustomHeaders_whenPublishedToKafkaAndConsumed_thenCheckForCustomHeaders() throws ExecutionException, InterruptedException {
+ List headers = new ArrayList<>();
+ headers.add(new RecordHeader(HEADER_KEY, HEADER_VALUE.getBytes()));
+
+ ProducerRecord record1 = new ProducerRecord<>(TOPIC, null, MESSAGE_KEY, MESSAGE_VALUE, headers);
+ Future future = producer.send(record1);
+
+ RecordMetadata metadata = future.get();
+
+ assertNotNull(metadata);
+
+ consumer.subscribe(Arrays.asList(TOPIC));
+
+ ConsumerRecords records = consumer.poll(Duration.ofMinutes(1));
+ for (ConsumerRecord record : records) {
+ assertEquals(MESSAGE_KEY, record.key());
+ assertEquals(MESSAGE_VALUE, record.value());
+
+ Headers consumedHeaders = record.headers();
+ assertNotNull(consumedHeaders);
+
+ for (Header header : consumedHeaders) {
+ assertEquals(HEADER_KEY, header.key());
+ assertEquals(HEADER_VALUE, new String(header.value()));
+ }
+ }
+ }
+}
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/message/MessageWithKeyLiveTest.java b/apache-kafka-2/src/test/java/com/baeldung/kafka/message/MessageWithKeyLiveTest.java
new file mode 100644
index 0000000000..093dc629cb
--- /dev/null
+++ b/apache-kafka-2/src/test/java/com/baeldung/kafka/message/MessageWithKeyLiveTest.java
@@ -0,0 +1,130 @@
+package com.baeldung.kafka.message;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.kafka.clients.admin.Admin;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+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.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+// This live test needs a Docker Daemon running so that a kafka container can be created
+
+@Testcontainers
+public class MessageWithKeyLiveTest {
+
+ private static String TOPIC = "baeldung";
+ private static int PARTITIONS = 5;
+ private static short REPLICATION_FACTOR = 1;
+
+ private static String MESSAGE_KEY = "message-key";
+ private static String MESSAGE_VALUE = "Hello World";
+
+ private static Admin admin;
+ private static KafkaProducer producer;
+ private static KafkaConsumer consumer;
+
+ @Container
+ private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
+
+ @BeforeAll
+ static void setup() {
+ KAFKA_CONTAINER.addExposedPort(9092);
+
+ Properties adminProperties = new Properties();
+ adminProperties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+
+ Properties producerProperties = new Properties();
+ producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+ producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+ Properties consumerProperties = new Properties();
+ consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+ consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+ consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
+ .toString());
+
+ admin = Admin.create(adminProperties);
+ producer = new KafkaProducer<>(producerProperties);
+ consumer = new KafkaConsumer<>(consumerProperties);
+
+ admin.createTopics(Collections.singleton(new NewTopic(TOPIC, PARTITIONS, REPLICATION_FACTOR)));
+ }
+
+ @AfterAll
+ static void destroy() {
+ KAFKA_CONTAINER.stop();
+ }
+
+ @Test
+ void givenAMessageWithKey_whenPublishedToKafkaAndConsumed_thenCheckForKey() throws ExecutionException, InterruptedException {
+
+ ProducerRecord producerRecord = new ProducerRecord<>(TOPIC, MESSAGE_KEY, MESSAGE_VALUE);
+ Future future = producer.send(producerRecord);
+
+ RecordMetadata metadata = future.get();
+
+ assertNotNull(metadata);
+
+ consumer.subscribe(Arrays.asList(TOPIC));
+
+ ConsumerRecords records = consumer.poll(Duration.ofSeconds(5));
+ for (ConsumerRecord consumerRecord : records) {
+ assertEquals(MESSAGE_KEY, consumerRecord.key());
+ assertEquals(MESSAGE_VALUE, consumerRecord.value());
+ }
+ }
+
+ @Test
+ void givenAListOfMessageWithKeys_whenPublishedToKafka_thenCheckedIfPublishedToSamePartition() throws ExecutionException, InterruptedException {
+
+ boolean isSamePartition = true;
+ int partition = 0;
+
+ for (int i = 1; i <= 10; i++) {
+ ProducerRecord producerRecord = new ProducerRecord<>(TOPIC, MESSAGE_KEY, MESSAGE_VALUE);
+ Future future = producer.send(producerRecord);
+
+ RecordMetadata metadata = future.get();
+
+ assertNotNull(metadata);
+ if (i == 1) {
+ partition = metadata.partition();
+ } else {
+ if (partition != metadata.partition()) {
+ isSamePartition = false;
+ }
+ }
+ }
+
+ assertTrue(isSamePartition);
+ }
+}
diff --git a/apache-kafka/pom.xml b/apache-kafka/pom.xml
index 7bde041f32..494bc94961 100644
--- a/apache-kafka/pom.xml
+++ b/apache-kafka/pom.xml
@@ -35,12 +35,12 @@
org.apache.flink
- flink-connector-kafka-0.11_2.11
+ flink-connector-kafka
${flink.version}
org.apache.flink
- flink-streaming-java_2.11
+ flink-streaming-java
${flink.version}
@@ -67,7 +67,7 @@
org.apache.flink
- flink-test-utils_2.11
+ flink-test-utils
${flink.version}
test
@@ -163,11 +163,28 @@
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ --add-opens java.base/java.time=ALL-UNNAMED
+ --add-opens
+ java.base/java.nio=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED
+
+
+
+
+
+
- 2.8.0
+ 3.4.0
1.15.3
1.15.3
- 1.5.0
+ 1.16.1
3.0.0
2.4.8
0.8.1-spark3.0-s_2.12
diff --git a/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java b/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
index 4502b628b2..8d15b79a63 100644
--- a/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
+++ b/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
@@ -9,8 +9,8 @@ import org.apache.flink.streaming.api.TimeCharacteristic;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.windowing.time.Time;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer011;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer011;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
import static com.baeldung.flink.connector.Consumers.*;
import static com.baeldung.flink.connector.Producers.*;
@@ -25,12 +25,12 @@ public class FlinkDataPipeline {
StreamExecutionEnvironment environment = StreamExecutionEnvironment.getExecutionEnvironment();
- FlinkKafkaConsumer011 flinkKafkaConsumer = createStringConsumerForTopic(inputTopic, address, consumerGroup);
+ FlinkKafkaConsumer flinkKafkaConsumer = createStringConsumerForTopic(inputTopic, address, consumerGroup);
flinkKafkaConsumer.setStartFromEarliest();
DataStream stringInputStream = environment.addSource(flinkKafkaConsumer);
- FlinkKafkaProducer011 flinkKafkaProducer = createStringProducer(outputTopic, address);
+ FlinkKafkaProducer flinkKafkaProducer = createStringProducer(outputTopic, address);
stringInputStream.map(new WordsCapitalizer())
.addSink(flinkKafkaProducer);
@@ -48,11 +48,11 @@ public class FlinkDataPipeline {
environment.setStreamTimeCharacteristic(TimeCharacteristic.EventTime);
- FlinkKafkaConsumer011 flinkKafkaConsumer = createInputMessageConsumer(inputTopic, kafkaAddress, consumerGroup);
+ FlinkKafkaConsumer flinkKafkaConsumer = createInputMessageConsumer(inputTopic, kafkaAddress, consumerGroup);
flinkKafkaConsumer.setStartFromEarliest();
flinkKafkaConsumer.assignTimestampsAndWatermarks(new InputMessageTimestampAssigner());
- FlinkKafkaProducer011 flinkKafkaProducer = createBackupProducer(outputTopic, kafkaAddress);
+ FlinkKafkaProducer flinkKafkaProducer = createBackupProducer(outputTopic, kafkaAddress);
DataStream inputMessagesStream = environment.addSource(flinkKafkaConsumer);
diff --git a/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java b/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java
index c72cb8a2d6..358c9627f7 100644
--- a/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java
+++ b/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java
@@ -3,26 +3,26 @@ package com.baeldung.flink.connector;
import com.baeldung.flink.model.InputMessage;
import com.baeldung.flink.schema.InputMessageDeserializationSchema;
import org.apache.flink.api.common.serialization.SimpleStringSchema;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer011;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer;
import java.util.Properties;
public class Consumers {
- public static FlinkKafkaConsumer011 createStringConsumerForTopic(String topic, String kafkaAddress, String kafkaGroup) {
+ public static FlinkKafkaConsumer createStringConsumerForTopic(String topic, String kafkaAddress, String kafkaGroup) {
Properties props = new Properties();
props.setProperty("bootstrap.servers", kafkaAddress);
props.setProperty("group.id", kafkaGroup);
- FlinkKafkaConsumer011 consumer = new FlinkKafkaConsumer011<>(topic, new SimpleStringSchema(), props);
+ FlinkKafkaConsumer consumer = new FlinkKafkaConsumer<>(topic, new SimpleStringSchema(), props);
return consumer;
}
- public static FlinkKafkaConsumer011 createInputMessageConsumer(String topic, String kafkaAddress, String kafkaGroup) {
+ public static FlinkKafkaConsumer createInputMessageConsumer(String topic, String kafkaAddress, String kafkaGroup) {
Properties properties = new Properties();
properties.setProperty("bootstrap.servers", kafkaAddress);
properties.setProperty("group.id", kafkaGroup);
- FlinkKafkaConsumer011 consumer = new FlinkKafkaConsumer011(topic, new InputMessageDeserializationSchema(), properties);
+ FlinkKafkaConsumer consumer = new FlinkKafkaConsumer(topic, new InputMessageDeserializationSchema(), properties);
return consumer;
}
diff --git a/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java b/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java
index 8e6f3f8f37..a4cb2d70c2 100644
--- a/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java
+++ b/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java
@@ -3,15 +3,15 @@ package com.baeldung.flink.connector;
import com.baeldung.flink.model.Backup;
import com.baeldung.flink.schema.BackupSerializationSchema;
import org.apache.flink.api.common.serialization.SimpleStringSchema;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer011;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
public class Producers {
- public static FlinkKafkaProducer011 createStringProducer(String topic, String kafkaAddress) {
- return new FlinkKafkaProducer011<>(kafkaAddress, topic, new SimpleStringSchema());
+ public static FlinkKafkaProducer createStringProducer(String topic, String kafkaAddress) {
+ return new FlinkKafkaProducer<>(kafkaAddress, topic, new SimpleStringSchema());
}
- public static FlinkKafkaProducer011 createBackupProducer(String topic, String kafkaAddress) {
- return new FlinkKafkaProducer011(kafkaAddress, topic, new BackupSerializationSchema());
+ public static FlinkKafkaProducer createBackupProducer(String topic, String kafkaAddress) {
+ return new FlinkKafkaProducer(kafkaAddress, topic, new BackupSerializationSchema());
}
}
diff --git a/apache-libraries/pom.xml b/apache-libraries/pom.xml
index 3d78869865..c1def03bee 100644
--- a/apache-libraries/pom.xml
+++ b/apache-libraries/pom.xml
@@ -118,11 +118,6 @@
curator-recipes
${curator.version}
-
- org.apache.zookeeper
- zookeeper
- ${zookeeper.version}
-
com.fasterxml.jackson.core
jackson-core
@@ -191,17 +186,15 @@
- 1.8
- 1.8
1.8.2
- 2.19.0
- 1.1.2
- 1.1.0.Final
- 1.2.0
+ 2.45.0
+ 2.0.6
+ 2.0.1.Final
+ 1.2.15
3.10.0
- 1.2.1
- 1.2.1
- 1.2.1
+ 1.2.15
+ 1.2.15
+ 1.2.15
1.8.4
2.1.1-incubating
3.4.11
diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java b/apache-libraries/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java
deleted file mode 100644
index 7d30c3d1ee..0000000000
--- a/apache-libraries/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.avro.util.serealization;
-
-import com.baeldung.avro.util.model.AvroHttpRequest;
-import org.apache.avro.io.DatumReader;
-import org.apache.avro.io.Decoder;
-import org.apache.avro.io.DecoderFactory;
-import org.apache.avro.specific.SpecificDatumReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-public class AvroDeSerealizer {
-
- private static Logger logger = LoggerFactory.getLogger(AvroDeSerealizer.class);
-
- public AvroHttpRequest deSerealizeAvroHttpRequestJSON(byte[] data) {
- DatumReader reader = new SpecificDatumReader<>(AvroHttpRequest.class);
- Decoder decoder = null;
- try {
- decoder = DecoderFactory.get()
- .jsonDecoder(AvroHttpRequest.getClassSchema(), new String(data));
- return reader.read(null, decoder);
- } catch (IOException e) {
- logger.error("Deserialization error" + e.getMessage());
- }
- return null;
- }
-
- public AvroHttpRequest deSerealizeAvroHttpRequestBinary(byte[] data) {
- DatumReader employeeReader = new SpecificDatumReader<>(AvroHttpRequest.class);
- Decoder decoder = DecoderFactory.get()
- .binaryDecoder(data, null);
- try {
- return employeeReader.read(null, decoder);
- } catch (IOException e) {
- logger.error("Deserialization error" + e.getMessage());
- }
- return null;
- }
-}
diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java b/apache-libraries/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java
deleted file mode 100644
index 767b688dea..0000000000
--- a/apache-libraries/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.baeldung.avro.util.serealization;
-
-import com.baeldung.avro.util.model.AvroHttpRequest;
-import org.apache.avro.io.*;
-import org.apache.avro.specific.SpecificDatumWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-public class AvroSerealizer {
-
- private static final Logger logger = LoggerFactory.getLogger(AvroSerealizer.class);
-
- public byte[] serealizeAvroHttpRequestJSON(AvroHttpRequest request) {
- DatumWriter writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
- byte[] data = new byte[0];
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- Encoder jsonEncoder = null;
- try {
- jsonEncoder = EncoderFactory.get()
- .jsonEncoder(AvroHttpRequest.getClassSchema(), stream);
- writer.write(request, jsonEncoder);
- jsonEncoder.flush();
- data = stream.toByteArray();
- } catch (IOException e) {
- logger.error("Serialization error " + e.getMessage());
- }
- return data;
- }
-
- public byte[] serealizeAvroHttpRequestBinary(AvroHttpRequest request) {
- DatumWriter writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
- byte[] data = new byte[0];
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- Encoder jsonEncoder = EncoderFactory.get()
- .binaryEncoder(stream, null);
- try {
- writer.write(request, jsonEncoder);
- jsonEncoder.flush();
- data = stream.toByteArray();
- } catch (IOException e) {
- logger.error("Serialization error " + e.getMessage());
- }
-
- return data;
- }
-
-}
diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroDeSerializer.java b/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroDeSerializer.java
new file mode 100644
index 0000000000..cf4c360ba4
--- /dev/null
+++ b/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroDeSerializer.java
@@ -0,0 +1,41 @@
+package com.baeldung.avro.util.serialization;
+
+import com.baeldung.avro.util.model.AvroHttpRequest;
+import org.apache.avro.io.DatumReader;
+import org.apache.avro.io.Decoder;
+import org.apache.avro.io.DecoderFactory;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class AvroDeSerializer {
+
+ private static Logger logger = LoggerFactory.getLogger(AvroDeSerializer.class);
+
+ public AvroHttpRequest deSerializeAvroHttpRequestJSON(byte[] data) {
+ DatumReader reader = new SpecificDatumReader<>(AvroHttpRequest.class);
+ Decoder decoder = null;
+ try {
+ decoder = DecoderFactory.get()
+ .jsonDecoder(AvroHttpRequest.getClassSchema(), new String(data));
+ return reader.read(null, decoder);
+ } catch (IOException e) {
+ logger.error("Deserialization error" + e.getMessage());
+ }
+ return null;
+ }
+
+ public AvroHttpRequest deSerializeAvroHttpRequestBinary(byte[] data) {
+ DatumReader employeeReader = new SpecificDatumReader<>(AvroHttpRequest.class);
+ Decoder decoder = DecoderFactory.get()
+ .binaryDecoder(data, null);
+ try {
+ return employeeReader.read(null, decoder);
+ } catch (IOException e) {
+ logger.error("Deserialization error" + e.getMessage());
+ }
+ return null;
+ }
+}
diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroSerializer.java b/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroSerializer.java
new file mode 100644
index 0000000000..6d39060ec8
--- /dev/null
+++ b/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroSerializer.java
@@ -0,0 +1,50 @@
+package com.baeldung.avro.util.serialization;
+
+import com.baeldung.avro.util.model.AvroHttpRequest;
+import org.apache.avro.io.*;
+import org.apache.avro.specific.SpecificDatumWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class AvroSerializer {
+
+ private static final Logger logger = LoggerFactory.getLogger(AvroSerializer.class);
+
+ public byte[] serializeAvroHttpRequestJSON(AvroHttpRequest request) {
+ DatumWriter writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
+ byte[] data = new byte[0];
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ Encoder jsonEncoder = null;
+ try {
+ jsonEncoder = EncoderFactory.get()
+ .jsonEncoder(AvroHttpRequest.getClassSchema(), stream);
+ writer.write(request, jsonEncoder);
+ jsonEncoder.flush();
+ data = stream.toByteArray();
+ } catch (IOException e) {
+ logger.error("Serialization error " + e.getMessage());
+ }
+ return data;
+ }
+
+ public byte[] serializeAvroHttpRequestBinary(AvroHttpRequest request) {
+ DatumWriter writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
+ byte[] data = new byte[0];
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ Encoder jsonEncoder = EncoderFactory.get()
+ .binaryEncoder(stream, null);
+ try {
+ writer.write(request, jsonEncoder);
+ jsonEncoder.flush();
+ data = stream.toByteArray();
+ } catch (IOException e) {
+ logger.error("Serialization error " + e.getMessage());
+ }
+
+ return data;
+ }
+
+}
diff --git a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java b/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java
new file mode 100644
index 0000000000..5d51d8e5fa
--- /dev/null
+++ b/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.apache.beam.intro;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.baeldung.apache.beam.intro.WordCount;
+
+public class WordCountIntegrationTest {
+
+ @Test
+ public void givenInputFile_whenWordCountRuns_thenJobFinishWithoutError() {
+ boolean jobDone = WordCount.wordCount("src/test/resources/wordcount.txt", "target/output");
+ assertTrue(jobDone);
+ }
+
+}
diff --git a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java b/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java
deleted file mode 100644
index 77287066ac..0000000000
--- a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.apache.beam.intro;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.baeldung.apache.beam.intro.WordCount;
-
-public class WordCountUnitTest {
-
- @Test
- public void givenInputFile_whenWordCountRuns_thenJobFinishWithoutError() {
- boolean jobDone = WordCount.wordCount("src/test/resources/wordcount.txt", "target/output");
- assertTrue(jobDone);
- }
-
-}
diff --git a/apache-libraries/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerIntegrationTest.java b/apache-libraries/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerIntegrationTest.java
deleted file mode 100644
index 3d413e1939..0000000000
--- a/apache-libraries/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerIntegrationTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.baeldung.avro.util.serealization;
-
-import com.baeldung.avro.util.model.Active;
-import com.baeldung.avro.util.model.AvroHttpRequest;
-import com.baeldung.avro.util.model.ClientIdentifier;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static org.junit.Assert.*;
-
-public class AvroSerealizerDeSerealizerIntegrationTest {
-
- AvroSerealizer serealizer;
- AvroDeSerealizer deSerealizer;
- AvroHttpRequest request;
-
- @Before
- public void setUp() throws Exception {
- serealizer = new AvroSerealizer();
- deSerealizer = new AvroDeSerealizer();
-
- ClientIdentifier clientIdentifier = ClientIdentifier.newBuilder()
- .setHostName("localhost")
- .setIpAddress("255.255.255.0")
- .build();
-
- List employees = new ArrayList();
- employees.add("James");
- employees.add("Alice");
- employees.add("David");
- employees.add("Han");
-
- request = AvroHttpRequest.newBuilder()
- .setRequestTime(01l)
- .setActive(Active.YES)
- .setClientIdentifier(clientIdentifier)
- .setEmployeeNames(employees)
- .build();
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void WhenSerializedUsingJSONEncoder_thenObjectGetsSerialized() {
- byte[] data = serealizer.serealizeAvroHttpRequestJSON(request);
- assertTrue(Objects.nonNull(data));
- assertTrue(data.length > 0);
- }
-
- @Test
- public void WhenSerializedUsingBinaryEncoder_thenObjectGetsSerialized() {
- byte[] data = serealizer.serealizeAvroHttpRequestBinary(request);
- assertTrue(Objects.nonNull(data));
- assertTrue(data.length > 0);
- }
-
- @Test
- public void WhenDeserializeUsingJSONDecoder_thenActualAndExpectedObjectsAreEqual() {
- byte[] data = serealizer.serealizeAvroHttpRequestJSON(request);
- AvroHttpRequest actualRequest = deSerealizer.deSerealizeAvroHttpRequestJSON(data);
- assertEquals(actualRequest, request);
- assertTrue(actualRequest.getRequestTime()
- .equals(request.getRequestTime()));
- }
-
- @Test
- public void WhenDeserializeUsingBinaryecoder_thenActualAndExpectedObjectsAreEqual() {
- byte[] data = serealizer.serealizeAvroHttpRequestBinary(request);
- AvroHttpRequest actualRequest = deSerealizer.deSerealizeAvroHttpRequestBinary(data);
- assertEquals(actualRequest, request);
- assertTrue(actualRequest.getRequestTime()
- .equals(request.getRequestTime()));
- }
-
-}
-
diff --git a/apache-libraries/src/test/java/com/baeldung/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java b/apache-libraries/src/test/java/com/baeldung/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java
new file mode 100644
index 0000000000..964eeb6d87
--- /dev/null
+++ b/apache-libraries/src/test/java/com/baeldung/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java
@@ -0,0 +1,83 @@
+package com.baeldung.avro.util.serialization;
+
+import com.baeldung.avro.util.model.Active;
+import com.baeldung.avro.util.model.AvroHttpRequest;
+import com.baeldung.avro.util.model.ClientIdentifier;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.junit.Assert.*;
+
+public class AvroSerializerDeSerializerIntegrationTest {
+
+ AvroSerializer serializer;
+ AvroDeSerializer deserializer;
+ AvroHttpRequest request;
+
+ @Before
+ public void setUp() throws Exception {
+ serializer = new AvroSerializer();
+ deserializer = new AvroDeSerializer();
+
+ ClientIdentifier clientIdentifier = ClientIdentifier.newBuilder()
+ .setHostName("localhost")
+ .setIpAddress("255.255.255.0")
+ .build();
+
+ List employees = new ArrayList();
+ employees.add("James");
+ employees.add("Alice");
+ employees.add("David");
+ employees.add("Han");
+
+ request = AvroHttpRequest.newBuilder()
+ .setRequestTime(01l)
+ .setActive(Active.YES)
+ .setClientIdentifier(clientIdentifier)
+ .setEmployeeNames(employees)
+ .build();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void WhenSerializedUsingJSONEncoder_thenObjectGetsSerialized() {
+ byte[] data = serializer.serializeAvroHttpRequestJSON(request);
+ assertTrue(Objects.nonNull(data));
+ assertTrue(data.length > 0);
+ }
+
+ @Test
+ public void WhenSerializedUsingBinaryEncoder_thenObjectGetsSerialized() {
+ byte[] data = serializer.serializeAvroHttpRequestBinary(request);
+ assertTrue(Objects.nonNull(data));
+ assertTrue(data.length > 0);
+ }
+
+ @Test
+ public void WhenDeserializeUsingJSONDecoder_thenActualAndExpectedObjectsAreEqual() {
+ byte[] data = serializer.serializeAvroHttpRequestJSON(request);
+ AvroHttpRequest actualRequest = deserializer.deSerializeAvroHttpRequestJSON(data);
+ assertEquals(actualRequest, request);
+ assertTrue(actualRequest.getRequestTime()
+ .equals(request.getRequestTime()));
+ }
+
+ @Test
+ public void WhenDeserializeUsingBinaryecoder_thenActualAndExpectedObjectsAreEqual() {
+ byte[] data = serializer.serializeAvroHttpRequestBinary(request);
+ AvroHttpRequest actualRequest = deserializer.deSerializeAvroHttpRequestBinary(data);
+ assertEquals(actualRequest, request);
+ assertTrue(actualRequest.getRequestTime()
+ .equals(request.getRequestTime()));
+ }
+
+}
+
diff --git a/apache-poi-2/README.md b/apache-poi-2/README.md
index 2c0deec575..0132147201 100644
--- a/apache-poi-2/README.md
+++ b/apache-poi-2/README.md
@@ -11,4 +11,6 @@ This module contains articles about Apache POI.
- [Creating a MS PowerPoint Presentation in Java](https://www.baeldung.com/apache-poi-slideshow)
- [Finding the Last Row in an Excel Spreadsheet From Java](https://www.baeldung.com/java-excel-find-last-row)
- [Setting Formulas in Excel with Apache POI](https://www.baeldung.com/java-apache-poi-set-formulas)
+- [Set the Date Format Using Apache POI](https://www.baeldung.com/java-apache-poi-date-format)
+- [Replacing Variables in a Document Template with Java](https://www.baeldung.com/java-replace-pattern-word-document-doc-docx)
- More articles: [[<-- prev]](../apache-poi)
diff --git a/apache-poi-2/pom.xml b/apache-poi-2/pom.xml
index af959292fa..9a01a76d73 100644
--- a/apache-poi-2/pom.xml
+++ b/apache-poi-2/pom.xml
@@ -1,7 +1,7 @@
-
+
4.0.0
apache-poi-2
0.0.1-SNAPSHOT
@@ -19,10 +19,15 @@
poi-ooxml
${poi.version}
+
+ org.apache.poi
+ poi-scratchpad
+ ${poi.version}
+
- 5.2.0
+ 5.2.3
\ No newline at end of file
diff --git a/apache-poi-2/src/main/java/com/baeldung/poi/excel/dateformat/ExcelDateFormat.java b/apache-poi-2/src/main/java/com/baeldung/poi/excel/dateformat/ExcelDateFormat.java
new file mode 100644
index 0000000000..6ee2fb3c3b
--- /dev/null
+++ b/apache-poi-2/src/main/java/com/baeldung/poi/excel/dateformat/ExcelDateFormat.java
@@ -0,0 +1,35 @@
+package com.baeldung.poi.excel.dateformat;
+
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CreationHelper;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+public class ExcelDateFormat {
+
+ public final static String CUSTOM_DATE_FORMAT = "m/d/yy h:mm";
+
+ /**
+ * Set default date format to a cell
+ * @param dateCell cell to set date format
+ * @param wb workbook to create date format cell style
+ */
+ public void setDefaultDateFormat(XSSFCell dateCell, XSSFWorkbook wb) {
+ CellStyle cellStyle = wb.createCellStyle();
+ cellStyle.setDataFormat((short) 14);
+ dateCell.setCellStyle(cellStyle);
+ }
+
+ /**
+ * Set custom date format to a cell
+ * @param dateCell cell to set date format
+ * @param wb workbook to create date format cell style
+ */
+ public void setCustomDateFormat(XSSFCell dateCell, XSSFWorkbook wb) {
+ CellStyle cellStyle = wb.createCellStyle();
+ CreationHelper createHelper = wb.getCreationHelper();
+ short format = createHelper.createDataFormat().getFormat(CUSTOM_DATE_FORMAT);
+ cellStyle.setDataFormat(format);
+ dateCell.setCellStyle(cellStyle);
+ }
+}
diff --git a/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocTextReplacer.java b/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocTextReplacer.java
new file mode 100644
index 0000000000..f661551ce9
--- /dev/null
+++ b/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocTextReplacer.java
@@ -0,0 +1,38 @@
+package com.baeldung.poi.replacevariables;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.usermodel.Range;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+
+public class DocTextReplacer {
+
+ public void replaceText() throws IOException {
+ String filePath = getClass().getClassLoader()
+ .getResource("baeldung.doc")
+ .getPath();
+ try (InputStream inputStream = new FileInputStream(filePath); POIFSFileSystem fileSystem = new POIFSFileSystem(inputStream)) {
+ HWPFDocument doc = new HWPFDocument(fileSystem);
+ doc = replaceText(doc, "Baeldung", "Hello");
+ saveFile(filePath, doc);
+ doc.close();
+ }
+ }
+
+ private HWPFDocument replaceText(HWPFDocument doc, String originalText, String updatedText) {
+ Range range = doc.getRange();
+ range.replaceText(originalText, updatedText);
+ return doc;
+ }
+
+ private void saveFile(String filePath, HWPFDocument doc) throws IOException {
+ try (FileOutputStream out = new FileOutputStream(filePath)) {
+ doc.write(out);
+ }
+ }
+
+}
diff --git a/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacer.java b/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacer.java
new file mode 100644
index 0000000000..34c2bc43e5
--- /dev/null
+++ b/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacer.java
@@ -0,0 +1,63 @@
+package com.baeldung.poi.replacevariables;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+
+public class DocxNaiveTextReplacer {
+
+ public void replaceText() throws IOException {
+ String filePath = getClass().getClassLoader()
+ .getResource("baeldung-copy.docx")
+ .getPath();
+ try (InputStream inputStream = new FileInputStream(filePath)) {
+ XWPFDocument doc = new XWPFDocument(inputStream);
+ doc = replaceText(doc, "Baeldung", "Hello");
+ saveFile(filePath, doc);
+ doc.close();
+ }
+ }
+
+ private XWPFDocument replaceText(XWPFDocument doc, String originalText, String updatedText) {
+ replaceTextInParagraphs(doc.getParagraphs(), originalText, updatedText);
+ for (XWPFTable tbl : doc.getTables()) {
+ for (XWPFTableRow row : tbl.getRows()) {
+ for (XWPFTableCell cell : row.getTableCells()) {
+ replaceTextInParagraphs(cell.getParagraphs(), originalText, updatedText);
+ }
+ }
+ }
+ return doc;
+ }
+
+ private void replaceTextInParagraphs(List paragraphs, String originalText, String updatedText) {
+ paragraphs.forEach(paragraph -> replaceTextInParagraph(paragraph, originalText, updatedText));
+ }
+
+ private void replaceTextInParagraph(XWPFParagraph paragraph, String originalText, String updatedText) {
+ List runs = paragraph.getRuns();
+ for (XWPFRun run : runs) {
+ String text = run.getText(0);
+ if (text != null && text.contains(originalText)) {
+ String updatedRunText = text.replace(originalText, updatedText);
+ run.setText(updatedRunText, 0);
+ }
+ }
+ }
+
+ private void saveFile(String filePath, XWPFDocument doc) throws IOException {
+ try (FileOutputStream out = new FileOutputStream(filePath)) {
+ doc.write(out);
+ }
+ }
+
+}
diff --git a/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxTextReplacer.java b/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxTextReplacer.java
new file mode 100644
index 0000000000..2d08d24a4e
--- /dev/null
+++ b/apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxTextReplacer.java
@@ -0,0 +1,65 @@
+package com.baeldung.poi.replacevariables;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+
+public class DocxTextReplacer {
+
+ public void replaceText() throws IOException {
+ String filePath = getClass().getClassLoader()
+ .getResource("baeldung.docx")
+ .getPath();
+ try (InputStream inputStream = new FileInputStream(filePath)) {
+ XWPFDocument doc = new XWPFDocument(inputStream);
+ doc = replaceText(doc, "Baeldung", "Hello");
+ saveFile(filePath, doc);
+ doc.close();
+ }
+ }
+
+ private XWPFDocument replaceText(XWPFDocument doc, String originalText, String updatedText) {
+ replaceTextInParagraphs(doc.getParagraphs(), originalText, updatedText);
+ for (XWPFTable tbl : doc.getTables()) {
+ for (XWPFTableRow row : tbl.getRows()) {
+ for (XWPFTableCell cell : row.getTableCells()) {
+ replaceTextInParagraphs(cell.getParagraphs(), originalText, updatedText);
+ }
+ }
+ }
+ return doc;
+ }
+
+ private void replaceTextInParagraphs(List paragraphs, String originalText, String updatedText) {
+ paragraphs.forEach(paragraph -> replaceTextInParagraph(paragraph, originalText, updatedText));
+ }
+
+ private void replaceTextInParagraph(XWPFParagraph paragraph, String originalText, String updatedText) {
+ String paragraphText = paragraph.getParagraphText();
+ if (paragraphText.contains(originalText)) {
+ String updatedParagraphText = paragraphText.replace(originalText, updatedText);
+ while (paragraph.getRuns().size() > 0) {
+ paragraph.removeRun(0);
+ }
+ XWPFRun newRun = paragraph.createRun();
+ newRun.setText(updatedParagraphText);
+ }
+ }
+
+ private void saveFile(String filePath, XWPFDocument doc) throws IOException {
+ try (FileOutputStream out = new FileOutputStream(filePath)) {
+ doc.write(out);
+ }
+ }
+
+}
diff --git a/apache-poi-2/src/main/resources/baeldung-copy.docx b/apache-poi-2/src/main/resources/baeldung-copy.docx
new file mode 100644
index 0000000000..2cb76e8ffd
Binary files /dev/null and b/apache-poi-2/src/main/resources/baeldung-copy.docx differ
diff --git a/apache-poi-2/src/main/resources/baeldung.doc b/apache-poi-2/src/main/resources/baeldung.doc
new file mode 100644
index 0000000000..1b8474d65b
Binary files /dev/null and b/apache-poi-2/src/main/resources/baeldung.doc differ
diff --git a/apache-poi-2/src/main/resources/baeldung.docx b/apache-poi-2/src/main/resources/baeldung.docx
new file mode 100644
index 0000000000..f0de4e057b
Binary files /dev/null and b/apache-poi-2/src/main/resources/baeldung.docx differ
diff --git a/apache-poi-2/src/test/java/com/baeldung/poi/excel/dateformat/DateFormatUnitTest.java b/apache-poi-2/src/test/java/com/baeldung/poi/excel/dateformat/DateFormatUnitTest.java
new file mode 100644
index 0000000000..fe211beb77
--- /dev/null
+++ b/apache-poi-2/src/test/java/com/baeldung/poi/excel/dateformat/DateFormatUnitTest.java
@@ -0,0 +1,95 @@
+package com.baeldung.poi.excel.dateformat;
+
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Date;
+
+import static com.baeldung.poi.excel.dateformat.ExcelDateFormat.CUSTOM_DATE_FORMAT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DateFormatUnitTest {
+
+ private ExcelDateFormat excelDateFormat;
+
+ private XSSFWorkbook wb;
+
+ private Date date;
+
+
+ @BeforeEach
+ public void setup() {
+ excelDateFormat = new ExcelDateFormat();
+ wb = new XSSFWorkbook();
+ wb.createSheet();
+ date = new Date();
+ }
+
+ @Test
+ void givenExcelDate_whenSetDefaultDate_thenSuccess() {
+ // given Excel Sheet
+ XSSFSheet sheet = wb.getSheetAt(0);
+ XSSFCell dateCell = sheet.createRow(0).createCell(0);
+
+ // when set default date format
+ excelDateFormat.setDefaultDateFormat(dateCell, wb);
+ dateCell.setCellValue(date);
+
+ // then success
+ assertEquals(date, dateCell.getDateCellValue());
+ }
+
+ @Test
+ void givenExcelDate_whenSetCustomDate_thenSuccess() {
+ // given Excel Sheet
+ XSSFSheet sheet = wb.getSheetAt(0);
+ XSSFCell dateCellCustom = sheet.createRow(0).createCell(0);
+
+ // when set custom date format
+ excelDateFormat.setCustomDateFormat(dateCellCustom, wb);
+ dateCellCustom.setCellValue(date);
+
+ // then success
+ assertEquals(CUSTOM_DATE_FORMAT, dateCellCustom.getCellStyle().getDataFormatString());
+ assertEquals(date, dateCellCustom.getDateCellValue());
+ }
+
+ @Test
+ void givenExcelDefaultDateFormat_whenGetDefaultDateFormat_thenSuccess() {
+ // given Excel cell style with default date format
+ CellStyle cellStyle = wb.createCellStyle();
+
+ // when get default date format
+ cellStyle.setDataFormat((short) 14);
+ // then success
+ assertEquals("m/d/yy", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 15);
+ assertEquals("d-mmm-yy", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 16);
+ assertEquals("d-mmm", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 17);
+ assertEquals("mmm-yy", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 18);
+ assertEquals("h:mm AM/PM", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 19);
+ assertEquals("h:mm:ss AM/PM", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 20);
+ assertEquals("h:mm", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 21);
+ assertEquals("h:mm:ss", cellStyle.getDataFormatString());
+
+ cellStyle.setDataFormat((short) 22);
+ assertEquals("m/d/yy h:mm", cellStyle.getDataFormatString());
+ }
+}
diff --git a/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocTextReplacerUnitTest.java b/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocTextReplacerUnitTest.java
new file mode 100644
index 0000000000..0c3d80a354
--- /dev/null
+++ b/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocTextReplacerUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.poi.replacevariables;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.junit.jupiter.api.Test;
+
+class DocTextReplacerUnitTest {
+
+ @Test
+ void whenReplaceText_ThenTextReplaced() throws IOException {
+ new DocTextReplacer().replaceText();
+
+ String filePath = getClass().getClassLoader()
+ .getResource("baeldung.doc")
+ .getPath();
+ try (FileInputStream fis = new FileInputStream(filePath); HWPFDocument document = new HWPFDocument(fis); WordExtractor extractor = new WordExtractor(document)) {
+ long occurrencesOfHello = Arrays.stream(extractor.getText()
+ .split("\\s+"))
+ .filter(s -> s.contains("Hello"))
+ .count();
+ assertEquals(5, occurrencesOfHello);
+ }
+ }
+
+}
diff --git a/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacerUnitTest.java b/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacerUnitTest.java
new file mode 100644
index 0000000000..324e63eb51
--- /dev/null
+++ b/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacerUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.poi.replacevariables;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.junit.jupiter.api.Test;
+
+class DocxNaiveTextReplacerUnitTest {
+
+ @Test
+ void whenReplaceText_ThenTextReplaced() throws IOException {
+ new DocxNaiveTextReplacer().replaceText();
+
+ String filePath = getClass().getClassLoader()
+ .getResource("baeldung-copy.docx")
+ .getPath();
+ try (FileInputStream fis = new FileInputStream(filePath); XWPFDocument document = new XWPFDocument(fis); XWPFWordExtractor extractor = new XWPFWordExtractor(document)) {
+ long occurrencesOfHello = Arrays.stream(extractor.getText()
+ .split("\\s+"))
+ .filter(s -> s.contains("Hello"))
+ .count();
+ assertTrue(occurrencesOfHello < 5);
+ }
+ }
+
+}
diff --git a/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxTestReplacerUnitTest.java b/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxTestReplacerUnitTest.java
new file mode 100644
index 0000000000..d09f6b003d
--- /dev/null
+++ b/apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxTestReplacerUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.poi.replacevariables;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.junit.jupiter.api.Test;
+
+class DocxTestReplacerUnitTest {
+
+ @Test
+ void whenReplaceText_ThenTextReplaced() throws IOException {
+ new DocxTextReplacer().replaceText();
+
+ String filePath = getClass().getClassLoader()
+ .getResource("baeldung.docx")
+ .getPath();
+ try (FileInputStream fis = new FileInputStream(filePath); XWPFDocument document = new XWPFDocument(fis); XWPFWordExtractor extractor = new XWPFWordExtractor(document)) {
+ long occurrencesOfHello = Arrays.stream(extractor.getText()
+ .split("\\s+"))
+ .filter(s -> s.contains("Hello"))
+ .count();
+ assertEquals(5, occurrencesOfHello);
+ }
+ }
+
+}
diff --git a/apache-poi/pom.xml b/apache-poi/pom.xml
index 546eedec5b..78781cf215 100644
--- a/apache-poi/pom.xml
+++ b/apache-poi/pom.xml
@@ -30,6 +30,16 @@
+
+ org.dhatim
+ fastexcel
+ ${fastexcel.version}
+
+
+ org.dhatim
+ fastexcel-reader
+ ${fastexcel.version}
+
@@ -52,6 +62,7 @@
5.2.0
1.0.6
+ 0.15.3
3.2.0
diff --git a/apache-poi/src/main/java/com/baeldung/fastexcel/FastexcelHelper.java b/apache-poi/src/main/java/com/baeldung/fastexcel/FastexcelHelper.java
new file mode 100644
index 0000000000..9d6041b66e
--- /dev/null
+++ b/apache-poi/src/main/java/com/baeldung/fastexcel/FastexcelHelper.java
@@ -0,0 +1,63 @@
+package com.baeldung.fastexcel;
+
+import org.dhatim.fastexcel.Workbook;
+import org.dhatim.fastexcel.Worksheet;
+import org.dhatim.fastexcel.reader.Cell;
+import org.dhatim.fastexcel.reader.ReadableWorkbook;
+import org.dhatim.fastexcel.reader.Row;
+import org.dhatim.fastexcel.reader.Sheet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public class FastexcelHelper {
+
+ public Map> readExcel(String fileLocation) throws IOException {
+ Map> data = new HashMap<>();
+
+ try (FileInputStream file = new FileInputStream(fileLocation); ReadableWorkbook wb = new ReadableWorkbook(file)) {
+ Sheet sheet = wb.getFirstSheet();
+ try (Stream rows = sheet.openStream()) {
+ rows.forEach(r -> {
+ data.put(r.getRowNum(), new ArrayList<>());
+
+ for (Cell cell : r) {
+ data.get(r.getRowNum()).add(cell.getRawValue());
+ }
+ });
+ }
+ }
+
+ return data;
+ }
+
+ public void writeExcel() throws IOException {
+ File currDir = new File(".");
+ String path = currDir.getAbsolutePath();
+ String fileLocation = path.substring(0, path.length() - 1) + "fastexcel.xlsx";
+
+ try (OutputStream os = Files.newOutputStream(Paths.get(fileLocation)); Workbook wb = new Workbook(os, "MyApplication", "1.0")) {
+ Worksheet ws = wb.newWorksheet("Sheet 1");
+
+ ws.width(0, 25);
+ ws.width(1, 15);
+
+ ws.range(0, 0, 0, 1).style().fontName("Arial").fontSize(16).bold().fillColor("3366FF").set();
+ ws.value(0, 0, "Name");
+ ws.value(0, 1, "Age");
+
+ ws.range(2, 0, 2, 1).style().wrapText(true).set();
+ ws.value(2, 0, "John Smith");
+ ws.value(2, 1, 20L);
+ }
+ }
+}
diff --git a/apache-poi/src/test/java/com/baeldung/fastexcel/FastexcelIntegrationTest.java b/apache-poi/src/test/java/com/baeldung/fastexcel/FastexcelIntegrationTest.java
new file mode 100644
index 0000000000..a36c06e41f
--- /dev/null
+++ b/apache-poi/src/test/java/com/baeldung/fastexcel/FastexcelIntegrationTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.fastexcel;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class FastexcelIntegrationTest {
+
+ private FastexcelHelper fastexcelHelper;
+ private static String FILE_NAME = "fastexcel.xlsx";
+ private String fileLocation;
+
+ @Before
+ public void generateExcelFile() throws IOException {
+
+ File currDir = new File(".");
+ String path = currDir.getAbsolutePath();
+ fileLocation = path.substring(0, path.length() - 1) + FILE_NAME;
+
+ fastexcelHelper = new FastexcelHelper();
+ fastexcelHelper.writeExcel();
+ }
+
+ @Test
+ public void whenParsingExcelFile_thenCorrect() throws IOException {
+ Map> data = fastexcelHelper.readExcel(fileLocation);
+
+ assertEquals("Name", data.get(1).get(0));
+ assertEquals("Age", data.get(1).get(1));
+
+ assertEquals("John Smith", data.get(3).get(0));
+ assertEquals("20", data.get(3).get(1));
+ }
+
+ @After
+ public void cleanup() {
+ File testFile = new File(fileLocation);
+ if (testFile.exists()) {
+ testFile.delete();
+ }
+ }
+}
diff --git a/apache-rocketmq/pom.xml b/apache-rocketmq/pom.xml
deleted file mode 100644
index 48399b6d51..0000000000
--- a/apache-rocketmq/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- 4.0.0
- apache-rocketmq
- 1.0-SNAPSHOT
- apache-rocketmq
-
-
- com.baeldung
- parent-modules
- 1.0.0-SNAPSHOT
-
-
-
-
- org.apache.rocketmq
- rocketmq-spring-boot-starter
- ${rocketmq.version}
-
-
-
-
- 1.6.0
- 2.0.4
-
-
-
\ No newline at end of file
diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml
index 9e61e1340d..fbb6e9ba5e 100644
--- a/apache-spark/pom.xml
+++ b/apache-spark/pom.xml
@@ -7,7 +7,6 @@
1.0-SNAPSHOT
apache-spark
jar
- http://maven.apache.org
com.baeldung
@@ -18,17 +17,17 @@
org.apache.spark
- spark-core_2.11
+ spark-core_2.12
${org.apache.spark.spark-core.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_2.12
${org.apache.spark.spark-sql.version}
org.apache.spark
- spark-graphx_2.11
+ spark-graphx_2.12
${org.apache.spark.spark-graphx.version}
@@ -38,22 +37,22 @@
org.apache.spark
- spark-streaming_2.11
+ spark-streaming_2.12
${org.apache.spark.spark-streaming.version}
org.apache.spark
- spark-mllib_2.11
+ spark-mllib_2.12
${org.apache.spark.spark-mllib.version}
org.apache.spark
- spark-streaming-kafka-0-10_2.11
+ spark-streaming-kafka-0-10_2.12
${org.apache.spark.spark-streaming-kafka.version}
com.datastax.spark
- spark-cassandra-connector_2.11
+ spark-cassandra-connector_2.12
${com.datastax.spark.spark-cassandra-connector.version}
@@ -98,17 +97,17 @@
- 2.4.8
- 2.4.8
- 2.4.8
- 2.4.8
- 2.4.8
+ 3.3.2
+ 3.3.2
+ 3.3.2
+ 3.3.2
+ 3.3.2
0.8.1-spark3.0-s_2.12
- 2.4.8
- 2.5.2
+ 3.3.2
+ 3.3.0
1.6.0-M1
3.3.0
- 42.3.3
+ 42.5.4
\ No newline at end of file
diff --git a/apache-spark/src/main/java/com/baeldung/data/pipeline/WordCountingAppWithCheckpoint.java b/apache-spark/src/main/java/com/baeldung/data/pipeline/WordCountingAppWithCheckpoint.java
index efbe5f3851..15f70aae61 100644
--- a/apache-spark/src/main/java/com/baeldung/data/pipeline/WordCountingAppWithCheckpoint.java
+++ b/apache-spark/src/main/java/com/baeldung/data/pipeline/WordCountingAppWithCheckpoint.java
@@ -16,8 +16,11 @@ import org.apache.log4j.Logger;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.api.java.Optional;
import org.apache.spark.api.java.function.Function2;
+import org.apache.spark.api.java.function.Function3;
import org.apache.spark.streaming.Durations;
+import org.apache.spark.streaming.State;
import org.apache.spark.streaming.StateSpec;
import org.apache.spark.streaming.api.java.JavaDStream;
import org.apache.spark.streaming.api.java.JavaInputDStream;
@@ -74,7 +77,8 @@ public class WordCountingAppWithCheckpoint {
JavaPairDStream wordCounts = words.mapToPair(s -> new Tuple2<>(s, 1))
.reduceByKey((Function2) (i1, i2) -> i1 + i2);
- JavaMapWithStateDStream> cumulativeWordCounts = wordCounts.mapWithState(StateSpec.function((word, one, state) -> {
+ JavaMapWithStateDStream> cumulativeWordCounts =
+ wordCounts.mapWithState(StateSpec.function((Function3, State, Tuple2>) (word, one, state) -> {
int sum = one.orElse(0) + (state.exists() ? state.get() : 0);
Tuple2 output = new Tuple2<>(word, sum);
state.update(sum);
diff --git a/apache-spark/src/main/java/com/baeldung/dataframes/SparkDriver.java b/apache-spark/src/main/java/com/baeldung/dataframes/SparkDriver.java
index adc25170a7..e5e988b5a8 100644
--- a/apache-spark/src/main/java/com/baeldung/dataframes/SparkDriver.java
+++ b/apache-spark/src/main/java/com/baeldung/dataframes/SparkDriver.java
@@ -9,6 +9,7 @@ public class SparkDriver implements Serializable {
public static SparkSession getSparkSession() {
return SparkSession.builder()
.appName("Customer Aggregation pipeline")
+ .config("spark.sql.legacy.timeParserPolicy", "LEGACY")
.master("local")
.getOrCreate();
diff --git a/apache-tomcat/pom.xml b/apache-tomcat/pom.xml
deleted file mode 100644
index 36487f2108..0000000000
--- a/apache-tomcat/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- 4.0.0
-
- com.baeldung
- apache-tomcat
- 1.0.0-SNAPSHOT
- apache-tomcat
- pom
-
-
- com.baeldung
- parent-modules
- 1.0.0-SNAPSHOT
-
-
-
- sso
-
-
-
- install
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
-
-
\ No newline at end of file
diff --git a/apache-tomcat/sso/pom.xml b/apache-tomcat/sso/pom.xml
deleted file mode 100644
index d46fe45f66..0000000000
--- a/apache-tomcat/sso/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- 4.0.0
-
- com.baeldung.apache_tomcat
- sso
- 1.0.0-SNAPSHOT
- pom
-
-
- com.baeldung
- apache-tomcat
- 1.0.0-SNAPSHOT
-
-
-
diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml
index f4b6de8872..a562ebeec0 100644
--- a/apache-velocity/pom.xml
+++ b/apache-velocity/pom.xml
@@ -63,6 +63,7 @@
4.5.2
1.7
2.0
+ 3.3.2
\ No newline at end of file
diff --git a/asciidoctor/pom.xml b/asciidoctor/pom.xml
index e24917f2f4..b72f050379 100644
--- a/asciidoctor/pom.xml
+++ b/asciidoctor/pom.xml
@@ -62,10 +62,10 @@
- 1.5.6
- 1.5.6
- 1.5.0-alpha.15
- 1.5.0-alpha.15
+ 2.2.2
+ 2.5.7
+ 2.3.4
+ 2.3.4
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/.gitignore b/aws-modules/aws-lambda-modules/.gitignore
similarity index 100%
rename from aws-modules/aws-lambda/.gitignore
rename to aws-modules/aws-lambda-modules/.gitignore
diff --git a/aws-modules/aws-lambda/README.md b/aws-modules/aws-lambda-modules/README.md
similarity index 100%
rename from aws-modules/aws-lambda/README.md
rename to aws-modules/aws-lambda-modules/README.md
diff --git a/aws-modules/aws-lambda-modules/lambda-function/pom.xml b/aws-modules/aws-lambda-modules/lambda-function/pom.xml
new file mode 100644
index 0000000000..9fff7d1d9a
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/lambda-function/pom.xml
@@ -0,0 +1,103 @@
+
+
+ 4.0.0
+ lambda-function
+ 0.1.0-SNAPSHOT
+ lambda-function
+ jar
+
+
+ com.baeldung
+ aws-lambda-modules
+ 1.0.0-SNAPSHOT
+
+
+
+
+ com.amazonaws
+ aws-java-sdk-dynamodb
+ ${aws-java-sdk.version}
+
+
+ com.amazonaws
+ aws-java-sdk-core
+ ${aws-java-sdk.version}
+
+
+ com.amazonaws
+ aws-lambda-java-core
+ ${aws-lambda-java-core.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ com.amazonaws
+ aws-lambda-java-events
+ ${aws-lambda-java-events.version}
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ com.google.code.gson
+ gson
+ ${gson.version}
+
+
+ commons-io
+ commons-io
+ ${commons-io.version}
+
+
+ com.googlecode.json-simple
+ json-simple
+ ${json-simple.version}
+
+
+
+
+ junit
+ junit
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ ${maven-shade-plugin.version}
+
+ false
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
+ 1.1.1
+ 3.11.0
+ 1.2.1
+ 2.8.2
+
+
+
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/lambda/sam-templates/template-implicit.yaml b/aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-implicit.yaml
similarity index 100%
rename from aws-modules/aws-lambda/lambda/sam-templates/template-implicit.yaml
rename to aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-implicit.yaml
diff --git a/aws-modules/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml b/aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-inline-swagger.yaml
similarity index 100%
rename from aws-modules/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml
rename to aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-inline-swagger.yaml
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
diff --git a/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
new file mode 100644
index 0000000000..442e7ab4ef
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
@@ -0,0 +1,51 @@
+package com.baeldung.lambda.dynamodb;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+import com.amazonaws.services.dynamodbv2.model.AttributeValue;
+import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.baeldung.lambda.dynamodb.bean.PersonRequest;
+import com.baeldung.lambda.dynamodb.bean.PersonResponse;
+
+public class SavePersonHandler implements RequestHandler {
+
+ private AmazonDynamoDB amazonDynamoDB;
+
+ private String DYNAMODB_TABLE_NAME = "Person";
+ private Regions REGION = Regions.US_WEST_2;
+
+ public PersonResponse handleRequest(PersonRequest personRequest, Context context) {
+ this.initDynamoDbClient();
+
+ persistData(personRequest);
+
+ PersonResponse personResponse = new PersonResponse();
+ personResponse.setMessage("Saved Successfully!!!");
+ return personResponse;
+ }
+
+ private void persistData(PersonRequest personRequest) throws ConditionalCheckFailedException {
+
+ Map attributesMap = new HashMap<>();
+
+ attributesMap.put("id", new AttributeValue(String.valueOf(personRequest.getId())));
+ attributesMap.put("firstName", new AttributeValue(personRequest.getFirstName()));
+ attributesMap.put("lastName", new AttributeValue(personRequest.getLastName()));
+ attributesMap.put("age", new AttributeValue(String.valueOf(personRequest.getAge())));
+ attributesMap.put("address", new AttributeValue(personRequest.getAddress()));
+
+ amazonDynamoDB.putItem(DYNAMODB_TABLE_NAME, attributesMap);
+ }
+
+ private void initDynamoDbClient() {
+ this.amazonDynamoDB = AmazonDynamoDBClientBuilder.standard()
+ .withRegion(REGION)
+ .build();
+ }
+}
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/resources/logback.xml b/aws-modules/aws-lambda-modules/lambda-function/src/main/resources/logback.xml
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/resources/logback.xml
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/resources/logback.xml
diff --git a/aws-modules/aws-lambda-modules/pom.xml b/aws-modules/aws-lambda-modules/pom.xml
new file mode 100644
index 0000000000..9886ff58d2
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/pom.xml
@@ -0,0 +1,22 @@
+
+
+ 4.0.0
+ aws-lambda-modules
+ aws-lambda-modules
+ pom
+
+
+ com.baeldung
+ aws-modules
+ 1.0.0-SNAPSHOT
+
+
+
+ lambda-function
+ shipping-tracker-lambda/ShippingFunction
+ todo-reminder-lambda/ToDoFunction
+
+
+
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/shipping-tracker/.gitignore b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/.gitignore
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/.gitignore
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/.gitignore
diff --git a/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml
new file mode 100644
index 0000000000..abd22ea50c
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml
@@ -0,0 +1,80 @@
+
+ 4.0.0
+ ShippingFunction
+ 1.0
+ ShippingFunction
+ jar
+
+
+ com.baeldung
+ aws-lambda-modules
+ 1.0.0-SNAPSHOT
+ ../../
+
+
+
+
+ com.amazonaws
+ aws-lambda-java-core
+ ${aws-lambda-java-core.version}
+
+
+ com.amazonaws
+ aws-lambda-java-events
+ ${aws-lambda-java-events.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson-databind.version}
+
+
+ org.hibernate
+ hibernate-core
+ ${hibernate.version}
+
+
+ org.hibernate
+ hibernate-hikaricp
+ ${hibernate.version}
+
+
+ org.postgresql
+ postgresql
+ ${postgresql.version}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.1.1
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
+ 11
+ 11
+ 5.4.21.Final
+ 1.2.0
+ 3.1.0
+ 2.11.2
+ 42.2.16
+
+
+
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/template.yaml b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/template.yaml
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/template.yaml
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/template.yaml
diff --git a/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml
new file mode 100644
index 0000000000..04295e1ab1
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml
@@ -0,0 +1,126 @@
+
+ 4.0.0
+ helloworld
+ ToDoFunction
+ 1.0
+ ToDoFunction
+ jar
+
+
+ com.baeldung
+ aws-lambda-modules
+ 1.0.0-SNAPSHOT
+ ../../
+
+
+
+
+ com.amazonaws
+ aws-lambda-java-core
+ ${aws-lambda-java-core.version}
+
+
+ com.amazonaws
+ aws-lambda-java-events
+ ${aws-lambda-java-events.version}
+
+
+ uk.org.webcompere
+ lightweight-config
+ ${lightweight-config.version}
+
+
+ com.amazonaws
+ aws-lambda-java-log4j2
+ ${aws-lambda-java-log4j2.version}
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ ${log4j-slf4j-impl.version}
+
+
+ io.github.openfeign
+ feign-core
+ ${feign-core.version}
+
+
+ io.github.openfeign
+ feign-slf4j
+ ${feign-core.version}
+
+
+ io.github.openfeign
+ feign-gson
+ ${feign-core.version}
+
+
+ com.google.inject
+ guice
+ ${guice.version}
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit-jupiter.version}
+ test
+
+
+ uk.org.webcompere
+ system-stubs-junit4
+ ${system-stubs-junit4.version}
+ test
+
+
+ org.mockito
+ mockito-core
+ ${mockito-core.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ ${assertj-core.version}
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.2.4
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
+ 11
+ 11
+ 1.2.1
+ 3.6.0
+ 1.2.1
+ 1.2.0
+ 2.13.2
+ 11.2
+ 5.1.0
+ 2.0.2
+ 4.1.0
+ 3.19.0
+ 5.8.1
+
+
+
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/configuration.yml
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/configuration.yml
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/log4j2.xml
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/log4j2.xml
diff --git a/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppUnitTest.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppUnitTest.java
new file mode 100644
index 0000000000..952a773f69
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppUnitTest.java
@@ -0,0 +1,58 @@
+package com.baeldung.lambda.todo;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.baeldung.lambda.todo.config.Config;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import uk.org.webcompere.lightweightconfig.ConfigLoader;
+import uk.org.webcompere.systemstubs.rules.EnvironmentVariablesRule;
+import uk.org.webcompere.systemstubs.stream.input.LinesAltStream;
+import uk.org.webcompere.systemstubs.stream.output.NoopStream;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AppUnitTest {
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mockContext;
+
+ @Rule
+ public EnvironmentVariablesRule environmentVariablesRule = new EnvironmentVariablesRule();
+
+ private InputStream fakeInputStream = new LinesAltStream();
+ private OutputStream fakeOutputStream = new NoopStream();
+
+ @Test
+ public void whenTheEnvironmentVariableIsSet_thenItIsLogged() throws Exception {
+ environmentVariablesRule.set("ENV_NAME", "unitTest");
+ new App().handleRequest(fakeInputStream, fakeOutputStream, mockContext);
+
+ verify(mockContext.getLogger())
+ .log("Environment: unitTest\n");
+ }
+
+ @Test
+ public void givenEnvironmentVariableIsNotSet_thenUseDefault() {
+ String setting = Optional.ofNullable(System.getenv("SETTING"))
+ .orElse("default");
+
+ assertThat(setting).isEqualTo("default");
+ }
+
+ @Test
+ public void givenConfiguration_canLoadIntoPojo() {
+ environmentVariablesRule.set("ENV_NAME", "unitTest");
+ Config config = ConfigLoader.loadYmlConfigFromResource("configuration.yml", Config.class);
+ assertThat(config.getEnvironmentName()).isEqualTo("unitTest");
+ }
+}
\ No newline at end of file
diff --git a/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceUnitTest.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceUnitTest.java
new file mode 100644
index 0000000000..dd5b52d073
--- /dev/null
+++ b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.lambda.todo.service;
+
+import com.baeldung.lambda.todo.config.Config;
+import org.junit.Rule;
+import org.junit.Test;
+import uk.org.webcompere.systemstubs.rules.SystemOutRule;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+public class ToDoReaderServiceUnitTest {
+
+ @Rule
+ public SystemOutRule systemOutRule = new SystemOutRule();
+
+ @Test
+ public void whenTheServiceStarts_thenItOutputsEndpoint() {
+ Config config = new Config();
+ config.setToDoEndpoint("https://todo-endpoint.com");
+ ToDoReaderService service = new ToDoReaderService(config, null);
+
+ assertThat(systemOutRule.getLinesNormalized())
+ .contains("ToDo Endpoint on: https://todo-endpoint.com");
+ }
+}
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/todo-reminder/template.yaml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/template.yaml
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/template.yaml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/template.yaml
diff --git a/aws-modules/aws-lambda/lambda/pom.xml b/aws-modules/aws-lambda/lambda/pom.xml
deleted file mode 100644
index edf52d0581..0000000000
--- a/aws-modules/aws-lambda/lambda/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
- 4.0.0
- lambda
- 0.1.0-SNAPSHOT
- lambda
- jar
-
-
- com.baeldung
- aws-lambda
- 1.0.0-SNAPSHOT
-
-
-
-
- com.amazonaws
- aws-java-sdk-dynamodb
- ${aws-java-sdk.version}
-
-
- com.amazonaws
- aws-java-sdk-core
- ${aws-java-sdk.version}
-
-
- com.amazonaws
- aws-lambda-java-core
- ${aws-lambda-java-core.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
- com.amazonaws
- aws-lambda-java-events
- ${aws-lambda-java-events.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
- com.google.code.gson
- gson
- ${gson.version}
-
-
- commons-io
- commons-io
- ${commons-io.version}
-
-
- com.googlecode.json-simple
- json-simple
- ${json-simple.version}
-
-
-
- junit
- junit
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- ${maven-shade-plugin.version}
-
- false
-
-
-
- package
-
- shade
-
-
-
-
-
-
-
-
- 1.1.1
- 1.3.0
- 1.2.0
- 2.8.2
-
-
-
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
deleted file mode 100644
index 625da62efd..0000000000
--- a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.baeldung.lambda.dynamodb;
-
-import com.amazonaws.regions.Region;
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
-import com.amazonaws.services.dynamodbv2.document.DynamoDB;
-import com.amazonaws.services.dynamodbv2.document.Item;
-import com.amazonaws.services.dynamodbv2.document.PutItemOutcome;
-import com.amazonaws.services.dynamodbv2.document.spec.PutItemSpec;
-import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException;
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.baeldung.lambda.dynamodb.bean.PersonRequest;
-import com.baeldung.lambda.dynamodb.bean.PersonResponse;
-
-public class SavePersonHandler implements RequestHandler {
-
- private DynamoDB dynamoDb;
-
- private String DYNAMODB_TABLE_NAME = "Person";
- private Regions REGION = Regions.US_WEST_2;
-
- public PersonResponse handleRequest(PersonRequest personRequest, Context context) {
- this.initDynamoDbClient();
-
- persistData(personRequest);
-
- PersonResponse personResponse = new PersonResponse();
- personResponse.setMessage("Saved Successfully!!!");
- return personResponse;
- }
-
- private PutItemOutcome persistData(PersonRequest personRequest) throws ConditionalCheckFailedException {
- return this.dynamoDb.getTable(DYNAMODB_TABLE_NAME)
- .putItem(
- new PutItemSpec().withItem(new Item()
- .withNumber("id", personRequest.getId())
- .withString("firstName", personRequest.getFirstName())
- .withString("lastName", personRequest.getLastName())
- .withNumber("age", personRequest.getAge())
- .withString("address", personRequest.getAddress())));
- }
-
- private void initDynamoDbClient() {
- AmazonDynamoDBClient client = new AmazonDynamoDBClient();
- client.setRegion(Region.getRegion(REGION));
- this.dynamoDb = new DynamoDB(client);
- }
-}
diff --git a/aws-modules/aws-lambda/pom.xml b/aws-modules/aws-lambda/pom.xml
deleted file mode 100644
index bdd295c007..0000000000
--- a/aws-modules/aws-lambda/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- 4.0.0
- aws-lambda
- aws-lambda
- pom
-
-
- com.baeldung
- aws-modules
- 1.0.0-SNAPSHOT
-
-
-
- lambda
- shipping-tracker/ShippingFunction
- todo-reminder/ToDoFunction
-
-
-
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
deleted file mode 100644
index c36c81375d..0000000000
--- a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
- 4.0.0
- com.baeldung
- ShippingFunction
- 1.0
- ShippingFunction
- jar
-
-
- com.baeldung
- aws-lambda
- 1.0.0-SNAPSHOT
- ../../
-
-
-
-
- com.amazonaws
- aws-lambda-java-core
- ${aws-lambda-java-core.version}
-
-
- com.amazonaws
- aws-lambda-java-events
- ${aws-lambda-java-events.version}
-
-
- com.fasterxml.jackson.core
- jackson-databind
- ${jackson-databind.version}
-
-
- org.hibernate
- hibernate-core
- ${hibernate.version}
-
-
- org.hibernate
- hibernate-hikaricp
- ${hibernate.version}
-
-
- org.postgresql
- postgresql
- ${postgresql.version}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.1.1
-
-
-
-
- package
-
- shade
-
-
-
-
-
-
-
-
- 1.8
- 1.8
- 5.4.21.Final
- 1.2.0
- 3.1.0
- 2.11.2
- 42.2.16
-
-
-
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml
deleted file mode 100644
index cb6dd08d1e..0000000000
--- a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-
- 4.0.0
- helloworld
- ToDoFunction
- 1.0
- ToDoFunction
- jar
-
-
-
- com.amazonaws
- aws-lambda-java-core
- ${aws-lambda-java-core.version}
-
-
- com.amazonaws
- aws-lambda-java-events
- ${aws-lambda-java-events.version}
-
-
- uk.org.webcompere
- lightweight-config
- ${lightweight-config.version}
-
-
- com.amazonaws
- aws-lambda-java-log4j2
- ${aws-lambda-java-log4j2.version}
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
- ${log4j-slf4j-impl.version}
-
-
- io.github.openfeign
- feign-core
- ${feign-core.version}
-
-
- io.github.openfeign
- feign-slf4j
- ${feign-core.version}
-
-
- io.github.openfeign
- feign-gson
- ${feign-core.version}
-
-
- com.google.inject
- guice
- ${guice.version}
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
-
- uk.org.webcompere
- system-stubs-junit4
- ${system-stubs-junit4.version}
- test
-
-
- org.mockito
- mockito-core
- ${mockito-core.version}
- test
-
-
- org.assertj
- assertj-core
- ${assertj-core.version}
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.2.4
-
-
-
-
- package
-
- shade
-
-
-
-
-
-
-
-
- 1.8
- 1.8
- 1.2.1
- 3.6.0
- 1.1.0
- 1.2.0
- 2.13.2
- 11.2
- 5.0.1
- 1.2.0
- 4.1.0
- 3.19.0
- 5.8.1
-
-
-
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
deleted file mode 100644
index cbdc8c22cb..0000000000
--- a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.baeldung.lambda.todo;
-
-import com.amazonaws.services.lambda.runtime.Context;
-import com.baeldung.lambda.todo.config.Config;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import uk.org.webcompere.lightweightconfig.ConfigLoader;
-import uk.org.webcompere.systemstubs.rules.EnvironmentVariablesRule;
-import uk.org.webcompere.systemstubs.stream.input.LinesAltStream;
-import uk.org.webcompere.systemstubs.stream.output.NoopStream;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verify;
-
-@RunWith(MockitoJUnitRunner.class)
-public class AppTest {
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mockContext;
-
- @Rule
- public EnvironmentVariablesRule environmentVariablesRule = new EnvironmentVariablesRule();
-
- private InputStream fakeInputStream = new LinesAltStream();
- private OutputStream fakeOutputStream = new NoopStream();
-
- @Test
- public void whenTheEnvironmentVariableIsSet_thenItIsLogged() throws Exception {
- environmentVariablesRule.set("ENV_NAME", "unitTest");
- new App().handleRequest(fakeInputStream, fakeOutputStream, mockContext);
-
- verify(mockContext.getLogger())
- .log("Environment: unitTest\n");
- }
-
- @Test
- public void givenEnvironmentVariableIsNotSet_thenUseDefault() {
- String setting = Optional.ofNullable(System.getenv("SETTING"))
- .orElse("default");
-
- assertThat(setting).isEqualTo("default");
- }
-
- @Test
- public void givenConfiguration_canLoadIntoPojo() {
- environmentVariablesRule.set("ENV_NAME", "unitTest");
- Config config = ConfigLoader.loadYmlConfigFromResource("configuration.yml", Config.class);
- assertThat(config.getEnvironmentName()).isEqualTo("unitTest");
- }
-}
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
deleted file mode 100644
index 634c5257ff..0000000000
--- a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.baeldung.lambda.todo.service;
-
-import com.baeldung.lambda.todo.config.Config;
-import org.junit.Rule;
-import org.junit.Test;
-import uk.org.webcompere.systemstubs.rules.SystemOutRule;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
-public class ToDoReaderServiceTest {
-
- @Rule
- public SystemOutRule systemOutRule = new SystemOutRule();
-
- @Test
- public void whenTheServiceStarts_thenItOutputsEndpoint() {
- Config config = new Config();
- config.setToDoEndpoint("https://todo-endpoint.com");
- ToDoReaderService service = new ToDoReaderService(config, null);
-
- assertThat(systemOutRule.getLinesNormalized())
- .contains("ToDo Endpoint on: https://todo-endpoint.com");
- }
-}
\ No newline at end of file
diff --git a/aws-modules/aws-miscellaneous/pom.xml b/aws-modules/aws-miscellaneous/pom.xml
index 2b07f1153b..036e692d24 100644
--- a/aws-modules/aws-miscellaneous/pom.xml
+++ b/aws-modules/aws-miscellaneous/pom.xml
@@ -100,20 +100,12 @@
-
-
- dynamodb-local
- DynamoDB Local Release Repository
- ${dynamodblocal.repository.url}
-
-
1.3.0
1.1.0
2.8.0
- 1.11.86
- https://s3-us-west-2.amazonaws.com/dynamodb-local/release
+ 1.21.1
1.10.L001
0.9.4.0006L
3.1.1
diff --git a/aws-modules/aws-reactive/pom.xml b/aws-modules/aws-reactive/pom.xml
index 7a9cefb9d1..e6b50cadb2 100644
--- a/aws-modules/aws-reactive/pom.xml
+++ b/aws-modules/aws-reactive/pom.xml
@@ -77,6 +77,7 @@
org.projectlombok
lombok
+ ${lombok.version}
@@ -91,7 +92,8 @@
2.2.1.RELEASE
- 2.10.27
+ 2.17.283
+ 1.18.20
\ No newline at end of file
diff --git a/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java
index 838ada1685..7793eeb079 100644
--- a/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java
+++ b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java
@@ -3,17 +3,11 @@
*/
package com.baeldung.aws.reactive.s3;
-import java.io.InputStream;
import java.nio.ByteBuffer;
-import java.util.Map;
import java.util.Map.Entry;
-import java.util.concurrent.CompletableFuture;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
-import org.springframework.http.ResponseEntity.BodyBuilder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,11 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-import software.amazon.awssdk.core.ResponseBytes;
-import software.amazon.awssdk.core.SdkResponse;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
-import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.core.internal.async.ByteArrayAsyncResponseTransformer;
import software.amazon.awssdk.http.SdkHttpResponse;
import software.amazon.awssdk.services.s3.S3AsyncClient;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
@@ -40,38 +30,39 @@ import software.amazon.awssdk.services.s3.model.GetObjectResponse;
@RequestMapping("/inbox")
@Slf4j
public class DownloadResource {
-
-
+
private final S3AsyncClient s3client;
private final S3ClientConfigurarionProperties s3config;
public DownloadResource(S3AsyncClient s3client, S3ClientConfigurarionProperties s3config) {
this.s3client = s3client;
- this.s3config = s3config;
+ this.s3config = s3config;
}
-
-
- @GetMapping(path="/{filekey}")
- public Mono>> downloadFile(@PathVariable("filekey") String filekey) {
-
- GetObjectRequest request = GetObjectRequest.builder()
- .bucket(s3config.getBucket())
- .key(filekey)
- .build();
-
- return Mono.fromFuture(s3client.getObject(request,new FluxResponseProvider()))
- .map( (response) -> {
- checkResult(response.sdkResponse);
- String filename = getMetadataItem(response.sdkResponse,"filename",filekey);
- log.info("[I65] filename={}, length={}",filename, response.sdkResponse.contentLength() );
-
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_TYPE, response.sdkResponse.contentType())
- .header(HttpHeaders.CONTENT_LENGTH, Long.toString(response.sdkResponse.contentLength()))
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
- .body(response.flux);
- });
+ @GetMapping(path = "/{filekey}")
+ public Mono>> downloadFile(@PathVariable("filekey") String filekey) {
+
+ GetObjectRequest request = GetObjectRequest.builder()
+ .bucket(s3config.getBucket())
+ .key(filekey)
+ .build();
+
+ return Mono.fromFuture(s3client.getObject(request, AsyncResponseTransformer.toPublisher()))
+ .map(response -> {
+ checkResult(response.response());
+ String filename = getMetadataItem(response.response(), "filename", filekey);
+
+ log.info("[I65] filename={}, length={}", filename, response.response()
+ .contentLength());
+
+ return ResponseEntity.ok()
+ .header(HttpHeaders.CONTENT_TYPE, response.response()
+ .contentType())
+ .header(HttpHeaders.CONTENT_LENGTH, Long.toString(response.response()
+ .contentLength()))
+ .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
+ .body(Flux.from(response));
+ });
}
/**
@@ -82,63 +73,24 @@ public class DownloadResource {
* @return
*/
private String getMetadataItem(GetObjectResponse sdkResponse, String key, String defaultValue) {
- for( Entry entry : sdkResponse.metadata().entrySet()) {
- if ( entry.getKey().equalsIgnoreCase(key)) {
+ for (Entry entry : sdkResponse.metadata()
+ .entrySet()) {
+ if (entry.getKey()
+ .equalsIgnoreCase(key)) {
return entry.getValue();
}
}
return defaultValue;
}
-
// Helper used to check return codes from an API call
private static void checkResult(GetObjectResponse response) {
SdkHttpResponse sdkResponse = response.sdkHttpResponse();
- if ( sdkResponse != null && sdkResponse.isSuccessful()) {
+ if (sdkResponse != null && sdkResponse.isSuccessful()) {
return;
}
-
+
throw new DownloadFailedException(response);
}
-
-
- static class FluxResponseProvider implements AsyncResponseTransformer {
-
- private FluxResponse response;
-
- @Override
- public CompletableFuture prepare() {
- response = new FluxResponse();
- return response.cf;
- }
-
- @Override
- public void onResponse(GetObjectResponse sdkResponse) {
- this.response.sdkResponse = sdkResponse;
- }
-
- @Override
- public void onStream(SdkPublisher publisher) {
- response.flux = Flux.from(publisher);
- response.cf.complete(response);
- }
-
- @Override
- public void exceptionOccurred(Throwable error) {
- response.cf.completeExceptionally(error);
- }
-
- }
-
- /**
- * Holds the API response and stream
- * @author Philippe
- */
- static class FluxResponse {
-
- final CompletableFuture cf = new CompletableFuture<>();
- GetObjectResponse sdkResponse;
- Flux flux;
- }
}
diff --git a/aws-modules/aws-s3/README.md b/aws-modules/aws-s3/README.md
index efebf7d933..109a898405 100644
--- a/aws-modules/aws-s3/README.md
+++ b/aws-modules/aws-s3/README.md
@@ -6,4 +6,5 @@ This module contains articles about Simple Storage Service (S3) on AWS
- [AWS S3 with Java](https://www.baeldung.com/aws-s3-java)
- [Multipart Uploads in Amazon S3 with Java](https://www.baeldung.com/aws-s3-multipart-upload)
-- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
\ No newline at end of file
+- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
+- [Check if a Specified Key Exists in a Given S3 Bucket Using Java](https://www.baeldung.com/java-aws-s3-check-specified-key-exists)
diff --git a/aws-modules/aws-s3/src/main/java/com/baeldung/s3/AWSS3ObjectUtils.java b/aws-modules/aws-s3/src/main/java/com/baeldung/s3/AWSS3ObjectUtils.java
new file mode 100644
index 0000000000..1c31218ff9
--- /dev/null
+++ b/aws-modules/aws-s3/src/main/java/com/baeldung/s3/AWSS3ObjectUtils.java
@@ -0,0 +1,42 @@
+package com.baeldung.s3;
+
+import org.apache.http.HttpStatus;
+
+import com.amazonaws.AmazonServiceException;
+import com.amazonaws.services.s3.AmazonS3;
+
+public class AWSS3ObjectUtils {
+
+ private AmazonS3 s3Client;
+
+ public AWSS3ObjectUtils(AmazonS3 s3client) {
+ this.s3Client = s3client;
+ }
+
+ public boolean doesObjectExistByDefaultMethod(String bucket, String key) {
+ return s3Client.doesObjectExist(bucket, key);
+ }
+
+ public boolean doesObjectExistByListObjects(String bucket, String key) {
+ return s3Client.listObjects(bucket)
+ .getObjectSummaries()
+ .stream()
+ .filter(s3ObjectSummary -> s3ObjectSummary.getKey()
+ .equals(key))
+ .findFirst()
+ .isPresent();
+ }
+
+ public boolean doesObjectExistByMetaData(String bucket, String key) {
+ try {
+ s3Client.getObjectMetadata(bucket, key);
+ return true;
+ } catch (AmazonServiceException e) {
+ if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
+ return false;
+ } else {
+ throw e;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/aws-modules/aws-s3/src/test/java/com/baeldung/s3/AWSS3ObjectManualTest.java b/aws-modules/aws-s3/src/test/java/com/baeldung/s3/AWSS3ObjectManualTest.java
new file mode 100644
index 0000000000..02cc22367a
--- /dev/null
+++ b/aws-modules/aws-s3/src/test/java/com/baeldung/s3/AWSS3ObjectManualTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.s3;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+
+/**
+ * Required defined environment variables AWS_ACCESS_KEY_ID & AWS_ACCESS_KEY to access S3.
+ * Required S3 bucket and key that exist.
+ */
+
+public class AWSS3ObjectManualTest {
+
+ private static final String BUCKET = "your-bucket";
+ private static final String KEY_THAT_EXIST = "your-key-that-exist";
+ private AWSS3ObjectUtils s3ObjectUtils;
+
+ @Before
+ public void setUp() {
+ AmazonS3 client = AmazonS3ClientBuilder.standard()
+ .withRegion(Regions.DEFAULT_REGION)
+ .withCredentials(new EnvironmentVariableCredentialsProvider())
+ .build();
+
+ s3ObjectUtils = new AWSS3ObjectUtils(client);
+ }
+
+ @Test
+ public void whenVerifyIfObjectExistByDefaultMethod_thenCorrect() {
+ assertTrue(s3ObjectUtils.doesObjectExistByDefaultMethod(BUCKET, KEY_THAT_EXIST), "Key: " + KEY_THAT_EXIST + " doesn't exist");
+
+ }
+
+ @Test
+ public void whenVerifyIfObjectExistByListObjects_thenCorrect() {
+ assertTrue(s3ObjectUtils.doesObjectExistByListObjects(BUCKET, KEY_THAT_EXIST), "Key: " + KEY_THAT_EXIST + " doesn't exist");
+ }
+
+ @Test
+ public void whenVerifyIfObjectExistByMetaData_thenCorrect() {
+ assertTrue(s3ObjectUtils.doesObjectExistByMetaData(BUCKET, KEY_THAT_EXIST), "Key: " + KEY_THAT_EXIST + " doesn't exist");
+ }
+}
diff --git a/aws-modules/pom.xml b/aws-modules/pom.xml
index 4d3ec4b6dd..02473815b5 100644
--- a/aws-modules/pom.xml
+++ b/aws-modules/pom.xml
@@ -15,14 +15,14 @@
aws-app-sync
- aws-lambda
+ aws-lambda-modules
aws-miscellaneous
aws-reactive
aws-s3
- 1.11.290
+ 1.12.331
3.0.0
diff --git a/axon/README.md b/axon/README.md
index 6d3ef4a503..28b559b9ea 100644
--- a/axon/README.md
+++ b/axon/README.md
@@ -2,15 +2,23 @@
This module contains articles about Axon
+## Profiles
+
+Optionally the code can be run with the 'mongo' profile to use Mongo to store the projection. Otherwise, an in-memory
+projection is used.
+
## Scripts
-One script is included to easily start middleware using Docker:
+Two scripts are included to easily start middleware using Docker matching the properties files:
- `start_axon_server.sh` to start an Axon Server instance
+- `start_mongo.sh` to start a MongoDB instance
### Relevant articles
- [A Guide to the Axon Framework](https://www.baeldung.com/axon-cqrs-event-sourcing)
- [Multi-Entity Aggregates in Axon](https://www.baeldung.com/java-axon-multi-entity-aggregates)
- [Snapshotting Aggregates in Axon](https://www.baeldung.com/axon-snapshotting-aggregates)
-- [Dispatching Queries in Axon Framework](https://www.baeldung.com/axon-query-dispatching/)
+- [Dispatching Queries in Axon Framework](https://www.baeldung.com/axon-query-dispatching)
+- [Persisting the Query Model](https://www.baeldung.com/axon-persisting-query-model)
+- [Using and Testing Axon Applications via REST](https://www.baeldung.com/using-and-testing-axon-applications-via-rest)
diff --git a/axon/pom.xml b/axon/pom.xml
index 32f12f8c43..5eed742aab 100644
--- a/axon/pom.xml
+++ b/axon/pom.xml
@@ -1,7 +1,7 @@
+ 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
axon
axon
@@ -44,6 +44,10 @@
org.springframework.boot
spring-boot-starter-data-jpa
+
+ org.axonframework.extensions.mongo
+ axon-mongo
+
io.projectreactor
reactor-core
@@ -68,10 +72,48 @@
reactor-test
test
+
+ de.flapdoodle.embed
+ de.flapdoodle.embed.mongo
+ ${de.flapdoodle.embed.mongo.version}
+ test
+
+
+ org.awaitility
+ awaitility
+ test
+
+
+ org.springframework
+ spring-webflux
+ test
+
+
+ io.projectreactor.netty
+ reactor-netty-http
+ test
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ --add-opens java.base/java.util=ALL-UNNAMED
+ --add-opens
+ java.base/java.util.concurrent=ALL-UNNAMED
+
+
+
+
+
+
- 4.5.17
+ 4.6.3
+ 3.4.8
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/OrderApplication.java b/axon/src/main/java/com/baeldung/axon/OrderApplication.java
index 8f507e141c..9e5334c3a3 100644
--- a/axon/src/main/java/com/baeldung/axon/OrderApplication.java
+++ b/axon/src/main/java/com/baeldung/axon/OrderApplication.java
@@ -9,5 +9,4 @@ public class OrderApplication {
public static void main(String[] args) {
SpringApplication.run(OrderApplication.class, args);
}
-
}
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/OrderApplicationConfiguration.java b/axon/src/main/java/com/baeldung/axon/OrderApplicationConfiguration.java
index 8b743144b4..e1b7d5b14c 100644
--- a/axon/src/main/java/com/baeldung/axon/OrderApplicationConfiguration.java
+++ b/axon/src/main/java/com/baeldung/axon/OrderApplicationConfiguration.java
@@ -11,8 +11,7 @@ import org.springframework.context.annotation.Configuration;
public class OrderApplicationConfiguration {
@Bean
- public SnapshotTriggerDefinition orderAggregateSnapshotTriggerDefinition(Snapshotter snapshotter,
- @Value("${axon.aggregate.order.snapshot-threshold:250}") int threshold) {
+ public SnapshotTriggerDefinition orderAggregateSnapshotTriggerDefinition(Snapshotter snapshotter, @Value("${axon.aggregate.order.snapshot-threshold:250}") int threshold) {
return new EventCountSnapshotTriggerDefinition(snapshotter, threshold);
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderAggregate.java b/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderAggregate.java
index 1065e9d22b..c58c0b27ac 100644
--- a/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderAggregate.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderAggregate.java
@@ -12,6 +12,7 @@ import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
import com.baeldung.axon.coreapi.exceptions.DuplicateOrderLineException;
import com.baeldung.axon.coreapi.exceptions.OrderAlreadyConfirmedException;
import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
+
import org.axonframework.commandhandling.CommandHandler;
import org.axonframework.eventsourcing.EventSourcingHandler;
import org.axonframework.modelling.command.AggregateIdentifier;
diff --git a/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderLine.java b/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderLine.java
index e471ecbfe0..aa774070c0 100644
--- a/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderLine.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderLine.java
@@ -7,6 +7,7 @@ import com.baeldung.axon.coreapi.events.ProductCountDecrementedEvent;
import com.baeldung.axon.coreapi.events.ProductCountIncrementedEvent;
import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
import com.baeldung.axon.coreapi.exceptions.OrderAlreadyConfirmedException;
+
import org.axonframework.commandhandling.CommandHandler;
import org.axonframework.eventsourcing.EventSourcingHandler;
import org.axonframework.modelling.command.EntityId;
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/AddProductCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/AddProductCommand.java
index 28736aaadc..8f2babc2dc 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/commands/AddProductCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/AddProductCommand.java
@@ -42,9 +42,6 @@ public class AddProductCommand {
@Override
public String toString() {
- return "AddProductCommand{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "AddProductCommand{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/ConfirmOrderCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/ConfirmOrderCommand.java
index 244b69f3b7..37f1df2725 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/commands/ConfirmOrderCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/ConfirmOrderCommand.java
@@ -36,8 +36,6 @@ public class ConfirmOrderCommand {
@Override
public String toString() {
- return "ConfirmOrderCommand{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "ConfirmOrderCommand{" + "orderId='" + orderId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateOrderCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateOrderCommand.java
index ceb7fd6a08..294d53cab8 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateOrderCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateOrderCommand.java
@@ -36,8 +36,6 @@ public class CreateOrderCommand {
@Override
public String toString() {
- return "CreateOrderCommand{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "CreateOrderCommand{" + "orderId='" + orderId + '\'' + '}';
}
}
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/DecrementProductCountCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/DecrementProductCountCommand.java
index f6f4db00fc..0874f88df8 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/commands/DecrementProductCountCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/DecrementProductCountCommand.java
@@ -42,9 +42,6 @@ public class DecrementProductCountCommand {
@Override
public String toString() {
- return "DecrementProductCountCommand{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "DecrementProductCountCommand{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/IncrementProductCountCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/IncrementProductCountCommand.java
index 548faabe37..aceb93e478 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/commands/IncrementProductCountCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/IncrementProductCountCommand.java
@@ -42,9 +42,6 @@ public class IncrementProductCountCommand {
@Override
public String toString() {
- return "IncrementProductCountCommand{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "IncrementProductCountCommand{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/commands/ShipOrderCommand.java b/axon/src/main/java/com/baeldung/axon/coreapi/commands/ShipOrderCommand.java
index 7312bc1fdb..f0f3a6e071 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/commands/ShipOrderCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/commands/ShipOrderCommand.java
@@ -36,8 +36,6 @@ public class ShipOrderCommand {
@Override
public String toString() {
- return "ShipOrderCommand{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "ShipOrderCommand{" + "orderId='" + orderId + '\'' + '}';
}
}
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderConfirmedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderConfirmedEvent.java
index d2b7d58435..3253c2f1d5 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderConfirmedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderConfirmedEvent.java
@@ -33,8 +33,6 @@ public class OrderConfirmedEvent {
@Override
public String toString() {
- return "OrderConfirmedEvent{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "OrderConfirmedEvent{" + "orderId='" + orderId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderCreatedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderCreatedEvent.java
index 5d2d8b7f55..2bb86108f9 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderCreatedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderCreatedEvent.java
@@ -33,8 +33,6 @@ public class OrderCreatedEvent {
@Override
public String toString() {
- return "OrderCreatedEvent{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "OrderCreatedEvent{" + "orderId='" + orderId + '\'' + '}';
}
}
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderShippedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderShippedEvent.java
index 76aa684629..5161bc7bf1 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderShippedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/OrderShippedEvent.java
@@ -33,8 +33,6 @@ public class OrderShippedEvent {
@Override
public String toString() {
- return "OrderShippedEvent{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "OrderShippedEvent{" + "orderId='" + orderId + '\'' + '}';
}
}
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductAddedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductAddedEvent.java
index 091ef2a570..14510cb161 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductAddedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductAddedEvent.java
@@ -39,9 +39,6 @@ public class ProductAddedEvent {
@Override
public String toString() {
- return "ProductAddedEvent{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "ProductAddedEvent{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountDecrementedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountDecrementedEvent.java
index 4017916791..eec424cb24 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountDecrementedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountDecrementedEvent.java
@@ -39,9 +39,6 @@ public class ProductCountDecrementedEvent {
@Override
public String toString() {
- return "ProductCountDecrementedEvent{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "ProductCountDecrementedEvent{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountIncrementedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountIncrementedEvent.java
index 2910a9ea6f..0d008758c7 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountIncrementedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountIncrementedEvent.java
@@ -39,9 +39,6 @@ public class ProductCountIncrementedEvent {
@Override
public String toString() {
- return "ProductCountIncrementedEvent{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "ProductCountIncrementedEvent{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductRemovedEvent.java b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductRemovedEvent.java
index 7f89ccd1cc..13ff77db26 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductRemovedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/events/ProductRemovedEvent.java
@@ -39,9 +39,6 @@ public class ProductRemovedEvent {
@Override
public String toString() {
- return "ProductRemovedEvent{" +
- "orderId='" + orderId + '\'' +
- ", productId='" + productId + '\'' +
- '}';
+ return "ProductRemovedEvent{" + "orderId='" + orderId + '\'' + ", productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/queries/Order.java b/axon/src/main/java/com/baeldung/axon/coreapi/queries/Order.java
index 1810a053d3..9cef3e84ee 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/queries/Order.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/queries/Order.java
@@ -40,7 +40,6 @@ public class Order {
products.computeIfPresent(productId, (id, count) -> --count);
}
-
public void removeProduct(String productId) {
products.remove(productId);
}
@@ -62,9 +61,7 @@ public class Order {
return false;
}
Order that = (Order) o;
- return Objects.equals(orderId, that.orderId)
- && Objects.equals(products, that.products)
- && orderStatus == that.orderStatus;
+ return Objects.equals(orderId, that.orderId) && Objects.equals(products, that.products) && orderStatus == that.orderStatus;
}
@Override
@@ -74,10 +71,6 @@ public class Order {
@Override
public String toString() {
- return "Order{" +
- "orderId='" + orderId + '\'' +
- ", products=" + products +
- ", orderStatus=" + orderStatus +
- '}';
+ return "Order{" + "orderId='" + orderId + '\'' + ", products=" + products + ", orderStatus=" + orderStatus + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderUpdatesQuery.java b/axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderUpdatesQuery.java
index 37d2e67445..b4e66289b4 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderUpdatesQuery.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderUpdatesQuery.java
@@ -32,8 +32,6 @@ public class OrderUpdatesQuery {
@Override
public String toString() {
- return "OrderUpdatesQuery{" +
- "orderId='" + orderId + '\'' +
- '}';
+ return "OrderUpdatesQuery{" + "orderId='" + orderId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/queries/TotalProductsShippedQuery.java b/axon/src/main/java/com/baeldung/axon/coreapi/queries/TotalProductsShippedQuery.java
index 3a4129685b..8c3bbf3528 100644
--- a/axon/src/main/java/com/baeldung/axon/coreapi/queries/TotalProductsShippedQuery.java
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/queries/TotalProductsShippedQuery.java
@@ -32,8 +32,6 @@ public class TotalProductsShippedQuery {
@Override
public String toString() {
- return "TotalProductsShippedQuery{" +
- "productId='" + productId + '\'' +
- '}';
+ return "TotalProductsShippedQuery{" + "productId='" + productId + '\'' + '}';
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
index 9901f725fd..186aab3c0c 100644
--- a/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
+++ b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
@@ -8,12 +8,14 @@ import com.baeldung.axon.coreapi.commands.IncrementProductCountCommand;
import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
import com.baeldung.axon.querymodel.OrderQueryService;
import com.baeldung.axon.querymodel.OrderResponse;
+
import org.axonframework.commandhandling.gateway.CommandGateway;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
+
import reactor.core.publisher.Flux;
import java.util.List;
@@ -33,25 +35,28 @@ public class OrderRestEndpoint {
@PostMapping("/ship-order")
public CompletableFuture shipOrder() {
- String orderId = UUID.randomUUID().toString();
+ String orderId = UUID.randomUUID()
+ .toString();
return commandGateway.send(new CreateOrderCommand(orderId))
- .thenCompose(result -> commandGateway.send(new AddProductCommand(orderId, "Deluxe Chair")))
- .thenCompose(result -> commandGateway.send(new ConfirmOrderCommand(orderId)))
- .thenCompose(result -> commandGateway.send(new ShipOrderCommand(orderId)));
+ .thenCompose(result -> commandGateway.send(new AddProductCommand(orderId, "Deluxe Chair")))
+ .thenCompose(result -> commandGateway.send(new ConfirmOrderCommand(orderId)))
+ .thenCompose(result -> commandGateway.send(new ShipOrderCommand(orderId)));
}
@PostMapping("/ship-unconfirmed-order")
public CompletableFuture shipUnconfirmedOrder() {
- String orderId = UUID.randomUUID().toString();
+ String orderId = UUID.randomUUID()
+ .toString();
return commandGateway.send(new CreateOrderCommand(orderId))
- .thenCompose(result -> commandGateway.send(new AddProductCommand(orderId, "Deluxe Chair")))
- // This throws an exception, as an Order cannot be shipped if it has not been confirmed yet.
- .thenCompose(result -> commandGateway.send(new ShipOrderCommand(orderId)));
+ .thenCompose(result -> commandGateway.send(new AddProductCommand(orderId, "Deluxe Chair")))
+ // This throws an exception, as an Order cannot be shipped if it has not been confirmed yet.
+ .thenCompose(result -> commandGateway.send(new ShipOrderCommand(orderId)));
}
@PostMapping("/order")
public CompletableFuture createOrder() {
- return createOrder(UUID.randomUUID().toString());
+ return createOrder(UUID.randomUUID()
+ .toString());
}
@PostMapping("/order/{order-id}")
@@ -60,20 +65,17 @@ public class OrderRestEndpoint {
}
@PostMapping("/order/{order-id}/product/{product-id}")
- public CompletableFuture addProduct(@PathVariable("order-id") String orderId,
- @PathVariable("product-id") String productId) {
+ public CompletableFuture addProduct(@PathVariable("order-id") String orderId, @PathVariable("product-id") String productId) {
return commandGateway.send(new AddProductCommand(orderId, productId));
}
@PostMapping("/order/{order-id}/product/{product-id}/increment")
- public CompletableFuture incrementProduct(@PathVariable("order-id") String orderId,
- @PathVariable("product-id") String productId) {
+ public CompletableFuture incrementProduct(@PathVariable("order-id") String orderId, @PathVariable("product-id") String productId) {
return commandGateway.send(new IncrementProductCountCommand(orderId, productId));
}
@PostMapping("/order/{order-id}/product/{product-id}/decrement")
- public CompletableFuture decrementProduct(@PathVariable("order-id") String orderId,
- @PathVariable("product-id") String productId) {
+ public CompletableFuture decrementProduct(@PathVariable("order-id") String orderId, @PathVariable("product-id") String productId) {
return commandGateway.send(new DecrementProductCountCommand(orderId, productId));
}
@@ -92,6 +94,11 @@ public class OrderRestEndpoint {
return orderQueryService.findAllOrders();
}
+ @GetMapping(path = "/all-orders-streaming", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+ public Flux allOrdersStreaming() {
+ return orderQueryService.allOrdersStreaming();
+ }
+
@GetMapping("/total-shipped/{product-id}")
public Integer totalShipped(@PathVariable("product-id") String productId) {
return orderQueryService.totalShipped(productId);
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/InMemoryOrdersEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/InMemoryOrdersEventHandler.java
index 202b48abfd..6e9dbbb335 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/InMemoryOrdersEventHandler.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/InMemoryOrdersEventHandler.java
@@ -17,8 +17,13 @@ import org.axonframework.config.ProcessingGroup;
import org.axonframework.eventhandling.EventHandler;
import org.axonframework.queryhandling.QueryHandler;
import org.axonframework.queryhandling.QueryUpdateEmitter;
+import org.reactivestreams.Publisher;
+import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,6 +32,7 @@ import java.util.Optional;
@Service
@ProcessingGroup("orders")
+@Profile("!mongo")
public class InMemoryOrdersEventHandler implements OrdersEventHandler {
private final Map orders = new HashMap<>();
@@ -101,6 +107,12 @@ public class InMemoryOrdersEventHandler implements OrdersEventHandler {
return new ArrayList<>(orders.values());
}
+ @QueryHandler
+ public Publisher handleStreaming(FindAllOrderedProductsQuery query) {
+ return Mono.fromCallable(orders::values)
+ .flatMapMany(Flux::fromIterable);
+ }
+
@QueryHandler
public Integer handle(TotalProductsShippedQuery query) {
return orders.values()
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/MongoConfiguration.java b/axon/src/main/java/com/baeldung/axon/querymodel/MongoConfiguration.java
new file mode 100644
index 0000000000..d68569efc8
--- /dev/null
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/MongoConfiguration.java
@@ -0,0 +1,26 @@
+package com.baeldung.axon.querymodel;
+
+import com.mongodb.client.MongoClient;
+
+import org.axonframework.eventhandling.tokenstore.TokenStore;
+import org.axonframework.extensions.mongo.DefaultMongoTemplate;
+import org.axonframework.extensions.mongo.eventsourcing.tokenstore.MongoTokenStore;
+import org.axonframework.serialization.Serializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("mongo")
+public class MongoConfiguration {
+
+ @Bean
+ public TokenStore getTokenStore(MongoClient client, Serializer serializer) {
+ return MongoTokenStore.builder()
+ .mongoTemplate(DefaultMongoTemplate.builder()
+ .mongoDatabase(client)
+ .build())
+ .serializer(serializer)
+ .build();
+ }
+}
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/MongoOrdersEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/MongoOrdersEventHandler.java
new file mode 100644
index 0000000000..4da98a9f97
--- /dev/null
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/MongoOrdersEventHandler.java
@@ -0,0 +1,194 @@
+package com.baeldung.axon.querymodel;
+
+import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
+import com.baeldung.axon.coreapi.events.OrderCreatedEvent;
+import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.events.ProductAddedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountDecrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountIncrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
+import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
+import com.baeldung.axon.coreapi.queries.Order;
+import com.baeldung.axon.coreapi.queries.OrderStatus;
+import com.baeldung.axon.coreapi.queries.OrderUpdatesQuery;
+import com.baeldung.axon.coreapi.queries.TotalProductsShippedQuery;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.result.UpdateResult;
+
+import groovyjarjarantlr4.v4.runtime.misc.NotNull;
+
+import org.axonframework.config.ProcessingGroup;
+import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.queryhandling.QueryHandler;
+import org.axonframework.queryhandling.QueryUpdateEmitter;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.reactivestreams.Publisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import reactor.core.publisher.Flux;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+import static com.mongodb.client.model.Filters.*;
+
+@Service
+@ProcessingGroup("orders")
+@Profile("mongo")
+public class MongoOrdersEventHandler implements OrdersEventHandler {
+
+ static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup()
+ .lookupClass());
+
+ private final MongoCollection orders;
+ private final QueryUpdateEmitter emitter;
+ private static final String ORDER_COLLECTION_NAME = "orders";
+ private static final String AXON_FRAMEWORK_DATABASE_NAME = "axonframework";
+
+ private static final String ORDER_ID_PROPERTY_NAME = "orderId";
+ private static final String PRODUCTS_PROPERTY_NAME = "products";
+ private static final String ORDER_STATUS_PROPERTY_NAME = "orderStatus";
+
+ public MongoOrdersEventHandler(MongoClient client, QueryUpdateEmitter emitter) {
+ orders = client.getDatabase(AXON_FRAMEWORK_DATABASE_NAME)
+ .getCollection(ORDER_COLLECTION_NAME);
+ orders.createIndex(Indexes.ascending(ORDER_ID_PROPERTY_NAME), new IndexOptions().unique(true));
+ this.emitter = emitter;
+ }
+
+ @EventHandler
+ public void on(OrderCreatedEvent event) {
+ orders.insertOne(orderToDocument(new Order(event.getOrderId())));
+ }
+
+ @EventHandler
+ public void on(ProductAddedEvent event) {
+ update(event.getOrderId(), o -> o.addProduct(event.getProductId()));
+ }
+
+ @EventHandler
+ public void on(ProductCountIncrementedEvent event) {
+ update(event.getOrderId(), o -> o.incrementProductInstance(event.getProductId()));
+ }
+
+ @EventHandler
+ public void on(ProductCountDecrementedEvent event) {
+ update(event.getOrderId(), o -> o.decrementProductInstance(event.getProductId()));
+ }
+
+ @EventHandler
+ public void on(ProductRemovedEvent event) {
+ update(event.getOrderId(), o -> o.removeProduct(event.getProductId()));
+ }
+
+ @EventHandler
+ public void on(OrderConfirmedEvent event) {
+ update(event.getOrderId(), Order::setOrderConfirmed);
+ }
+
+ @EventHandler
+ public void on(OrderShippedEvent event) {
+ update(event.getOrderId(), Order::setOrderShipped);
+ }
+
+ @QueryHandler
+ public List handle(FindAllOrderedProductsQuery query) {
+ List orderList = new ArrayList<>();
+ orders.find()
+ .forEach(d -> orderList.add(documentToOrder(d)));
+ return orderList;
+ }
+
+ @Override
+ public Publisher handleStreaming(FindAllOrderedProductsQuery query) {
+ return Flux.fromIterable(orders.find())
+ .map(this::documentToOrder);
+ }
+
+ @QueryHandler
+ public Integer handle(TotalProductsShippedQuery query) {
+ AtomicInteger result = new AtomicInteger();
+ orders.find(shippedProductFilter(query.getProductId()))
+ .map(d -> d.get(PRODUCTS_PROPERTY_NAME, Document.class))
+ .map(d -> d.getInteger(query.getProductId(), 0))
+ .forEach(result::addAndGet);
+ return result.get();
+ }
+
+ @QueryHandler
+ public Order handle(OrderUpdatesQuery query) {
+ return getOrder(query.getOrderId()).orElse(null);
+ }
+
+ @Override
+ public void reset(List orderList) {
+ orders.deleteMany(new Document());
+ orderList.forEach(o -> orders.insertOne(orderToDocument(o)));
+ }
+
+ private Optional getOrder(String orderId) {
+ return Optional.ofNullable(orders.find(eq(ORDER_ID_PROPERTY_NAME, orderId))
+ .first())
+ .map(this::documentToOrder);
+ }
+
+ private Order emitUpdate(Order order) {
+ emitter.emit(OrderUpdatesQuery.class, q -> order.getOrderId()
+ .equals(q.getOrderId()), order);
+ return order;
+ }
+
+ private Order updateOrder(Order order, Consumer updateFunction) {
+ updateFunction.accept(order);
+ return order;
+ }
+
+ private UpdateResult persistUpdate(Order order) {
+ return orders.replaceOne(eq(ORDER_ID_PROPERTY_NAME, order.getOrderId()), orderToDocument(order));
+ }
+
+ private void update(String orderId, Consumer updateFunction) {
+ UpdateResult result = getOrder(orderId).map(o -> updateOrder(o, updateFunction))
+ .map(this::emitUpdate)
+ .map(this::persistUpdate)
+ .orElse(null);
+ logger.info("Result of updating order with orderId '{}': {}", orderId, result);
+ }
+
+ private Document orderToDocument(Order order) {
+ return new Document(ORDER_ID_PROPERTY_NAME, order.getOrderId()).append(PRODUCTS_PROPERTY_NAME, order.getProducts())
+ .append(ORDER_STATUS_PROPERTY_NAME, order.getOrderStatus()
+ .toString());
+ }
+
+ private Order documentToOrder(@NotNull Document document) {
+ Order order = new Order(document.getString(ORDER_ID_PROPERTY_NAME));
+ Document products = document.get(PRODUCTS_PROPERTY_NAME, Document.class);
+ products.forEach((k, v) -> order.getProducts()
+ .put(k, (Integer) v));
+ String status = document.getString(ORDER_STATUS_PROPERTY_NAME);
+ if (OrderStatus.CONFIRMED.toString()
+ .equals(status)) {
+ order.setOrderConfirmed();
+ } else if (OrderStatus.SHIPPED.toString()
+ .equals(status)) {
+ order.setOrderShipped();
+ }
+ return order;
+ }
+
+ private Bson shippedProductFilter(String productId) {
+ return and(eq(ORDER_STATUS_PROPERTY_NAME, OrderStatus.SHIPPED.toString()), exists(String.format(PRODUCTS_PROPERTY_NAME + ".%s", productId)));
+ }
+}
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/OrderQueryService.java b/axon/src/main/java/com/baeldung/axon/querymodel/OrderQueryService.java
index 192fc78226..8196a98957 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/OrderQueryService.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/OrderQueryService.java
@@ -9,6 +9,7 @@ import org.axonframework.messaging.responsetypes.ResponseType;
import org.axonframework.messaging.responsetypes.ResponseTypes;
import org.axonframework.queryhandling.QueryGateway;
import org.axonframework.queryhandling.SubscriptionQueryResult;
+import org.reactivestreams.Publisher;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Flux;
@@ -34,9 +35,14 @@ public class OrderQueryService {
.collect(Collectors.toList()));
}
+ public Flux allOrdersStreaming() {
+ Publisher publisher = queryGateway.streamingQuery(new FindAllOrderedProductsQuery(), Order.class);
+ return Flux.from(publisher)
+ .map(OrderResponse::new);
+ }
+
public Integer totalShipped(String productId) {
- return queryGateway.scatterGather(new TotalProductsShippedQuery(productId),
- ResponseTypes.instanceOf(Integer.class), 10L, TimeUnit.SECONDS)
+ return queryGateway.scatterGather(new TotalProductsShippedQuery(productId), ResponseTypes.instanceOf(Integer.class), 10L, TimeUnit.SECONDS)
.reduce(0, Integer::sum);
}
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/OrderStatusResponse.java b/axon/src/main/java/com/baeldung/axon/querymodel/OrderStatusResponse.java
index 90430b1e3d..2c4d32bff3 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/OrderStatusResponse.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/OrderStatusResponse.java
@@ -7,7 +7,8 @@ public enum OrderStatusResponse {
static OrderStatusResponse toResponse(OrderStatus status) {
for (OrderStatusResponse response : values()) {
- if (response.toString().equals(status.toString())) {
+ if (response.toString()
+ .equals(status.toString())) {
return response;
}
}
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/OrdersEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/OrdersEventHandler.java
index 0d4aad4c97..740e00cf72 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/OrdersEventHandler.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/OrdersEventHandler.java
@@ -12,6 +12,8 @@ import com.baeldung.axon.coreapi.queries.Order;
import com.baeldung.axon.coreapi.queries.OrderUpdatesQuery;
import com.baeldung.axon.coreapi.queries.TotalProductsShippedQuery;
+import org.reactivestreams.Publisher;
+
import java.util.List;
public interface OrdersEventHandler {
@@ -32,6 +34,8 @@ public interface OrdersEventHandler {
List handle(FindAllOrderedProductsQuery query);
+ Publisher handleStreaming(FindAllOrderedProductsQuery query);
+
Integer handle(TotalProductsShippedQuery query);
Order handle(OrderUpdatesQuery query);
diff --git a/axon/src/main/resources/application-mongo.properties b/axon/src/main/resources/application-mongo.properties
new file mode 100644
index 0000000000..f642d1591c
--- /dev/null
+++ b/axon/src/main/resources/application-mongo.properties
@@ -0,0 +1,6 @@
+spring.data.mongodb.host=localhost
+spring.data.mongodb.port=27017
+spring.data.mongodb.authentication-database=admin
+spring.data.mongodb.username=admin1234
+spring.data.mongodb.password=somepassword
+spring.data.mongodb.database=order-projection
\ No newline at end of file
diff --git a/axon/src/main/resources/order-api.http b/axon/src/main/resources/order-api.http
index d5f358cbb9..bd2a4289ab 100644
--- a/axon/src/main/resources/order-api.http
+++ b/axon/src/main/resources/order-api.http
@@ -10,6 +10,10 @@ POST http://localhost:8080/ship-unconfirmed-order
GET http://localhost:8080/all-orders
+### Receive all existing orders using a stream
+
+GET http://localhost:8080/all-orders-streaming
+
### Create Order with id 666a1661-474d-4046-8b12-8b5896312768
POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768
diff --git a/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java b/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
index c1d6bdccc2..fe7f57f854 100644
--- a/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
+++ b/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
@@ -17,6 +17,7 @@ import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
import com.baeldung.axon.coreapi.exceptions.DuplicateOrderLineException;
import com.baeldung.axon.coreapi.exceptions.OrderAlreadyConfirmedException;
import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
+
import org.axonframework.test.aggregate.AggregateTestFixture;
import org.axonframework.test.aggregate.FixtureConfiguration;
import org.axonframework.test.matchers.Matchers;
@@ -26,8 +27,10 @@ import java.util.UUID;
class OrderAggregateUnitTest {
- private static final String ORDER_ID = UUID.randomUUID().toString();
- private static final String PRODUCT_ID = UUID.randomUUID().toString();
+ private static final String ORDER_ID = UUID.randomUUID()
+ .toString();
+ private static final String PRODUCT_ID = UUID.randomUUID()
+ .toString();
private FixtureConfiguration fixture;
@@ -39,101 +42,95 @@ class OrderAggregateUnitTest {
@Test
void giveNoPriorActivity_whenCreateOrderCommand_thenShouldPublishOrderCreatedEvent() {
fixture.givenNoPriorActivity()
- .when(new CreateOrderCommand(ORDER_ID))
- .expectEvents(new OrderCreatedEvent(ORDER_ID));
+ .when(new CreateOrderCommand(ORDER_ID))
+ .expectEvents(new OrderCreatedEvent(ORDER_ID));
}
@Test
void givenOrderCreatedEvent_whenAddProductCommand_thenShouldPublishProductAddedEvent() {
fixture.given(new OrderCreatedEvent(ORDER_ID))
- .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
- .expectEvents(new ProductAddedEvent(ORDER_ID, PRODUCT_ID));
+ .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
+ .expectEvents(new ProductAddedEvent(ORDER_ID, PRODUCT_ID));
}
@Test
void givenOrderCreatedEventAndProductAddedEvent_whenAddProductCommandForSameProductId_thenShouldThrowDuplicateOrderLineException() {
fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID))
- .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
- .expectException(DuplicateOrderLineException.class)
- .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(PRODUCT_ID)));
+ .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
+ .expectException(DuplicateOrderLineException.class)
+ .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(PRODUCT_ID)));
}
@Test
void givenOrderCreatedEventAndProductAddedEvent_whenIncrementProductCountCommand_thenShouldPublishProductCountIncrementedEvent() {
fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID))
- .when(new IncrementProductCountCommand(ORDER_ID, PRODUCT_ID))
- .expectEvents(new ProductCountIncrementedEvent(ORDER_ID, PRODUCT_ID));
+ .when(new IncrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+ .expectEvents(new ProductCountIncrementedEvent(ORDER_ID, PRODUCT_ID));
}
@Test
void givenOrderCreatedEventProductAddedEventAndProductCountIncrementedEvent_whenDecrementProductCountCommand_thenShouldPublishProductCountDecrementedEvent() {
- fixture.given(new OrderCreatedEvent(ORDER_ID),
- new ProductAddedEvent(ORDER_ID, PRODUCT_ID),
- new ProductCountIncrementedEvent(ORDER_ID, PRODUCT_ID))
- .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
- .expectEvents(new ProductCountDecrementedEvent(ORDER_ID, PRODUCT_ID));
+ fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID), new ProductCountIncrementedEvent(ORDER_ID, PRODUCT_ID))
+ .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+ .expectEvents(new ProductCountDecrementedEvent(ORDER_ID, PRODUCT_ID));
}
@Test
void givenOrderCreatedEventAndProductAddedEvent_whenDecrementProductCountCommand_thenShouldPublishProductRemovedEvent() {
fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID))
- .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
- .expectEvents(new ProductRemovedEvent(ORDER_ID, PRODUCT_ID));
+ .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+ .expectEvents(new ProductRemovedEvent(ORDER_ID, PRODUCT_ID));
}
@Test
void givenOrderCreatedEvent_whenConfirmOrderCommand_thenShouldPublishOrderConfirmedEvent() {
fixture.given(new OrderCreatedEvent(ORDER_ID))
- .when(new ConfirmOrderCommand(ORDER_ID))
- .expectEvents(new OrderConfirmedEvent(ORDER_ID));
+ .when(new ConfirmOrderCommand(ORDER_ID))
+ .expectEvents(new OrderConfirmedEvent(ORDER_ID));
}
@Test
void givenOrderCreatedEventAndOrderConfirmedEvent_whenConfirmOrderCommand_thenExpectNoEvents() {
fixture.given(new OrderCreatedEvent(ORDER_ID), new OrderConfirmedEvent(ORDER_ID))
- .when(new ConfirmOrderCommand(ORDER_ID))
- .expectNoEvents();
+ .when(new ConfirmOrderCommand(ORDER_ID))
+ .expectNoEvents();
}
@Test
void givenOrderCreatedEvent_whenShipOrderCommand_thenShouldThrowUnconfirmedOrderException() {
fixture.given(new OrderCreatedEvent(ORDER_ID))
- .when(new ShipOrderCommand(ORDER_ID))
- .expectException(UnconfirmedOrderException.class);
+ .when(new ShipOrderCommand(ORDER_ID))
+ .expectException(UnconfirmedOrderException.class);
}
@Test
void givenOrderCreatedEventAndOrderConfirmedEvent_whenShipOrderCommand_thenShouldPublishOrderShippedEvent() {
fixture.given(new OrderCreatedEvent(ORDER_ID), new OrderConfirmedEvent(ORDER_ID))
- .when(new ShipOrderCommand(ORDER_ID))
- .expectEvents(new OrderShippedEvent(ORDER_ID));
+ .when(new ShipOrderCommand(ORDER_ID))
+ .expectEvents(new OrderShippedEvent(ORDER_ID));
}
@Test
void givenOrderCreatedEventProductAndOrderConfirmedEvent_whenAddProductCommand_thenShouldThrowOrderAlreadyConfirmedException() {
fixture.given(new OrderCreatedEvent(ORDER_ID), new OrderConfirmedEvent(ORDER_ID))
- .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
- .expectException(OrderAlreadyConfirmedException.class)
- .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
+ .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
+ .expectException(OrderAlreadyConfirmedException.class)
+ .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
}
@Test
void givenOrderCreatedEventProductAddedEventAndOrderConfirmedEvent_whenIncrementProductCountCommand_thenShouldThrowOrderAlreadyConfirmedException() {
- fixture.given(new OrderCreatedEvent(ORDER_ID),
- new ProductAddedEvent(ORDER_ID, PRODUCT_ID),
- new OrderConfirmedEvent(ORDER_ID))
- .when(new IncrementProductCountCommand(ORDER_ID, PRODUCT_ID))
- .expectException(OrderAlreadyConfirmedException.class)
- .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
+ fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID), new OrderConfirmedEvent(ORDER_ID))
+ .when(new IncrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+ .expectException(OrderAlreadyConfirmedException.class)
+ .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
}
@Test
void givenOrderCreatedEventProductAddedEventAndOrderConfirmedEvent_whenDecrementProductCountCommand_thenShouldThrowOrderAlreadyConfirmedException() {
- fixture.given(new OrderCreatedEvent(ORDER_ID),
- new ProductAddedEvent(ORDER_ID, PRODUCT_ID),
- new OrderConfirmedEvent(ORDER_ID))
- .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
- .expectException(OrderAlreadyConfirmedException.class)
- .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
+ fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID), new OrderConfirmedEvent(ORDER_ID))
+ .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+ .expectException(OrderAlreadyConfirmedException.class)
+ .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
}
}
\ No newline at end of file
diff --git a/axon/src/test/java/com/baeldung/axon/gui/OrderRestEndpointManualTest.java b/axon/src/test/java/com/baeldung/axon/gui/OrderRestEndpointManualTest.java
new file mode 100644
index 0000000000..3b5c130c89
--- /dev/null
+++ b/axon/src/test/java/com/baeldung/axon/gui/OrderRestEndpointManualTest.java
@@ -0,0 +1,188 @@
+package com.baeldung.axon.gui;
+
+import com.baeldung.axon.OrderApplication;
+import com.baeldung.axon.querymodel.OrderResponse;
+import com.baeldung.axon.querymodel.OrderStatusResponse;
+
+import org.junit.jupiter.api.*;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.netty.http.client.HttpClient;
+import reactor.test.StepVerifier;
+
+import java.util.ArrayList;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest(classes = OrderApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+//marked as manual as the test is unstable on Jenkins due to low resources
+class OrderRestEndpointManualTest {
+
+ @LocalServerPort
+ private int port;
+
+ @Test
+ @DirtiesContext
+ void givenCreateOrderCalled_whenCallingAllOrders_thenOneCreatedOrderIsReturned() {
+ WebClient client = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ createRandomNewOrder(client);
+ StepVerifier.create(retrieveListResponse(client.get()
+ .uri("http://localhost:" + port + "/all-orders")))
+ .expectNextMatches(list -> 1 == list.size() && list.get(0)
+ .getOrderStatus() == OrderStatusResponse.CREATED)
+ .verifyComplete();
+ }
+
+ @Test
+ @DirtiesContext
+ void givenCreateOrderCalledThreeTimesAnd_whenCallingAllOrdersStreaming_thenTwoCreatedOrdersAreReturned() {
+ WebClient client = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ for (int i = 0; i < 3; i++) {
+ createRandomNewOrder(client);
+ }
+ StepVerifier.create(retrieveStreamingResponse(client.get()
+ .uri("http://localhost:" + port + "/all-orders-streaming")))
+ .expectNextMatches(o -> o.getOrderStatus() == OrderStatusResponse.CREATED)
+ .expectNextMatches(o -> o.getOrderStatus() == OrderStatusResponse.CREATED)
+ .expectNextMatches(o -> o.getOrderStatus() == OrderStatusResponse.CREATED)
+ .verifyComplete();
+ }
+
+ @Test
+ @DirtiesContext
+ void givenRuleExistThatNeedConfirmationBeforeShipping_whenCallingShipUnconfirmed_thenErrorReturned() {
+ WebClient client = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ StepVerifier.create(retrieveResponse(client.post()
+ .uri("http://localhost:" + port + "/ship-unconfirmed-order")))
+ .verifyError(WebClientResponseException.class);
+ }
+
+ @Test
+ @DirtiesContext
+ void givenShipOrderCalled_whenCallingAllShippedChairs_then234PlusOneIsReturned() {
+ WebClient client = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ verifyVoidPost(client, "http://localhost:" + port + "/ship-order");
+ StepVerifier.create(retrieveIntegerResponse(client.get()
+ .uri("http://localhost:" + port + "/total-shipped/Deluxe Chair")))
+ .assertNext(r -> assertEquals(235, r))
+ .verifyComplete();
+ }
+
+ @Test
+ @DirtiesContext
+ void givenOrdersAreUpdated_whenCallingOrderUpdates_thenUpdatesReturned() {
+ WebClient updaterClient = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ WebClient receiverClient = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ String orderId = UUID.randomUUID()
+ .toString();
+ String productId = UUID.randomUUID()
+ .toString();
+ StepVerifier.create(retrieveResponse(updaterClient.post()
+ .uri("http://localhost:" + port + "/order/" + orderId)))
+ .assertNext(Assertions::assertNotNull)
+ .verifyComplete();
+ ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+ executor.schedule(() -> addIncrementDecrementConfirmAndShipProduct(orderId, productId), 1L, TimeUnit.SECONDS);
+ try {
+ StepVerifier.create(retrieveStreamingResponse(receiverClient.get()
+ .uri("http://localhost:" + port + "/order-updates/" + orderId)))
+ .assertNext(p -> assertTrue(p.getProducts()
+ .isEmpty()))
+ .assertNext(p -> assertEquals(1, p.getProducts()
+ .get(productId)))
+ .assertNext(p -> assertEquals(2, p.getProducts()
+ .get(productId)))
+ .assertNext(p -> assertEquals(1, p.getProducts()
+ .get(productId)))
+ .assertNext(p -> assertEquals(OrderStatusResponse.CONFIRMED, p.getOrderStatus()))
+ .assertNext(p -> assertEquals(OrderStatusResponse.SHIPPED, p.getOrderStatus()))
+ .thenCancel()
+ .verify();
+ } finally {
+ executor.shutdown();
+ }
+ }
+
+ private void addIncrementDecrementConfirmAndShipProduct(String orderId, String productId) {
+ WebClient client = WebClient.builder()
+ .clientConnector(httpConnector())
+ .build();
+ String base = "http://localhost:" + port + "/order/" + orderId;
+ verifyVoidPost(client, base + "/product/" + productId);
+ verifyVoidPost(client, base + "/product/" + productId + "/increment");
+ verifyVoidPost(client, base + "/product/" + productId + "/decrement");
+ verifyVoidPost(client, base + "/confirm");
+ verifyVoidPost(client, base + "/ship");
+ }
+
+ private void createRandomNewOrder(WebClient client){
+ StepVerifier.create(retrieveResponse(client.post()
+ .uri("http://localhost:" + port + "/order")))
+ .assertNext(Assertions::assertNotNull)
+ .verifyComplete();
+ }
+
+ private void verifyVoidPost(WebClient client, String uri) {
+ StepVerifier.create(retrieveResponse(client.post()
+ .uri(uri)))
+ .verifyComplete();
+ }
+
+ private static ReactorClientHttpConnector httpConnector() {
+ HttpClient httpClient = HttpClient.create()
+ .wiretap(true);
+ return new ReactorClientHttpConnector(httpClient);
+ }
+
+ private Mono retrieveResponse(WebClient.RequestBodySpec spec) {
+ return spec.retrieve()
+ .bodyToMono(String.class);
+ }
+
+ private Mono retrieveListResponse(WebClient.RequestHeadersSpec spec) {
+ return spec.accept(MediaType.APPLICATION_JSON)
+ .retrieve()
+ .bodyToMono(ResponseList.class);
+ }
+
+ private Mono retrieveIntegerResponse(WebClient.RequestHeadersSpec spec) {
+ return spec.retrieve()
+ .bodyToMono(Integer.class);
+ }
+
+ private Flux retrieveStreamingResponse(WebClient.RequestHeadersSpec spec) {
+ return spec.retrieve()
+ .bodyToFlux(OrderResponse.class);
+ }
+
+ private static class ResponseList extends ArrayList {
+
+ private ResponseList() {
+ super();
+ }
+ }
+}
diff --git a/axon/src/test/java/com/baeldung/axon/querymodel/AbstractOrdersEventHandlerUnitTest.java b/axon/src/test/java/com/baeldung/axon/querymodel/AbstractOrdersEventHandlerUnitTest.java
index daef0b684d..fb7833a3f6 100644
--- a/axon/src/test/java/com/baeldung/axon/querymodel/AbstractOrdersEventHandlerUnitTest.java
+++ b/axon/src/test/java/com/baeldung/axon/querymodel/AbstractOrdersEventHandlerUnitTest.java
@@ -12,22 +12,31 @@ import com.baeldung.axon.coreapi.queries.Order;
import com.baeldung.axon.coreapi.queries.OrderStatus;
import com.baeldung.axon.coreapi.queries.OrderUpdatesQuery;
import com.baeldung.axon.coreapi.queries.TotalProductsShippedQuery;
+
import org.axonframework.queryhandling.QueryUpdateEmitter;
import org.junit.jupiter.api.*;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
+import java.util.function.Consumer;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
public abstract class AbstractOrdersEventHandlerUnitTest {
- private static final String ORDER_ID_1 = UUID.randomUUID().toString();
- private static final String ORDER_ID_2 = UUID.randomUUID().toString();
- private static final String PRODUCT_ID_1 = UUID.randomUUID().toString();
- private static final String PRODUCT_ID_2 = UUID.randomUUID().toString();
+ private static final String ORDER_ID_1 = UUID.randomUUID()
+ .toString();
+ private static final String ORDER_ID_2 = UUID.randomUUID()
+ .toString();
+ private static final String PRODUCT_ID_1 = UUID.randomUUID()
+ .toString();
+ private static final String PRODUCT_ID_2 = UUID.randomUUID()
+ .toString();
private OrdersEventHandler handler;
private static Order orderOne;
private static Order orderTwo;
@@ -36,12 +45,15 @@ public abstract class AbstractOrdersEventHandlerUnitTest {
@BeforeAll
static void createOrders() {
orderOne = new Order(ORDER_ID_1);
- orderOne.getProducts().put(PRODUCT_ID_1, 3);
+ orderOne.getProducts()
+ .put(PRODUCT_ID_1, 3);
orderOne.setOrderShipped();
orderTwo = new Order(ORDER_ID_2);
- orderTwo.getProducts().put(PRODUCT_ID_1, 1);
- orderTwo.getProducts().put(PRODUCT_ID_2, 1);
+ orderTwo.getProducts()
+ .put(PRODUCT_ID_1, 1);
+ orderTwo.getProducts()
+ .put(PRODUCT_ID_2, 1);
orderTwo.setOrderConfirmed();
}
@@ -61,13 +73,43 @@ public abstract class AbstractOrdersEventHandlerUnitTest {
assertNotNull(result);
assertEquals(2, result.size());
- Order order_1 = result.stream().filter(o -> o.getOrderId().equals(ORDER_ID_1)).findFirst().orElse(null);
+ Order order_1 = result.stream()
+ .filter(o -> o.getOrderId()
+ .equals(ORDER_ID_1))
+ .findFirst()
+ .orElse(null);
assertEquals(orderOne, order_1);
- Order order_2 = result.stream().filter(o -> o.getOrderId().equals(ORDER_ID_2)).findFirst().orElse(null);
+ Order order_2 = result.stream()
+ .filter(o -> o.getOrderId()
+ .equals(ORDER_ID_2))
+ .findFirst()
+ .orElse(null);
assertEquals(orderTwo, order_2);
}
+ @Test
+ void givenTwoOrdersPlacedOfWhichOneNotShipped_whenFindAllOrderedProductsQueryStreaming_thenCorrectOrdersAreReturned() {
+ resetWithTwoOrders();
+ final Consumer orderVerifier = order -> {
+ if (order.getOrderId()
+ .equals(orderOne.getOrderId())) {
+ assertEquals(orderOne, order);
+ } else if (order.getOrderId()
+ .equals(orderTwo.getOrderId())) {
+ assertEquals(orderTwo, order);
+ } else {
+ throw new RuntimeException("Would expect either order one or order two");
+ }
+ };
+
+ StepVerifier.create(Flux.from(handler.handleStreaming(new FindAllOrderedProductsQuery())))
+ .assertNext(orderVerifier)
+ .assertNext(orderVerifier)
+ .expectComplete()
+ .verify();
+ }
+
@Test
void givenNoOrdersPlaced_whenTotalProductsShippedQuery_thenZeroReturned() {
assertEquals(0, handler.handle(new TotalProductsShippedQuery(PRODUCT_ID_1)));
@@ -97,7 +139,8 @@ public abstract class AbstractOrdersEventHandlerUnitTest {
Order result = handler.handle(new OrderUpdatesQuery(ORDER_ID_1));
assertNotNull(result);
assertEquals(ORDER_ID_1, result.getOrderId());
- assertEquals(3, result.getProducts().get(PRODUCT_ID_1));
+ assertEquals(3, result.getProducts()
+ .get(PRODUCT_ID_1));
assertEquals(OrderStatus.SHIPPED, result.getOrderStatus());
}
diff --git a/axon/src/test/java/com/baeldung/axon/querymodel/MongoOrdersEventHandlerUnitTest.java b/axon/src/test/java/com/baeldung/axon/querymodel/MongoOrdersEventHandlerUnitTest.java
new file mode 100644
index 0000000000..c183294dc1
--- /dev/null
+++ b/axon/src/test/java/com/baeldung/axon/querymodel/MongoOrdersEventHandlerUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.axon.querymodel;
+
+import com.mongodb.client.MongoClient;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+
+@DataMongoTest
+public class MongoOrdersEventHandlerUnitTest extends AbstractOrdersEventHandlerUnitTest {
+
+ @Autowired
+ MongoClient mongoClient;
+
+ @Override
+ protected OrdersEventHandler getHandler() {
+ mongoClient.getDatabase("axonframework")
+ .drop();
+ return new MongoOrdersEventHandler(mongoClient, emitter);
+ }
+}
diff --git a/axon/src/test/java/com/baeldung/axon/querymodel/OrderQueryServiceIntegrationTest.java b/axon/src/test/java/com/baeldung/axon/querymodel/OrderQueryServiceIntegrationTest.java
index 60808b2271..4a89fe0e4e 100644
--- a/axon/src/test/java/com/baeldung/axon/querymodel/OrderQueryServiceIntegrationTest.java
+++ b/axon/src/test/java/com/baeldung/axon/querymodel/OrderQueryServiceIntegrationTest.java
@@ -13,6 +13,7 @@ import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
import java.util.Collections;
@@ -60,6 +61,15 @@ class OrderQueryServiceIntegrationTest {
.isEmpty());
}
+ @Test
+ void givenOrderCreatedEventSend_whenCallingAllOrdersStreaming_thenOneOrderIsReturned() {
+ Flux result = queryService.allOrdersStreaming();
+ StepVerifier.create(result)
+ .assertNext(order -> assertEquals(orderId, order.getOrderId()))
+ .expectComplete()
+ .verify();
+ }
+
@Test
void givenThreeDeluxeChairsShipped_whenCallingAllShippedChairs_then234PlusTreeIsReturned() {
Order order = new Order(orderId);
diff --git a/axon/src/test/resources/application.properties b/axon/src/test/resources/application.properties
index 35b5452b57..c42b7a4e90 100644
--- a/axon/src/test/resources/application.properties
+++ b/axon/src/test/resources/application.properties
@@ -1 +1,2 @@
+spring.mongodb.embedded.version=5.0.6
axon.axonserver.enabled=false
\ No newline at end of file
diff --git a/axon/start_mongo.sh b/axon/start_mongo.sh
new file mode 100755
index 0000000000..2cc5a3a7cf
--- /dev/null
+++ b/axon/start_mongo.sh
@@ -0,0 +1,7 @@
+docker run \
+ -d \
+ --name order_projection \
+ -p 27017:27017 \
+ -e MONGO_INITDB_ROOT_USERNAME=admin1234 \
+ -e MONGO_INITDB_ROOT_PASSWORD=somepassword \
+ mongo
\ No newline at end of file
diff --git a/azure/pom.xml b/azure/pom.xml
index ae20ae7785..aae84db0c6 100644
--- a/azure/pom.xml
+++ b/azure/pom.xml
@@ -36,8 +36,8 @@
runtime
- mysql
- mysql-connector-java
+ com.mysql
+ mysql-connector-j
runtime
@@ -122,6 +122,7 @@
${azure.containerRegistry}.azurecr.io
1.1.0
1.1.0
+ 3.3.2
\ No newline at end of file
diff --git a/baeldung-pmd-rules.xml b/baeldung-pmd-rules.xml
index 8175e80e19..2e3bb12d2c 100644
--- a/baeldung-pmd-rules.xml
+++ b/baeldung-pmd-rules.xml
@@ -3,7 +3,10 @@
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
Baeldung custom PMD rules
-
+
Test does not follow Baeldung naming convention
3
diff --git a/cdi/pom.xml b/cdi/pom.xml
deleted file mode 100644
index ee23e082c7..0000000000
--- a/cdi/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
- 4.0.0
- cdi
- 1.0-SNAPSHOT
- cdi
-
-
- com.baeldung
- parent-spring-5
- 0.0.1-SNAPSHOT
- ../parent-spring-5
-
-
-
-
- javax.enterprise
- cdi-api
- ${cdi-api.version}
-
-
- org.jboss.weld.se
- weld-se-core
- ${weld-se-core.version}
-
-
- org.aspectj
- aspectjweaver
- ${aspectjweaver.version}
-
-
- org.springframework
- spring-context
- ${spring.version}
-
-
- org.springframework
- spring-test
- ${spring.version}
- test
-
-
-
-
- 2.0.SP1
- 3.0.5.Final
- 1.9.2
-
-
-
\ No newline at end of file
diff --git a/checker-plugin/README.md b/checker-framework/README.md
similarity index 100%
rename from checker-plugin/README.md
rename to checker-framework/README.md
diff --git a/checker-framework/pom.xml b/checker-framework/pom.xml
new file mode 100644
index 0000000000..d8a44ec0c9
--- /dev/null
+++ b/checker-framework/pom.xml
@@ -0,0 +1,75 @@
+
+
+ 4.0.0
+ checker-framework
+ 1.0-SNAPSHOT
+ checker-framework
+ jar
+
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
+
+
+
+
+ org.checkerframework
+ checker-qual
+ ${checker.version}
+
+
+ org.checkerframework
+ checker
+ ${checker.version}
+
+
+
+
+
+
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ true
+ -Xlint:all
+ true
+
+
+ org.checkerframework
+ checker
+ ${checker.version}
+
+
+
+ org.checkerframework.checker.nullness.NullnessChecker
+ org.checkerframework.checker.interning.InterningChecker
+ org.checkerframework.checker.fenum.FenumChecker
+ org.checkerframework.checker.formatter.FormatterChecker
+ org.checkerframework.checker.regex.RegexChecker
+
+
+ -Awarns
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+
+
+
+
+
+
+
+ 3.35.0
+
+
+
\ No newline at end of file
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/FakeNumExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/FakeNumExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/FakeNumExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/FakeNumExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/FormatExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/FormatExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/FormatExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/FormatExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/KeyForExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/KeyForExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/KeyForExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/KeyForExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/NonNullExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/NonNullExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/NonNullExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/NonNullExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/RegexExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/RegexExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/RegexExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/RegexExample.java
diff --git a/cdi/src/main/resources/logback.xml b/checker-framework/src/main/resources/logback.xml
similarity index 100%
rename from cdi/src/main/resources/logback.xml
rename to checker-framework/src/main/resources/logback.xml
diff --git a/checker-plugin/pom.xml b/checker-plugin/pom.xml
deleted file mode 100644
index 28958db89d..0000000000
--- a/checker-plugin/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
- 4.0.0
- checker-plugin
- 1.0-SNAPSHOT
- checker-plugin
- jar
- http://maven.apache.org
-
-
- com.baeldung
- parent-modules
- 1.0.0-SNAPSHOT
-
-
-
-
-
- org.checkerframework
- checker-qual
- ${checker-qual.version}
-
-
- org.checkerframework
- checker
- ${checker.version}
-
-
- org.checkerframework
- jdk8
- ${jdk8.version}
-
-
-
- org.checkerframework
- compiler
- ${checkerframework.compiler.version}
-
-
-
-
-
-
- maven-compiler-plugin
- ${maven-compiler-plugin.version}
-
- ${java.version}
- ${java.version}
-
-
-
- 10000
- 10000
-
-
-
- org.checkerframework.checker.nullness.NullnessChecker
- org.checkerframework.checker.interning.InterningChecker
- org.checkerframework.checker.fenum.FenumChecker
- org.checkerframework.checker.formatter.FormatterChecker
- org.checkerframework.checker.regex.RegexChecker
-
-
- -AprintErrorStack
-
-
- -Xbootclasspath/p:${annotatedJdk}
-
-
-
-
- -Awarns
-
-
-
-
-
-
-
-
- ${org.checkerframework:jdk8:jar}
-
-
- 2.3.1
- 2.3.1
- 2.3.1
- 2.3.1
-
-
-
\ No newline at end of file
diff --git a/clojure/ring/.gitignore b/clojure-modules/clojure-ring/.gitignore
similarity index 100%
rename from clojure/ring/.gitignore
rename to clojure-modules/clojure-ring/.gitignore
diff --git a/clojure/ring/README.md b/clojure-modules/clojure-ring/README.md
similarity index 100%
rename from clojure/ring/README.md
rename to clojure-modules/clojure-ring/README.md
diff --git a/clojure/ring/project.clj b/clojure-modules/clojure-ring/project.clj
similarity index 100%
rename from clojure/ring/project.clj
rename to clojure-modules/clojure-ring/project.clj
diff --git a/clojure/ring/src/ring/core.clj b/clojure-modules/clojure-ring/src/ring/core.clj
similarity index 100%
rename from clojure/ring/src/ring/core.clj
rename to clojure-modules/clojure-ring/src/ring/core.clj
diff --git a/code-generation/pom.xml b/code-generation/pom.xml
deleted file mode 100644
index ed8890e1dd..0000000000
--- a/code-generation/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- 4.0.0
- code-generation
- 1.0
- code-generation
-
-
- com.baeldung
- parent-modules
- 1.0.0-SNAPSHOT
-
-
-
-
- com.google.auto.value
- auto-value-annotations
- ${auto-value.version}
-
-
- com.google.auto.value
- auto-value
- ${auto-value.version}
- provided
-
-
- com.google.auto.factory
- auto-factory
- ${auto-factory.version}
-
-
- com.google.guava
- guava
-
-
-
-
- com.google.auto.service
- auto-service
- ${auto-service.version}
- true
-
-
- com.google.inject
- guice
- ${guice.version}
-
-
-
-
- 1.6.6
- 1.0-beta6
- 1.0-rc6
- 4.2.0
-
-
-
\ No newline at end of file
diff --git a/core-groovy-modules/core-groovy-2/README.md b/core-groovy-modules/core-groovy-2/README.md
index 9f81ac6c16..f128b43092 100644
--- a/core-groovy-modules/core-groovy-2/README.md
+++ b/core-groovy-modules/core-groovy-2/README.md
@@ -14,4 +14,4 @@ This module contains articles about core Groovy concepts
- [A Quick Guide to Working with Web Services in Groovy](https://www.baeldung.com/groovy-web-services)
- [Categories in Groovy](https://www.baeldung.com/groovy-categories)
- [How to Determine the Data Type in Groovy](https://www.baeldung.com/groovy-determine-data-type)
-- [[<-- Prev]](/core-groovy)
+- [[<-- Prev]](/core-groovy-modules/core-groovy)
diff --git a/core-groovy-modules/core-groovy-2/pom.xml b/core-groovy-modules/core-groovy-2/pom.xml
index a177844a15..de750daf0f 100644
--- a/core-groovy-modules/core-groovy-2/pom.xml
+++ b/core-groovy-modules/core-groovy-2/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-groovy-2
- 1.0-SNAPSHOT
core-groovy-2
jar
@@ -83,7 +82,7 @@
org.codehaus.groovy
groovy-eclipse-batch
- ${groovy.version}-01
+ ${groovy-eclipse-batch.version}
@@ -153,18 +152,12 @@
-
-
- central
- https://jcenter.bintray.com
-
-
-
1.1.3
- 3.1.0
- 3.8.0
- 3.3.0-01
+ 3.4.2
+ 3.8.1
+ 3.7.0
+ 3.0.8-01
-
\ No newline at end of file
+
diff --git a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/BaeldungCategory.groovy b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/BaeldungCategory.groovy
index 479c39699f..ccb1c7fc95 100644
--- a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/BaeldungCategory.groovy
+++ b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/BaeldungCategory.groovy
@@ -1,17 +1,17 @@
-package com.baeldung.category;
+package com.baeldung.category
class BaeldungCategory {
- public static String capitalize(String self) {
- String capitalizedStr = self;
+ static String capitalize(String self) {
+ String capitalizedStr = self
if (self.size() > 0) {
- capitalizedStr = self.substring(0, 1).toUpperCase() + self.substring(1);
+ capitalizedStr = self.substring(0, 1).toUpperCase() + self.substring(1)
}
+
return capitalizedStr
}
-
- public static double toThePower(Number self, Number exponent) {
- return Math.pow(self, exponent);
- }
+ static double toThePower(Number self, Number exponent) {
+ return Math.pow(self, exponent)
+ }
}
diff --git a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/NumberCategory.groovy b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/NumberCategory.groovy
index ccf2ed519b..4f38b87ec5 100644
--- a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/NumberCategory.groovy
+++ b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/category/NumberCategory.groovy
@@ -1,17 +1,15 @@
-package com.baeldung.category;
-
-import groovy.lang.Category
+package com.baeldung.category
@Category(Number)
class NumberCategory {
- public Number cube() {
- return this*this*this
+ Number cube() {
+ return this**3
}
- public int divideWithRoundUp(BigDecimal divisor, boolean isRoundUp) {
+ int divideWithRoundUp(BigDecimal divisor, boolean isRoundUp) {
def mathRound = isRoundUp ? BigDecimal.ROUND_UP : BigDecimal.ROUND_DOWN
- return (int)new BigDecimal(this).divide(divisor, 0, mathRound)
+
+ return (int) new BigDecimal(this).divide(divisor, 0, mathRound)
}
-
}
diff --git a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/determinedatatype/Person.groovy b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/determinedatatype/Person.groovy
index 3ac88b7952..40c935ce08 100644
--- a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/determinedatatype/Person.groovy
+++ b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/determinedatatype/Person.groovy
@@ -1,14 +1,19 @@
package com.baeldung.determinedatatype
class Person {
-
- private int ageAsInt
- private Double ageAsDouble
- private String ageAsString
-
+
+ int ageAsInt
+ Double ageAsDouble
+ String ageAsString
+
Person() {}
- Person(int ageAsInt) { this.ageAsInt = ageAsInt}
- Person(Double ageAsDouble) { this.ageAsDouble = ageAsDouble}
- Person(String ageAsString) { this.ageAsString = ageAsString}
+
+ Person(int ageAsInt) { this.ageAsInt = ageAsInt }
+
+ Person(Double ageAsDouble) { this.ageAsDouble = ageAsDouble }
+
+ Person(String ageAsString) { this.ageAsString = ageAsString }
+}
+
+class Student extends Person {
}
-class Student extends Person {}
diff --git a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy
index f49d0f906b..cade7dab3c 100644
--- a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy
+++ b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy
@@ -1,18 +1,14 @@
package com.baeldung.metaprogramming
-import groovy.transform.AutoClone
-import groovy.transform.Canonical
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.ToString
-import groovy.transform.TupleConstructor
-import groovy.util.logging.*
+import groovy.transform.*
+import groovy.util.logging.Log
-@Canonical
+@ToString(includePackage = false, excludes = ['id'])
@TupleConstructor
@EqualsAndHashCode
-@ToString(includePackage=false, excludes=['id'])
-@Log
-@AutoClone
+@Canonical
+@AutoClone(style = AutoCloneStyle.SIMPLE)
+@Log
class Employee {
long id
@@ -30,16 +26,15 @@ class Employee {
def propertyMissing(String propertyName, propertyValue) {
println "property '$propertyName' is not available"
log.info "$propertyName is not available"
- "property '$propertyName' is not available"
+ "property '$propertyName' with value '$propertyValue' is not available"
}
- def methodMissing(String methodName, def methodArgs) {
+ def methodMissing(String methodName, Object methodArgs) {
log.info "$methodName is not defined"
"method '$methodName' is not defined"
}
-
+
def logEmp() {
log.info "Employee: $lastName, $firstName is of $age years age"
}
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
index 0612ecb955..7e9f0111cd 100644
--- a/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
+++ b/core-groovy-modules/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
@@ -2,32 +2,31 @@ package com.baeldung.metaprogramming.extension
import com.baeldung.metaprogramming.Employee
-import java.time.LocalDate
import java.time.Year
class BasicExtensions {
-
+
static int getYearOfBirth(Employee self) {
return Year.now().value - self.age
}
-
+
static String capitalize(String self) {
return self.substring(0, 1).toUpperCase() + self.substring(1)
}
static void printCounter(Integer self) {
- while (self>0) {
+ while (self > 0) {
println self
self--
}
}
-
+
static Long square(Long self) {
- return self*self
+ return self * self
}
-
+
static BigDecimal cube(BigDecimal self) {
- return self*self*self
+ return self * self * self
}
-
-}
\ No newline at end of file
+
+}
diff --git a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/category/CategoryUnitTest.groovy b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/category/CategoryUnitTest.groovy
index a1f67b1e2e..370dfb316e 100644
--- a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/category/CategoryUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/category/CategoryUnitTest.groovy
@@ -1,17 +1,17 @@
package com.baeldung.category
-import groovy.time.*
+import groovy.time.TimeCategory
+import groovy.xml.DOMBuilder
+import groovy.xml.QName
+import groovy.xml.dom.DOMCategory
+
import java.text.SimpleDateFormat
-import groovy.xml.*
-import groovy.xml.dom.*
-import com.baeldung.category.BaeldungCategory
-import com.baeldung.category.NumberCategory
class CategoryUnitTest extends GroovyTestCase {
void test_whenUsingTimeCategory_thenOperationOnDate() {
def jan_1_2019 = new Date("01/01/2019")
- use (TimeCategory) {
+ use(TimeCategory) {
assert jan_1_2019 + 10.seconds == new Date("01/01/2019 00:00:10")
assert jan_1_2019 + 20.minutes == new Date("01/01/2019 00:20:00")
@@ -30,7 +30,7 @@ class CategoryUnitTest extends GroovyTestCase {
void test_whenUsingTimeCategory_thenOperationOnNumber() {
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy")
- use (TimeCategory) {
+ use(TimeCategory) {
assert sdf.format(5.days.from.now) == sdf.format(new Date() + 5.days)
sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss")
@@ -57,7 +57,7 @@ class CategoryUnitTest extends GroovyTestCase {
def root = baeldungArticlesDom.documentElement
- use (DOMCategory) {
+ use(DOMCategory) {
assert root.article.size() == 2
def articles = root.article
@@ -75,27 +75,26 @@ class CategoryUnitTest extends GroovyTestCase {
assert root.article[2].title.text() == "Metaprogramming in Groovy"
}
}
-
+
void test_whenUsingBaeldungCategory_thenCapitalizeString() {
- use (BaeldungCategory) {
+ use(BaeldungCategory) {
assert "norman".capitalize() == "Norman"
- }
+ }
}
-
+
void test_whenUsingBaeldungCategory_thenOperationsOnNumber() {
- use (BaeldungCategory) {
+ use(BaeldungCategory) {
assert 50.toThePower(2) == 2500
assert 2.4.toThePower(4) == 33.1776
}
}
-
+
void test_whenUsingNumberCategory_thenOperationsOnNumber() {
- use (NumberCategory) {
+ use(NumberCategory) {
assert 3.cube() == 27
assert 25.divideWithRoundUp(6, true) == 5
assert 120.23.divideWithRoundUp(6.1, true) == 20
assert 150.9.divideWithRoundUp(12.1, false) == 12
}
}
-
}
diff --git a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/determinedatatype/PersonTest.groovy b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/determinedatatype/PersonTest.groovy
index 4c6589f207..414ba52fc5 100644
--- a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/determinedatatype/PersonTest.groovy
+++ b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/determinedatatype/PersonTest.groovy
@@ -1,56 +1,68 @@
package com.baeldung.determinedatatype
-import org.junit.Assert
-import org.junit.Test
-import com.baeldung.determinedatatype.Person
+import spock.lang.Specification
-public class PersonTest {
-
- @Test
- public void givenWhenParameterTypeIsInteger_thenReturnTrue() {
+class PersonTest extends Specification {
+
+ def "givenWhenParameterTypeIsIntegerThenReturnTrue"() {
+ given:
Person personObj = new Person(10)
- Assert.assertTrue(personObj.ageAsInt instanceof Integer)
- }
-
- @Test
- public void givenWhenParameterTypeIsDouble_thenReturnTrue() {
- Person personObj = new Person(10.0)
- Assert.assertTrue((personObj.ageAsDouble).getClass() == Double)
- }
-
- @Test
- public void givenWhenParameterTypeIsString_thenReturnTrue() {
- Person personObj = new Person("10 years")
- Assert.assertTrue(personObj.ageAsString.class == String)
- }
-
- @Test
- public void givenClassName_WhenParameterIsInteger_thenReturnTrue() {
- Assert.assertTrue(Person.class.getDeclaredField('ageAsInt').type == int.class)
- }
-
- @Test
- public void givenWhenObjectIsInstanceOfType_thenReturnTrue() {
- Person personObj = new Person()
- Assert.assertTrue(personObj instanceof Person)
+
+ expect:
+ personObj.ageAsInt.class == Integer
}
- @Test
- public void givenWhenInstanceIsOfSubtype_thenReturnTrue() {
+ def "givenWhenParameterTypeIsDouble_thenReturnTrue"() {
+ given:
+ Person personObj = new Person(10.0)
+
+ expect:
+ personObj.ageAsDouble.class == Double
+ }
+
+ def "givenWhenParameterTypeIsString_thenReturnTrue"() {
+ given:
+ Person personObj = new Person("10 years")
+
+ expect:
+ personObj.ageAsString.class == String
+ }
+
+ def "givenClassName_WhenParameterIsInteger_thenReturnTrue"() {
+ expect:
+ Person.class.getDeclaredField('ageAsInt').type == int.class
+ }
+
+ def "givenWhenObjectIsInstanceOfType_thenReturnTrue"() {
+ given:
+ Person personObj = new Person()
+
+ expect:
+ personObj.class == Person
+ }
+
+ def "givenWhenInstanceIsOfSubtype_thenReturnTrue"() {
+ given:
Student studentObj = new Student()
- Assert.assertTrue(studentObj in Person)
+
+ expect:
+ studentObj.class.superclass == Person
}
-
- @Test
- public void givenGroovyList_WhenFindClassName_thenReturnTrue() {
- def ageList = ['ageAsString','ageAsDouble', 10]
- Assert.assertTrue(ageList.class == ArrayList)
- Assert.assertTrue(ageList.getClass() == ArrayList)
+
+ def "givenGroovyList_WhenFindClassName_thenReturnTrue"() {
+ given:
+ def ageList = ['ageAsString', 'ageAsDouble', 10]
+
+ expect:
+ ageList.class == ArrayList
+ ageList.getClass() == ArrayList
}
-
- @Test
- public void givenGrooyMap_WhenFindClassName_thenReturnTrue() {
- def ageMap = [ageAsString: '10 years', ageAsDouble: 10.0]
- Assert.assertFalse(ageMap.class == LinkedHashMap)
+
+ def "givenGroovyMap_WhenFindClassName_thenReturnTrue"() {
+ given:
+ def ageMap = [ageAsString: '10 years', ageAsDouble: 10.0]
+
+ expect:
+ ageMap.getClass() == LinkedHashMap
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
index 4a8631eb95..6959c97533 100644
--- a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
@@ -1,123 +1,163 @@
package com.baeldung.metaprogramming
+import spock.lang.Specification
-import java.time.LocalDate
-import java.time.Period
import java.time.Year
-class MetaprogrammingUnitTest extends GroovyTestCase {
+class MetaprogrammingUnitTest extends Specification {
- Employee emp = new Employee(firstName: "Norman", lastName: "Lewis")
+ Employee emp
- void testPropertyMissing() {
- assert emp.address == "property 'address' is not available"
+ void setup() {
+ emp = new Employee(firstName: "Norman", lastName: "Lewis")
}
- void testMethodMissing() {
+ def "testPropertyMissing"() {
+ expect:
+ emp.address == "property 'address' is not available"
+ }
+
+ def "testMethodMissing"() {
+ given:
Employee emp = new Employee()
- try {
- emp.getFullName()
- } catch(MissingMethodException e) {
- println "method is not defined"
- }
- assert emp.getFullName() == "method 'getFullName' is not defined"
+
+ expect:
+ emp.getFullName() == "method 'getFullName' is not defined"
}
- void testMetaClassProperty() {
+ def "testMetaClassProperty"() {
+ when:
Employee.metaClass.address = ""
- emp = new Employee(firstName: "Norman", lastName: "Lewis", address: "US")
- assert emp.address == "US"
+
+ and:
+ emp = new Employee(firstName: "Norman",
+ lastName: "Lewis",
+ address: "US")
+
+ then:
+ emp.address == "US"
}
- void testMetaClassMethod() {
+ def "testMetaClassMethod"() {
+ when:
emp.metaClass.getFullName = {
"$lastName, $firstName"
}
- assert emp.getFullName() == "Lewis, Norman"
+
+ then:
+ emp.getFullName() == "Lewis, Norman"
}
- void testMetaClassConstructor() {
- try {
- Employee emp = new Employee("Norman")
- } catch(GroovyRuntimeException e) {
- assert e.message == "Could not find matching constructor for: com.baeldung.metaprogramming.Employee(String)"
- }
+ def "testOnlyNameConstructor"() {
+ when:
+ new Employee("Norman")
+ then:
+ thrown(GroovyRuntimeException)
+ }
+
+ def "testMetaClassConstructor"() {
+ when:
Employee.metaClass.constructor = { String firstName ->
new Employee(firstName: firstName)
}
+ and:
Employee norman = new Employee("Norman")
- assert norman.firstName == "Norman"
- assert norman.lastName == null
+
+ then:
+ norman.firstName == "Norman"
+ norman.lastName == null
}
- void testJavaMetaClass() {
+ def "testJavaMetaClass"() {
+ when:
String.metaClass.capitalize = { String str ->
str.substring(0, 1).toUpperCase() + str.substring(1)
}
- assert "norman".capitalize() == "Norman"
+
+ and:
+ String.metaClass.static.joinWith = { String delimiter, String... args ->
+ String.join(delimiter, args)
+ }
+
+ then:
+ "norman".capitalize() == "Norman"
+ String.joinWith(" -> ", "a", "b", "c") == "a -> b -> c"
}
- void testEmployeeExtension() {
+ def "testEmployeeExtension"() {
+ given:
def age = 28
def expectedYearOfBirth = Year.now() - age
Employee emp = new Employee(age: age)
- assert emp.getYearOfBirth() == expectedYearOfBirth.value
+
+ expect:
+ emp.getYearOfBirth() == expectedYearOfBirth.value
}
- void testJavaClassesExtensions() {
+ def "testJavaClassesExtensions"() {
+ when:
5.printCounter()
- assert 40l.square() == 1600l
-
- assert (2.98).cube() == 26.463592
+ then:
+ 40L.square() == 1600L
+ (2.98).cube() == 26.463592
}
- void testStaticEmployeeExtension() {
+ def "testStaticEmployeeExtension"() {
assert Employee.getDefaultObj().firstName == "firstName"
assert Employee.getDefaultObj().lastName == "lastName"
assert Employee.getDefaultObj().age == 20
}
- void testToStringAnnotation() {
- Employee employee = new Employee()
- employee.id = 1
- employee.firstName = "norman"
- employee.lastName = "lewis"
- employee.age = 28
+ def "testToStringAnnotation"() {
+ when:
+ Employee employee = new Employee().tap {
+ id = 1
+ firstName = "norman"
+ lastName = "lewis"
+ age = 28
+ }
- assert employee.toString() == "Employee(norman, lewis, 28)"
+ then:
+ employee.toString() == "Employee(norman, lewis, 28)"
}
- void testTupleConstructorAnnotation() {
+ def "testTupleConstructorAnnotation"() {
+ when:
Employee norman = new Employee(1, "norman", "lewis", 28)
- assert norman.toString() == "Employee(norman, lewis, 28)"
-
Employee snape = new Employee(2, "snape")
- assert snape.toString() == "Employee(snape, null, 0)"
+ then:
+ norman.toString() == "Employee(norman, lewis, 28)"
+ snape.toString() == "Employee(snape, null, 0)"
}
-
- void testEqualsAndHashCodeAnnotation() {
+
+ def "testEqualsAndHashCodeAnnotation"() {
+ when:
Employee norman = new Employee(1, "norman", "lewis", 28)
Employee normanCopy = new Employee(1, "norman", "lewis", 28)
- assert norman.equals(normanCopy)
- assert norman.hashCode() == normanCopy.hashCode()
- }
-
- void testAutoCloneAnnotation() {
- try {
- Employee norman = new Employee(1, "norman", "lewis", 28)
- def normanCopy = norman.clone()
- assert norman == normanCopy
- } catch(CloneNotSupportedException e) {
- e.printStackTrace()
- }
+
+ then:
+ norman == normanCopy
+ norman.hashCode() == normanCopy.hashCode()
}
- void testLoggingAnnotation() {
+ def "testAutoCloneAnnotation"() {
+ given:
+ Employee norman = new Employee(1, "norman", "lewis", 28)
+
+ when:
+ def normanCopy = norman.clone()
+
+ then:
+ norman == normanCopy
+ }
+
+ def "testLoggingAnnotation"() {
+ given:
Employee employee = new Employee(1, "Norman", "Lewis", 28)
- employee.logEmp()
+ employee.logEmp() // INFO: Employee: Lewis, Norman is of 28 years age
}
}
diff --git a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy
index 1846ae664c..800f3b119e 100644
--- a/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-2/src/test/groovy/com/baeldung/templateengine/TemplateEnginesUnitTest.groovy
@@ -1,48 +1,62 @@
package com.baeldung.templateengine
+import groovy.text.GStringTemplateEngine
import groovy.text.SimpleTemplateEngine
import groovy.text.StreamingTemplateEngine
-import groovy.text.GStringTemplateEngine
-import groovy.text.XmlTemplateEngine
import groovy.text.XmlTemplateEngine
import groovy.text.markup.MarkupTemplateEngine
import groovy.text.markup.TemplateConfiguration
+import spock.lang.Specification
-class TemplateEnginesUnitTest extends GroovyTestCase {
-
- def bindMap = [user: "Norman", signature: "Baeldung"]
-
- void testSimpleTemplateEngine() {
+class TemplateEnginesUnitTest extends Specification {
+
+ final Map BIND_MAP = [user: "Norman", signature: "Baeldung"]
+
+ def "testSimpleTemplateEngine"() {
+ given:
def smsTemplate = 'Dear <% print user %>, Thanks for reading our Article. ${signature}'
- def smsText = new SimpleTemplateEngine().createTemplate(smsTemplate).make(bindMap)
- assert smsText.toString() == "Dear Norman, Thanks for reading our Article. Baeldung"
+ when:
+ def smsText = new SimpleTemplateEngine().createTemplate(smsTemplate).make(BIND_MAP)
+
+ then:
+ smsText.toString() == "Dear Norman, Thanks for reading our Article. Baeldung"
}
-
- void testStreamingTemplateEngine() {
+
+ def "testStreamingTemplateEngine"() {
+ given:
def articleEmailTemplate = new File('src/main/resources/articleEmail.template')
- bindMap.articleText = """1. Overview
-This is a tutorial article on Template Engines""" //can be a string larger than 64k
-
- def articleEmailText = new StreamingTemplateEngine().createTemplate(articleEmailTemplate).make(bindMap)
-
- assert articleEmailText.toString() == """Dear Norman,
-Please read the requested article below.
-1. Overview
-This is a tutorial article on Template Engines
-From,
-Baeldung"""
-
+ //can be a string larger than 64k
+ BIND_MAP.articleText = """|1. Overview
+ |This is a tutorial article on Template Engines""".stripMargin()
+
+ when:
+ def articleEmailText = new StreamingTemplateEngine().createTemplate(articleEmailTemplate).make(BIND_MAP)
+
+ then:
+ articleEmailText.toString() == """|Dear Norman,
+ |Please read the requested article below.
+ |1. Overview
+ |This is a tutorial article on Template Engines
+ |From,
+ |Baeldung""".stripMargin()
}
-
- void testGStringTemplateEngine() {
+
+ def "testGStringTemplateEngine"() {
+ given:
def emailTemplate = new File('src/main/resources/email.template')
- def emailText = new GStringTemplateEngine().createTemplate(emailTemplate).make(bindMap)
-
- assert emailText.toString() == "Dear Norman,\nThanks for subscribing our services.\nBaeldung"
+
+ when:
+ def emailText = new GStringTemplateEngine().createTemplate(emailTemplate).make(BIND_MAP)
+
+ then:
+ emailText.toString() == """|Dear Norman,
+ |Thanks for subscribing our services.
+ |Baeldung""".stripMargin()
}
-
- void testXmlTemplateEngine() {
+
+ def "testXmlTemplateEngine"() {
+ given:
def emailXmlTemplate = '''
def emailContent = "Thanks for subscribing our services."
@@ -51,11 +65,16 @@ Baeldung"""
${signature}
'''
- def emailXml = new XmlTemplateEngine().createTemplate(emailXmlTemplate).make(bindMap)
+
+ when:
+ def emailXml = new XmlTemplateEngine().createTemplate(emailXmlTemplate).make(BIND_MAP)
+
+ then:
println emailXml.toString()
}
-
- void testMarkupTemplateEngineHtml() {
+
+ def "testMarkupTemplateEngineHtml"() {
+ given:
def emailHtmlTemplate = """html {
head {
title('Service Subscription Email')
@@ -66,14 +85,16 @@ Baeldung"""
p('Baeldung')
}
}"""
-
-
+
+ when:
def emailHtml = new MarkupTemplateEngine().createTemplate(emailHtmlTemplate).make()
+
+ then:
println emailHtml.toString()
-
}
-
- void testMarkupTemplateEngineXml() {
+
+ def "testMarkupTemplateEngineXml"() {
+ given:
def emailXmlTemplate = """xmlDeclaration()
xs{
email {
@@ -83,14 +104,18 @@ Baeldung"""
}
}
"""
- TemplateConfiguration config = new TemplateConfiguration()
- config.autoIndent = true
- config.autoEscape = true
- config.autoNewLine = true
+ TemplateConfiguration config = new TemplateConfiguration().with {
+ autoIndent = true
+ autoEscape = true
+ autoNewLine = true
+ return it
+ }
+
+ when:
def emailXml = new MarkupTemplateEngine(config).createTemplate(emailXmlTemplate).make()
-
+
+ then:
println emailXml.toString()
}
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy-collections/pom.xml b/core-groovy-modules/core-groovy-collections/pom.xml
index 5269121140..08589f54e3 100644
--- a/core-groovy-modules/core-groovy-collections/pom.xml
+++ b/core-groovy-modules/core-groovy-collections/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-groovy-collections
- 1.0-SNAPSHOT
core-groovy-collections
jar
@@ -111,11 +110,4 @@
-
-
- central
- http://jcenter.bintray.com
-
-
-
-
\ No newline at end of file
+
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/ListFindUnitTest.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/ListFindUnitTest.groovy
index 82a2138be4..325cf18c5f 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/ListFindUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/ListFindUnitTest.groovy
@@ -1,58 +1,57 @@
package com.baeldung.find
-import com.baeldung.find.Person
-import org.junit.Test
+import spock.lang.Specification
-import static org.junit.Assert.*
+class ListFindUnitTest extends Specification {
-class ListFindUnitTest {
-
- private final personList = [
- new Person("Regina", "Fitzpatrick", 25),
- new Person("Abagail", "Ballard", 26),
- new Person("Lucian", "Walter", 30),
+ final personList = [
+ new Person("Regina", "Fitzpatrick", 25),
+ new Person("Abagail", "Ballard", 26),
+ new Person("Lucian", "Walter", 30),
]
- @Test
- void whenListContainsElement_thenCheckReturnsTrue() {
+ def "whenListContainsElement_thenCheckReturnsTrue"() {
+ given:
def list = ['a', 'b', 'c']
- assertTrue(list.indexOf('a') > -1)
- assertTrue(list.contains('a'))
+ expect:
+ list.indexOf('a') > -1
+ list.contains('a')
}
- @Test
- void whenListContainsElement_thenCheckWithMembershipOperatorReturnsTrue() {
+ def "whenListContainsElement_thenCheckWithMembershipOperatorReturnsTrue"() {
+ given:
def list = ['a', 'b', 'c']
- assertTrue('a' in list)
+ expect:
+ 'a' in list
}
- @Test
- void givenListOfPerson_whenUsingStreamMatching_thenShouldEvaluateList() {
- assertTrue(personList.stream().anyMatch {it.age > 20})
- assertFalse(personList.stream().allMatch {it.age < 30})
+ def "givenListOfPerson_whenUsingStreamMatching_thenShouldEvaluateList"() {
+ expect:
+ personList.stream().anyMatch { it.age > 20 }
+ !personList.stream().allMatch { it.age < 30 }
}
- @Test
- void givenListOfPerson_whenUsingCollectionMatching_thenShouldEvaluateList() {
- assertTrue(personList.any {it.age > 20})
- assertFalse(personList.every {it.age < 30})
+ def "givenListOfPerson_whenUsingCollectionMatching_thenShouldEvaluateList"() {
+ expect:
+ personList.any { it.age > 20 }
+ !personList.every { it.age < 30 }
}
- @Test
- void givenListOfPerson_whenUsingStreamFind_thenShouldReturnMatchingElements() {
- assertTrue(personList.stream().filter {it.age > 20}.findAny().isPresent())
- assertFalse(personList.stream().filter {it.age > 30}.findAny().isPresent())
- assertTrue(personList.stream().filter {it.age > 20}.findAll().size() == 3)
- assertTrue(personList.stream().filter {it.age > 30}.findAll().isEmpty())
+ def "givenListOfPerson_whenUsingStreamFind_thenShouldReturnMatchingElements"() {
+ expect:
+ personList.stream().filter { it.age > 20 }.findAny().isPresent()
+ !personList.stream().filter { it.age > 30 }.findAny().isPresent()
+ personList.stream().filter { it.age > 20 }.findAll().size() == 3
+ personList.stream().filter { it.age > 30 }.findAll().isEmpty()
}
- @Test
- void givenListOfPerson_whenUsingCollectionFind_thenShouldReturnMatchingElements() {
- assertNotNull(personList.find {it.age > 20})
- assertNull(personList.find {it.age > 30})
- assertTrue(personList.findAll {it.age > 20}.size() == 3)
- assertTrue(personList.findAll {it.age > 30}.isEmpty())
+ def "givenListOfPerson_whenUsingCollectionFind_thenShouldReturnMatchingElements"() {
+ expect:
+ personList.find { it.age > 20 } == new Person("Regina", "Fitzpatrick", 25)
+ personList.find { it.age > 30 } == null
+ personList.findAll { it.age > 20 }.size() == 3
+ personList.findAll { it.age > 30 }.isEmpty()
}
}
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/MapFindUnitTest.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/MapFindUnitTest.groovy
index 16e231182b..74d85ad71b 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/MapFindUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/MapFindUnitTest.groovy
@@ -1,76 +1,81 @@
package com.baeldung.find
-import com.baeldung.find.Person
-import org.junit.Test
+import spock.lang.Specification
-import static org.junit.Assert.*
+class MapFindUnitTest extends Specification {
-class MapFindUnitTest {
-
- private final personMap = [
- Regina : new Person("Regina", "Fitzpatrick", 25),
- Abagail: new Person("Abagail", "Ballard", 26),
- Lucian : new Person("Lucian", "Walter", 30)
+ final personMap = [
+ Regina: new Person("Regina", "Fitzpatrick", 25),
+ Abagail: new Person("Abagail", "Ballard", 26),
+ Lucian: new Person("Lucian", "Walter", 30)
]
- @Test
- void whenMapContainsKeyElement_thenCheckReturnsTrue() {
+ def "whenMapContainsKeyElement_thenCheckReturnsTrue"() {
+ given:
def map = [a: 'd', b: 'e', c: 'f']
- assertTrue(map.containsKey('a'))
- assertFalse(map.containsKey('e'))
- assertTrue(map.containsValue('e'))
+ expect:
+ map.containsKey('a')
+ !map.containsKey('e')
+ map.containsValue('e')
}
- @Test
- void whenMapContainsKeyElement_thenCheckByMembershipReturnsTrue() {
+ def "whenMapContainsKeyElement_thenCheckByMembershipReturnsTrue"() {
+ given:
def map = [a: 'd', b: 'e', c: 'f']
- assertTrue('a' in map)
- assertFalse('f' in map)
+ expect:
+ 'a' in map
+ 'f' !in map
}
- @Test
- void whenMapContainsFalseBooleanValues_thenCheckReturnsFalse() {
+ def "whenMapContainsFalseBooleanValues_thenCheckReturnsFalse"() {
+ given:
def map = [a: true, b: false, c: null]
- assertTrue(map.containsKey('b'))
- assertTrue('a' in map)
- assertFalse('b' in map)
- assertFalse('c' in map)
+ expect:
+ map.containsKey('b')
+ 'a' in map
+ 'b' !in map // get value of key 'b' and does the assertion
+ 'c' !in map
}
- @Test
- void givenMapOfPerson_whenUsingStreamMatching_thenShouldEvaluateMap() {
- assertTrue(personMap.keySet().stream().anyMatch {it == "Regina"})
- assertFalse(personMap.keySet().stream().allMatch {it == "Albert"})
- assertFalse(personMap.values().stream().allMatch {it.age < 30})
- assertTrue(personMap.entrySet().stream().anyMatch {it.key == "Abagail" && it.value.lastname == "Ballard"})
+ def "givenMapOfPerson_whenUsingStreamMatching_thenShouldEvaluateMap"() {
+ expect:
+ personMap.keySet().stream()
+ .anyMatch { it == "Regina" }
+ !personMap.keySet().stream()
+ .allMatch { it == "Albert" }
+ !personMap.values().stream()
+ .allMatch { it.age < 30 }
+ personMap.entrySet().stream()
+ .anyMatch { it.key == "Abagail" && it.value.lastname == "Ballard" }
}
- @Test
- void givenMapOfPerson_whenUsingCollectionMatching_thenShouldEvaluateMap() {
- assertTrue(personMap.keySet().any {it == "Regina"})
- assertFalse(personMap.keySet().every {it == "Albert"})
- assertFalse(personMap.values().every {it.age < 30})
- assertTrue(personMap.any {firstname, person -> firstname == "Abagail" && person.lastname == "Ballard"})
+ def "givenMapOfPerson_whenUsingCollectionMatching_thenShouldEvaluateMap"() {
+ expect:
+ personMap.keySet().any { it == "Regina" }
+ !personMap.keySet().every { it == "Albert" }
+ !personMap.values().every { it.age < 30 }
+ personMap.any { firstname, person -> firstname == "Abagail" && person.lastname == "Ballard" }
}
- @Test
- void givenMapOfPerson_whenUsingCollectionFind_thenShouldReturnElements() {
- assertNotNull(personMap.find {it.key == "Abagail" && it.value.lastname == "Ballard"})
- assertTrue(personMap.findAll {it.value.age > 20}.size() == 3)
+ def "givenMapOfPerson_whenUsingCollectionFind_thenShouldReturnElements"() {
+ expect:
+ personMap.find { it.key == "Abagail" && it.value.lastname == "Ballard" }
+ personMap.findAll { it.value.age > 20 }.size() == 3
}
- @Test
- void givenMapOfPerson_whenUsingStreamFind_thenShouldReturnElements() {
- assertTrue(
- personMap.entrySet().stream()
- .filter {it.key == "Abagail" && it.value.lastname == "Ballard"}
- .findAny().isPresent())
- assertTrue(
- personMap.entrySet().stream()
- .filter {it.value.age > 20}
- .findAll().size() == 3)
+ def "givenMapOfPerson_whenUsingStreamFind_thenShouldReturnElements"() {
+ expect:
+ personMap.entrySet().stream()
+ .filter { it.key == "Abagail" && it.value.lastname == "Ballard" }
+ .findAny()
+ .isPresent()
+
+ personMap.entrySet().stream()
+ .filter { it.value.age > 20 }
+ .findAll()
+ .size() == 3
}
}
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/Person.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/Person.groovy
index e65826363a..a9266c4079 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/Person.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/Person.groovy
@@ -1,37 +1,10 @@
package com.baeldung.find
+import groovy.transform.Canonical
+
+@Canonical
class Person {
- private String firstname
- private String lastname
- private Integer age
-
- Person(String firstname, String lastname, Integer age) {
- this.firstname = firstname
- this.lastname = lastname
- this.age = age
- }
-
- String getFirstname() {
- return firstname
- }
-
- void setFirstname(String firstname) {
- this.firstname = firstname
- }
-
- String getLastname() {
- return lastname
- }
-
- void setLastname(String lastname) {
- this.lastname = lastname
- }
-
- Integer getAge() {
- return age
- }
-
- void setAge(Integer age) {
- this.age = age
- }
+ String firstname
+ String lastname
+ Integer age
}
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/SetFindUnitTest.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/SetFindUnitTest.groovy
index d2d03d5427..d82cf689d3 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/SetFindUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/find/SetFindUnitTest.groovy
@@ -1,16 +1,15 @@
package com.baeldung.find
-import org.junit.Test
+import spock.lang.Specification
-import static org.junit.Assert.assertTrue
+class SetFindUnitTest extends Specification {
-class SetFindUnitTest {
-
- @Test
- void whenSetContainsElement_thenCheckReturnsTrue() {
+ def "whenSetContainsElement_thenCheckReturnsTrue"() {
+ given:
def set = ['a', 'b', 'c'] as Set
- assertTrue(set.contains('a'))
- assertTrue('a' in set)
+ expect:
+ set.contains('a')
+ 'a' in set
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/iteratemap/IterateMapUnitTest.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/iteratemap/IterateMapUnitTest.groovy
index 970203ce85..4cbcaee2d8 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/iteratemap/IterateMapUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/iteratemap/IterateMapUnitTest.groovy
@@ -1,85 +1,54 @@
package com.baeldung.iteratemap
-import com.baeldung.find.Person
-import org.junit.Test
+import spock.lang.Specification
-import static org.junit.Assert.*
+class IterateMapUnitTest extends Specification {
-class IterateMapUnitTest {
-
- @Test
- void whenUsingEach_thenMapIsIterated() {
- def map = [
- 'FF0000' : 'Red',
- '00FF00' : 'Lime',
- '0000FF' : 'Blue',
- 'FFFF00' : 'Yellow'
- ]
+ final Map map = [
+ 'FF0000': 'Red',
+ '00FF00': 'Lime',
+ '0000FF': 'Blue',
+ 'FFFF00': 'Yellow',
+ 'E6E6FA': 'Lavender',
+ 'D8BFD8': 'Thistle',
+ 'DDA0DD': 'Plum',
+ ]
+ def "whenUsingEach_thenMapIsIterated"() {
+ expect:
map.each { println "Hex Code: $it.key = Color Name: $it.value" }
}
- @Test
- void whenUsingEachWithEntry_thenMapIsIterated() {
- def map = [
- 'E6E6FA' : 'Lavender',
- 'D8BFD8' : 'Thistle',
- 'DDA0DD' : 'Plum',
- ]
-
+ def "whenUsingEachWithEntry_thenMapIsIterated"() {
+ expect:
map.each { entry -> println "Hex Code: $entry.key = Color Name: $entry.value" }
}
- @Test
- void whenUsingEachWithKeyAndValue_thenMapIsIterated() {
- def map = [
- '000000' : 'Black',
- 'FFFFFF' : 'White',
- '808080' : 'Gray'
- ]
-
+ def "whenUsingEachWithKeyAndValue_thenMapIsIterated"() {
+ expect:
map.each { key, val ->
println "Hex Code: $key = Color Name $val"
}
}
- @Test
- void whenUsingEachWithIndexAndEntry_thenMapIsIterated() {
- def map = [
- '800080' : 'Purple',
- '4B0082' : 'Indigo',
- '6A5ACD' : 'Slate Blue'
- ]
-
+ def "whenUsingEachWithIndexAndEntry_thenMapIsIterated"() {
+ expect:
map.eachWithIndex { entry, index ->
- def indent = ((index == 0 || index % 2 == 0) ? " " : "")
+ def indent = index % 2 == 0 ? " " : ""
println "$indent Hex Code: $entry.key = Color Name: $entry.value"
}
}
- @Test
- void whenUsingEachWithIndexAndKeyAndValue_thenMapIsIterated() {
- def map = [
- 'FFA07A' : 'Light Salmon',
- 'FF7F50' : 'Coral',
- 'FF6347' : 'Tomato',
- 'FF4500' : 'Orange Red'
- ]
-
+ def "whenUsingEachWithIndexAndKeyAndValue_thenMapIsIterated"() {
+ expect:
map.eachWithIndex { key, val, index ->
- def indent = ((index == 0 || index % 2 == 0) ? " " : "")
+ def indent = index % 2 == 0 ? " " : ""
println "$indent Hex Code: $key = Color Name: $val"
}
}
- @Test
- void whenUsingForLoop_thenMapIsIterated() {
- def map = [
- '2E8B57' : 'Seagreen',
- '228B22' : 'Forest Green',
- '008000' : 'Green'
- ]
-
+ def "whenUsingForLoop_thenMapIsIterated"() {
+ expect:
for (entry in map) {
println "Hex Code: $entry.key = Color Name: $entry.value"
}
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/lists/ListUnitTest.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/lists/ListUnitTest.groovy
index e4c0a0c177..5baa19f360 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/lists/ListUnitTest.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/lists/ListUnitTest.groovy
@@ -1,173 +1,171 @@
package com.baeldung.lists
-import static groovy.test.GroovyAssert.*
-import org.junit.Test
+import spock.lang.Specification
-class ListUnitTest {
-
- @Test
- void testCreateList() {
+class ListUnitTest extends Specification {
+ def "testCreateList"() {
+ when:
def list = [1, 2, 3]
- assertNotNull(list)
-
def listMix = ['A', "b", 1, true]
- assertTrue(listMix == ['A', "b", 1, true])
-
def linkedList = [1, 2, 3] as LinkedList
- assertTrue(linkedList instanceof LinkedList)
-
ArrayList arrList = [1, 2, 3]
- assertTrue(arrList.class == ArrayList)
-
def copyList = new ArrayList(arrList)
- assertTrue(copyList == arrList)
-
def cloneList = arrList.clone()
- assertTrue(cloneList == arrList)
+
+ then:
+ list
+ listMix == ['A', "b", 1, true]
+ linkedList instanceof LinkedList
+ arrList.class == ArrayList
+ copyList == arrList
+ cloneList == arrList
}
- @Test
- void testCreateEmptyList() {
-
+ def "testCreateEmptyList"() {
+ when:
def emptyList = []
- assertTrue(emptyList.size() == 0)
+
+ then:
+ emptyList.isEmpty()
}
- @Test
- void testCompareTwoLists() {
-
+ def "testCompareTwoLists"() {
+ when:
def list1 = [5, 6.0, 'p']
def list2 = [5, 6.0, 'p']
- assertTrue(list1 == list2)
+
+ then:
+ list1 == list2
}
- @Test
- void testGetItemsFromList(){
-
+ def "testGetItemsFromList"() {
+ when:
def list = ["Hello", "World"]
- assertTrue(list.get(1) == "World")
- assertTrue(list[1] == "World")
- assertTrue(list[-1] == "World")
- assertTrue(list.getAt(1) == "World")
- assertTrue(list.getAt(-2) == "Hello")
+ then:
+ list.get(1) == "World"
+ list[1] == "World"
+ list[-1] == "World"
+ list.getAt(1) == "World"
+ list.getAt(-2) == "Hello"
}
- @Test
- void testAddItemsToList() {
+ def "testAddItemsToList"() {
+ given:
+ def list1 = []
+ def list2 = []
+ def list3 = [1, 2]
- def list = []
+ when:
+ list1 << 1 // [1]
+ list1.add("Apple") // [1, "Apple"]
- list << 1
- list.add("Apple")
- assertTrue(list == [1, "Apple"])
+ list2[2] = "Box" // [null, "Box"]
+ list2[4] = true // [null, "Box", null, true]
- list[2] = "Box"
- list[4] = true
- assertTrue(list == [1, "Apple", "Box", null, true])
+ list1.add(1, 6.0) // [1, 6.0, "Apple"]
+ list1 += list3 // [1, 6.0, "Apple", 1, 2]
+ list1 += 12 // [1, 6.0, "Apple", 1, 2, 12]
- list.add(1, 6.0)
- assertTrue(list == [1, 6.0, "Apple", "Box", null, true])
-
- def list2 = [1, 2]
- list += list2
- list += 12
- assertTrue(list == [1, 6.0, "Apple", "Box", null, true, 1, 2, 12])
+ then:
+ list1 == [1, 6.0, "Apple", 1, 2, 12]
+ list2 == [null, null, "Box", null, true]
}
- @Test
- void testUpdateItemsInList() {
+ def "testUpdateItemsInList"() {
+ given:
+ def list = [1, "Apple", 80, "App"]
- def list =[1, "Apple", 80, "App"]
+ when:
list[1] = "Box"
- list.set(2,90)
- assertTrue(list == [1, "Box", 90, "App"])
+ list.set(2, 90)
+
+ then:
+ list == [1, "Box", 90, "App"]
}
- @Test
- void testRemoveItemsFromList(){
-
+ def "testRemoveItemsFromList"() {
+ given:
def list = [1, 2, 3, 4, 5, 5, 6, 6, 7]
- list.remove(3)
- assertTrue(list == [1, 2, 3, 5, 5, 6, 6, 7])
+ when:
+ list.remove(3) // [1, 2, 3, 5, 5, 6, 6, 7]
+ list.removeElement(5) // [1, 2, 3, 5, 6, 6, 7]
+ list = list - 6 // [1, 2, 3, 5, 7]
- list.removeElement(5)
- assertTrue(list == [1, 2, 3, 5, 6, 6, 7])
-
- assertTrue(list - 6 == [1, 2, 3, 5, 7])
+ then:
+ list == [1, 2, 3, 5, 7]
}
- @Test
- void testIteratingOnAList(){
-
+ def "testIteratingOnAList"() {
+ given:
def list = [1, "App", 3, 4]
- list.each{ println it * 2}
- list.eachWithIndex{ it, i -> println "$i : $it" }
+ expect:
+ list.each { println it * 2 }
+ list.eachWithIndex { it, i -> println "$i : $it" }
}
- @Test
- void testCollectingToAnotherList(){
-
+ def "testCollectingToAnotherList"() {
+ given:
def list = ["Kay", "Henry", "Justin", "Tom"]
- assertTrue(list.collect{"Hi " + it} == ["Hi Kay", "Hi Henry", "Hi Justin", "Hi Tom"])
+
+ when:
+ def collect = list.collect { "Hi " + it }
+
+ then:
+ collect == ["Hi Kay", "Hi Henry", "Hi Justin", "Hi Tom"]
}
- @Test
- void testJoinItemsInAList(){
- assertTrue(["One", "Two", "Three"].join(",") == "One,Two,Three")
+ def "testJoinItemsInAList"() {
+ expect:
+ ["One", "Two", "Three"].join(",") == "One,Two,Three"
}
- @Test
- void testFilteringOnLists(){
+ def "testFilteringOnLists"() {
+ given:
def filterList = [2, 1, 3, 4, 5, 6, 76]
-
- assertTrue(filterList.find{it > 3} == 4)
-
- assertTrue(filterList.findAll{it > 3} == [4, 5, 6, 76])
-
- assertTrue(filterList.findAll{ it instanceof Number} == [2, 1, 3, 4, 5, 6, 76])
-
- assertTrue(filterList.grep( Number )== [2, 1, 3, 4, 5, 6, 76])
-
- assertTrue(filterList.grep{ it> 6 }== [76])
-
def conditionList = [2, 1, 3, 4, 5, 6, 76]
- assertFalse(conditionList.every{ it < 6})
-
- assertTrue(conditionList.any{ it%2 == 0})
+ expect:
+ filterList.find { it > 3 } == 4
+ filterList.findAll { it > 3 } == [4, 5, 6, 76]
+ filterList.findAll { it instanceof Number } == [2, 1, 3, 4, 5, 6, 76]
+ filterList.grep(Number) == [2, 1, 3, 4, 5, 6, 76]
+ filterList.grep { it > 6 } == [76]
+ !(conditionList.every { it < 6 })
+ conditionList.any { it % 2 == 0 }
}
- @Test
- void testGetUniqueItemsInAList(){
- assertTrue([1, 3, 3, 4].toUnique() == [1, 3, 4])
-
+ def "testGetUniqueItemsInAList"() {
+ given:
def uniqueList = [1, 3, 3, 4]
- uniqueList.unique()
- assertTrue(uniqueList == [1, 3, 4])
- assertTrue(["A", "B", "Ba", "Bat", "Cat"].toUnique{ it.size()} == ["A", "Ba", "Bat"])
+ when:
+ uniqueList.unique(true)
+
+ then:
+ [1, 3, 3, 4].toUnique() == [1, 3, 4]
+ uniqueList == [1, 3, 4]
+ ["A", "B", "Ba", "Bat", "Cat"].toUnique { it.size() } == ["A", "Ba", "Bat"]
}
- @Test
- void testSorting(){
-
- assertTrue([1, 2, 1, 0].sort() == [0, 1, 1, 2])
- Comparator mc = {a,b -> a == b? 0: a < b? 1 : -1}
-
+ def "testSorting"() {
+ given:
+ Comparator naturalOrder = { a, b -> a == b ? 0 : a < b ? -1 : 1 }
def list = [1, 2, 1, 0]
- list.sort(mc)
- assertTrue(list == [2, 1, 1, 0])
-
def strList = ["na", "ppp", "as"]
- assertTrue(strList.max() == "ppp")
-
- Comparator minc = {a,b -> a == b? 0: a < b? -1 : 1}
def numberList = [3, 2, 0, 7]
- assertTrue(numberList.min(minc) == 0)
+
+ when:
+ list.sort(naturalOrder.reversed())
+
+ then:
+ list == [2, 1, 1, 0]
+ strList.max() == "ppp"
+ [1, 2, 1, 0].sort() == [0, 1, 1, 2]
+ numberList.min(naturalOrder) == 0
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/maps/MapTest.groovy b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/maps/MapTest.groovy
index deb552c420..9529330089 100644
--- a/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/maps/MapTest.groovy
+++ b/core-groovy-modules/core-groovy-collections/src/test/groovy/com/baeldung/maps/MapTest.groovy
@@ -1,148 +1,160 @@
-package com.baeldung.maps;
+package com.baeldung.maps
-import static groovy.test.GroovyAssert.*
-import org.junit.Test
+import spock.lang.Specification
-class MapTest{
-
- @Test
- void createMap() {
+class MapTest extends Specification {
+ def "createMap"() {
+ when:
def emptyMap = [:]
- assertNotNull(emptyMap)
+ def map = [name: "Jerry", age: 42, city: "New York"]
- assertTrue(emptyMap instanceof java.util.LinkedHashMap)
-
- def map = [name:"Jerry", age: 42, city: "New York"]
- assertTrue(map.size() == 3)
+ then:
+ emptyMap != null
+ emptyMap instanceof java.util.LinkedHashMap
+ map.size() == 3
}
- @Test
- void addItemsToMap() {
-
- def map = [name:"Jerry"]
-
- map["age"] = 42
-
- map.city = "New York"
-
+ def "addItemsToMap"() {
+ given:
+ def map = [name: "Jerry"]
def hobbyLiteral = "hobby"
def hobbyMap = [(hobbyLiteral): "Singing"]
+ def appendToMap = [:]
+
+ when:
+ map["age"] = 42
+ map.city = "New York"
+
map.putAll(hobbyMap)
- assertTrue(map == [name:"Jerry", age: 42, city: "New York", hobby:"Singing"])
- assertTrue(hobbyMap.hobby == "Singing")
- assertTrue(hobbyMap[hobbyLiteral] == "Singing")
-
- map.plus([1:20]) // returns new map
+ appendToMap.plus([1: 20])
+ appendToMap << [2: 30]
- map << [2:30]
+ then:
+ map == [name: "Jerry", age: 42, city: "New York", hobby: "Singing"]
+ hobbyMap.hobby == "Singing"
+ hobbyMap[hobbyLiteral] == "Singing"
+
+ appendToMap == [2: 30] // plus(Map) returns new instance of Map
}
- @Test
- void getItemsFromMap() {
-
- def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
-
- assertTrue(map["name"] == "Jerry")
-
- assertTrue(map.name == "Jerry")
-
+ def "getItemsFromMap"() {
+ when:
+ def map = [name: "Jerry", age: 42, city: "New York", hobby: "Singing"]
def propertyAge = "age"
- assertTrue(map[propertyAge] == 42)
+
+ then:
+ map["name"] == "Jerry"
+ map.name == "Jerry"
+ map[propertyAge] == 42
+ map."$propertyAge" == 42
}
- @Test
- void removeItemsFromMap() {
+ def "removeItemsFromMap"() {
+ given:
+ def map = [1: 20, a: 30, 2: 42, 4: 34, ba: 67, 6: 39, 7: 49]
+ def removeAllKeysOfTypeString = [1: 20, a: 30, ba: 67, 6: 39, 7: 49]
+ def retainAllEntriesWhereValueIsEven = [1: 20, a: 30, ba: 67, 6: 39, 7: 49]
- def map = [1:20, a:30, 2:42, 4:34, ba:67, 6:39, 7:49]
+ when:
+ def minusMap = map - [2: 42, 4: 34]
+ removeAllKeysOfTypeString.removeAll { it.key instanceof String }
+ retainAllEntriesWhereValueIsEven.retainAll { it.value % 2 == 0 }
- def minusMap = map.minus([2:42, 4:34]);
- assertTrue(minusMap == [1:20, a:30, ba:67, 6:39, 7:49])
-
- minusMap.removeAll{it -> it.key instanceof String}
- assertTrue( minusMap == [ 1:20, 6:39, 7:49])
-
- minusMap.retainAll{it -> it.value %2 == 0}
- assertTrue( minusMap == [1:20])
+ then:
+ minusMap == [1: 20, a: 30, ba: 67, 6: 39, 7: 49]
+ removeAllKeysOfTypeString == [1: 20, 6: 39, 7: 49]
+ retainAllEntriesWhereValueIsEven == [1: 20, a: 30]
}
- @Test
- void iteratingOnMaps(){
- def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+ def "iteratingOnMaps"() {
+ when:
+ def map = [name: "Jerry", age: 42, city: "New York", hobby: "Singing"]
- map.each{ entry -> println "$entry.key: $entry.value" }
-
- map.eachWithIndex{ entry, i -> println "$i $entry.key: $entry.value" }
-
- map.eachWithIndex{ key, value, i -> println "$i $key: $value" }
+ then:
+ map.each { entry -> println "$entry.key: $entry.value" }
+ map.eachWithIndex { entry, i -> println "$i $entry.key: $entry.value" }
+ map.eachWithIndex { key, value, i -> println "$i $key: $value" }
}
- @Test
- void filteringAndSearchingMaps(){
- def map = [name:"Jerry", age: 42, city: "New York", hobby:"Singing"]
+ def "filteringAndSearchingMaps"() {
+ given:
+ def map = [name: "Jerry", age: 42, city: "New York", hobby: "Singing"]
- assertTrue(map.find{ it.value == "New York"}.key == "city")
+ when:
+ def find = map.find { it.value == "New York" }
+ def finaAll = map.findAll { it.value == "New York" }
+ def grep = map.grep { it.value == "New York" }
+ def every = map.every { it -> it.value instanceof String }
+ def any = map.any { it -> it.value instanceof String }
- assertTrue(map.findAll{ it.value == "New York"} == [city : "New York"])
+ then:
+ find.key == "city"
- map.grep{it.value == "New York"}.each{ it -> assertTrue(it.key == "city" && it.value == "New York")}
+ finaAll instanceof Map
+ finaAll == [city: "New York"]
- assertTrue(map.every{it -> it.value instanceof String} == false)
+ grep instanceof Collection
+ grep.each { it -> assert it.key == "city" && it.value == "New York" }
- assertTrue(map.any{it -> it.value instanceof String} == true)
+ every instanceof Boolean
+ !every
+
+ any instanceof Boolean
+ any
}
- @Test
- void collect(){
-
- def map = [1: [name:"Jerry", age: 42, city: "New York"],
- 2: [name:"Long", age: 25, city: "New York"],
- 3: [name:"Dustin", age: 29, city: "New York"],
- 4: [name:"Dustin", age: 34, city: "New York"]]
-
- def names = map.collect{entry -> entry.value.name} // returns only list
- assertTrue(names == ["Jerry", "Long", "Dustin", "Dustin"])
-
- def uniqueNames = map.collect([] as HashSet){entry -> entry.value.name}
- assertTrue(uniqueNames == ["Jerry", "Long", "Dustin"] as Set)
-
- def idNames = map.collectEntries{key, value -> [key, value.name]}
- assertTrue(idNames == [1:"Jerry", 2: "Long", 3:"Dustin", 4: "Dustin"])
-
- def below30Names = map.findAll{it.value.age < 30}.collect{key, value -> value.name}
- assertTrue(below30Names == ["Long", "Dustin"])
+ def "collect"() {
+ given:
+ def map = [
+ 1: [name: "Jerry", age: 42, city: "New York"],
+ 2: [name: "Long", age: 25, city: "New York"],
+ 3: [name: "Dustin", age: 29, city: "New York"],
+ 4: [name: "Dustin", age: 34, city: "New York"]
+ ]
+ when:
+ def names = map.collect { entry -> entry.value.name } // returns only list
+ def uniqueNames = map.collect { entry -> entry.value.name }
+ .unique()
+ def idNames = map.collectEntries { key, value -> [key, value.name] }
+ def below30Names = map.findAll { it.value.age < 30 }
+ .collect { key, value -> value.name }
+ then:
+ names == ["Jerry", "Long", "Dustin", "Dustin"]
+ uniqueNames == ["Jerry", "Long", "Dustin"]
+ idNames == [1: "Jerry", 2: "Long", 3: "Dustin", 4: "Dustin"]
+ below30Names == ["Long", "Dustin"]
}
- @Test
- void group(){
- def map = [1:20, 2: 40, 3: 11, 4: 93]
-
- def subMap = map.groupBy{it.value % 2}
- println subMap
- assertTrue(subMap == [0:[1:20, 2:40 ], 1:[3:11, 4:93]])
+ def "group"() {
+ given:
+ def map = [1: 20, 2: 40, 3: 11, 4: 93]
+ when:
+ def subMap = map.groupBy { it.value % 2 }
def keySubMap = map.subMap([1, 2])
- assertTrue(keySubMap == [1:20, 2:40])
+ then:
+ subMap == [0: [1: 20, 2: 40], 1: [3: 11, 4: 93]]
+ keySubMap == [1: 20, 2: 40]
}
- @Test
- void sorting(){
- def map = [ab:20, a: 40, cb: 11, ba: 93]
+ def "sorting"() {
+ given:
+ def map = [ab: 20, a: 40, cb: 11, ba: 93]
+ when:
def naturallyOrderedMap = map.sort()
- assertTrue([a:40, ab:20, ba:93, cb:11] == naturallyOrderedMap)
-
def compSortedMap = map.sort({ k1, k2 -> k1 <=> k2 } as Comparator)
- assertTrue([a:40, ab:20, ba:93, cb:11] == compSortedMap)
-
def cloSortedMap = map.sort({ it1, it2 -> it1.value <=> it1.value })
- assertTrue([cb:11, ab:20, a:40, ba:93] == cloSortedMap)
+ then:
+ naturallyOrderedMap == [a: 40, ab: 20, ba: 93, cb: 11]
+ compSortedMap == [a: 40, ab: 20, ba: 93, cb: 11]
+ cloSortedMap == [cb: 11, ab: 20, a: 40, ba: 93]
}
-
}
diff --git a/core-groovy-modules/core-groovy-strings/pom.xml b/core-groovy-modules/core-groovy-strings/pom.xml
index e51ebfbd4b..ac68849431 100644
--- a/core-groovy-modules/core-groovy-strings/pom.xml
+++ b/core-groovy-modules/core-groovy-strings/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-groovy-strings
- 1.0-SNAPSHOT
core-groovy-strings
jar
@@ -101,11 +100,4 @@
-
-
- central
- https://jcenter.bintray.com
-
-
-
-
\ No newline at end of file
+
diff --git a/core-groovy-modules/core-groovy-strings/src/test/groovy/com/baeldung/removeprefix/RemovePrefixTest.groovy b/core-groovy-modules/core-groovy-strings/src/test/groovy/com/baeldung/removeprefix/RemovePrefixTest.groovy
index 61b81fe1b2..8b7ce9c355 100644
--- a/core-groovy-modules/core-groovy-strings/src/test/groovy/com/baeldung/removeprefix/RemovePrefixTest.groovy
+++ b/core-groovy-modules/core-groovy-strings/src/test/groovy/com/baeldung/removeprefix/RemovePrefixTest.groovy
@@ -1,70 +1,74 @@
package com.baeldung.removeprefix
-import org.junit.Assert
-import org.junit.Test
+import spock.lang.Specification
-class RemovePrefixTest {
+class RemovePrefixTest extends Specification {
-
- @Test
- public void whenCasePrefixIsRemoved_thenReturnTrue() {
+ def "whenCasePrefixIsRemoved_thenReturnTrue"() {
+ given:
def trimPrefix = {
it.startsWith('Groovy-') ? it.minus('Groovy-') : it
}
-
+
+ when:
def actual = trimPrefix("Groovy-Tutorials at Baeldung")
def expected = "Tutorials at Baeldung"
- Assert.assertEquals(expected, actual)
+ then:
+ expected == actual
}
- @Test
- public void whenPrefixIsRemoved_thenReturnTrue() {
-
+ def "whenPrefixIsRemoved_thenReturnTrue"() {
+ given:
String prefix = "groovy-"
String trimPrefix = "Groovy-Tutorials at Baeldung"
- def actual;
- if(trimPrefix.startsWithIgnoreCase(prefix)) {
+
+ when:
+ def actual
+ if (trimPrefix.startsWithIgnoreCase(prefix)) {
actual = trimPrefix.substring(prefix.length())
}
-
def expected = "Tutorials at Baeldung"
- Assert.assertEquals(expected, actual)
+ then:
+ expected == actual
}
- @Test
- public void whenPrefixIsRemovedUsingRegex_thenReturnTrue() {
-
+ def "whenPrefixIsRemovedUsingRegex_thenReturnTrue"() {
+ given:
def regex = ~"^([Gg])roovy-"
String trimPrefix = "Groovy-Tutorials at Baeldung"
+
+ when:
String actual = trimPrefix - regex
-
def expected = "Tutorials at Baeldung"
- Assert.assertEquals(expected, actual)
+ then:
+ expected == actual
}
- @Test
- public void whenPrefixIsRemovedUsingReplaceFirst_thenReturnTrue() {
- def regex = ~"^groovy"
- String trimPrefix = "groovyTutorials at Baeldung's groovy page"
+ def "whenPrefixIsRemovedUsingReplaceFirst_thenReturnTrue"() {
+ given:
+ def regex = ~"^groovy"
+ String trimPrefix = "groovyTutorials at Baeldung's groovy page"
+
+ when:
String actual = trimPrefix.replaceFirst(regex, "")
-
def expected = "Tutorials at Baeldung's groovy page"
-
- Assert.assertEquals(expected, actual)
+
+ then:
+ expected == actual
}
- @Test
- public void whenPrefixIsRemovedUsingReplaceAll_thenReturnTrue() {
-
+ def "whenPrefixIsRemovedUsingReplaceAll_thenReturnTrue"() {
+ given:
String trimPrefix = "groovyTutorials at Baeldung groovy"
+
+ when:
String actual = trimPrefix.replaceAll(/^groovy/, "")
-
def expected = "Tutorials at Baeldung groovy"
- Assert.assertEquals(expected, actual)
+ then:
+ expected == actual
}
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/pom.xml b/core-groovy-modules/core-groovy/pom.xml
index 413fbde106..6668f62235 100644
--- a/core-groovy-modules/core-groovy/pom.xml
+++ b/core-groovy-modules/core-groovy/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-groovy
- 1.0-SNAPSHOT
core-groovy
jar
@@ -101,11 +100,4 @@
-
-
- central
- https://jcenter.bintray.com
-
-
-
-
\ No newline at end of file
+
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy
index 4239fa534c..1418947cc7 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy
@@ -10,13 +10,14 @@ class ReadFile {
int readFileLineByLine(String filePath) {
File file = new File(filePath)
def line, noOfLines = 0;
+
file.withReader { reader ->
- while ((line = reader.readLine())!=null)
- {
+ while ((line = reader.readLine()) != null) {
println "${line}"
noOfLines++
}
}
+
return noOfLines
}
@@ -26,9 +27,7 @@ class ReadFile {
* @return
*/
List readFileInList(String filePath) {
- File file = new File(filePath)
- def lines = file.readLines()
- return lines
+ return new File(filePath).readLines()
}
/**
@@ -37,9 +36,7 @@ class ReadFile {
* @return
*/
String readFileString(String filePath) {
- File file = new File(filePath)
- String fileContent = file.text
- return fileContent
+ return new File(filePath).text
}
/**
@@ -48,9 +45,7 @@ class ReadFile {
* @return
*/
String readFileStringWithCharset(String filePath) {
- File file = new File(filePath)
- String utf8Content = file.getText("UTF-8")
- return utf8Content
+ return new File(filePath).getText("UTF-8")
}
/**
@@ -59,49 +54,44 @@ class ReadFile {
* @return
*/
byte[] readBinaryFile(String filePath) {
- File file = new File(filePath)
- byte[] binaryContent = file.bytes
- return binaryContent
+ return new File(filePath).bytes
}
-
+
/**
* More Examples of reading a file
* @return
*/
def moreExamples() {
-
+
//with reader with utf-8
new File("src/main/resources/utf8Content.html").withReader('UTF-8') { reader ->
def line
- while ((line = reader.readLine())!=null) {
+ while ((line = reader.readLine()) != null) {
println "${line}"
}
}
-
- //collect api
- def list = new File("src/main/resources/fileContent.txt").collect {it}
-
- //as operator
+
+ // collect api
+ def list = new File("src/main/resources/fileContent.txt").collect { it }
+
+ // as operator
def array = new File("src/main/resources/fileContent.txt") as String[]
-
- //eachline
- new File("src/main/resources/fileContent.txt").eachLine { line ->
- println line
- }
-
+
+ // eachline
+ new File("src/main/resources/fileContent.txt").eachLine { println it }
+
//newInputStream with eachLine
- def is = new File("src/main/resources/fileContent.txt").newInputStream()
- is.eachLine {
- println it
+
+ // try-with-resources automatically closes BufferedInputStream resource
+ try (def inputStream = new File("src/main/resources/fileContent.txt").newInputStream()) {
+ inputStream.eachLine { println it }
}
- is.close()
-
- //withInputStream
+
+ // withInputStream
new File("src/main/resources/fileContent.txt").withInputStream { stream ->
stream.eachLine { line ->
println line
}
}
}
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/strings/Concatenate.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/strings/Concatenate.groovy
index b3a0852a0b..4a7c3f8529 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/strings/Concatenate.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/strings/Concatenate.groovy
@@ -1,9 +1,10 @@
package com.baeldung.strings;
class Concatenate {
+
String first = 'Hello'
String last = 'Groovy'
-
+
String doSimpleConcat() {
return 'My name is ' + first + ' ' + last
}
@@ -23,21 +24,28 @@ class Concatenate {
String doConcatUsingLeftShiftOperator() {
return 'My name is ' << first << ' ' << last
}
-
+
String doConcatUsingArrayJoinMethod() {
return ['My name is', first, last].join(' ')
}
String doConcatUsingArrayInjectMethod() {
- return [first,' ', last]
- .inject(new StringBuffer('My name is '), { initial, name -> initial.append(name); return initial }).toString()
+ return [first, ' ', last]
+ .inject(new StringBuffer('My name is '), { initial, name -> initial.append(name) })
+ .toString()
}
-
+
String doConcatUsingStringBuilder() {
- return new StringBuilder().append('My name is ').append(first).append(' ').append(last)
+ return new StringBuilder().append('My name is ')
+ .append(first)
+ .append(' ')
+ .append(last)
}
String doConcatUsingStringBuffer() {
- return new StringBuffer().append('My name is ').append(first).append(' ').append(last)
+ return new StringBuffer().append('My name is ')
+ .append(first)
+ .append(' ')
+ .append(last)
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/AnimalTrait.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/AnimalTrait.groovy
index 6ec5cda571..a3fed81c8b 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/AnimalTrait.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/AnimalTrait.groovy
@@ -1,8 +1,8 @@
package com.baeldung.traits
trait AnimalTrait {
-
+
String basicBehavior() {
return "Animalistic!!"
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Dog.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Dog.groovy
index 3e0677ba18..fc53b1bef9 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Dog.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Dog.groovy
@@ -1,9 +1,8 @@
package com.baeldung.traits
class Dog implements WalkingTrait, SpeakingTrait {
-
+
String speakAndWalk() {
WalkingTrait.super.speakAndWalk()
}
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Employee.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Employee.groovy
index b3e4285476..16f1fab984 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Employee.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Employee.groovy
@@ -1,12 +1,14 @@
package com.baeldung.traits
class Employee implements UserTrait {
-
+
+ @Override
String name() {
return 'Bob'
}
+ @Override
String lastName() {
return "Marley"
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Human.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Human.groovy
index e78d59bbfd..5417334269 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Human.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/Human.groovy
@@ -1,6 +1,6 @@
package com.baeldung.traits
interface Human {
-
+
String lastName()
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/SpeakingTrait.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/SpeakingTrait.groovy
index f437a94bd9..969982e8e0 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/SpeakingTrait.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/SpeakingTrait.groovy
@@ -1,13 +1,12 @@
package com.baeldung.traits
trait SpeakingTrait {
-
+
String basicAbility() {
return "Speaking!!"
}
-
+
String speakAndWalk() {
return "Speak and walk!!"
}
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/UserTrait.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/UserTrait.groovy
index 0d395bffcd..1d1d188460 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/UserTrait.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/UserTrait.groovy
@@ -1,36 +1,35 @@
package com.baeldung.traits
trait UserTrait implements Human {
-
+
+ String email
+ String address
+
+ abstract String name()
+
String sayHello() {
return "Hello!"
}
-
- abstract String name()
-
+
String showName() {
- return "Hello, ${name()}!"
+ return "Hello, ${name()}!"
}
private String greetingMessage() {
return 'Hello, from a private method!'
}
-
+
String greet() {
def msg = greetingMessage()
println msg
msg
}
-
+
def self() {
- return this
+ return this
}
-
+
String showLastName() {
return "Hello, ${lastName()}!"
}
-
- String email
- String address
}
-
\ No newline at end of file
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/VehicleTrait.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/VehicleTrait.groovy
index f5ae8fab30..e29561157c 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/VehicleTrait.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/VehicleTrait.groovy
@@ -1,9 +1,9 @@
package com.baeldung
trait VehicleTrait extends WheelTrait {
-
+
String showWheels() {
- return "Num of Wheels $noOfWheels"
+ return "Num of Wheels $noOfWheels"
}
-
-}
\ No newline at end of file
+
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WalkingTrait.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WalkingTrait.groovy
index 66cff8809f..84be49ec25 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WalkingTrait.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WalkingTrait.groovy
@@ -1,13 +1,13 @@
package com.baeldung.traits
trait WalkingTrait {
-
+
String basicAbility() {
return "Walking!!"
}
-
+
String speakAndWalk() {
return "Walk and speak!!"
}
-
-}
\ No newline at end of file
+
+}
diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WheelTrait.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WheelTrait.groovy
index 364d5b883e..7f2448e185 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WheelTrait.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/traits/WheelTrait.groovy
@@ -1,7 +1,6 @@
package com.baeldung
trait WheelTrait {
-
+
int noOfWheels
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy
index da1dfc10ba..87cfc79761 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy
@@ -1,71 +1,76 @@
package com.baeldung.file
import spock.lang.Specification
-import spock.lang.Ignore
class ReadFileUnitTest extends Specification {
ReadFile readFile
- void setup () {
+ void setup() {
readFile = new ReadFile()
}
- def 'Should return number of lines in File using ReadFile.readFileLineByLine given filePath' () {
+ def 'Should return number of lines in File using ReadFile.readFileLineByLine given filePath'() {
given:
- def filePath = "src/main/resources/fileContent.txt"
+ def filePath = "src/main/resources/fileContent.txt"
+
when:
- def noOfLines = readFile.readFileLineByLine(filePath)
+ def noOfLines = readFile.readFileLineByLine(filePath)
+
then:
- noOfLines
- noOfLines instanceof Integer
- assert noOfLines, 3
- }
-
- def 'Should return File Content in list of lines using ReadFile.readFileInList given filePath' () {
- given:
- def filePath = "src/main/resources/fileContent.txt"
- when:
- def lines = readFile.readFileInList(filePath)
- then:
- lines
- lines instanceof List
- assert lines.size(), 3
- }
-
- def 'Should return file content in string using ReadFile.readFileString given filePath' () {
- given:
- def filePath = "src/main/resources/fileContent.txt"
- when:
- def fileContent = readFile.readFileString(filePath)
- then:
- fileContent
- fileContent instanceof String
- fileContent.contains("""Line 1 : Hello World!!!
-Line 2 : This is a file content.
-Line 3 : String content""")
-
+ noOfLines
+ noOfLines instanceof Integer
+ noOfLines == 3
}
- def 'Should return UTF-8 encoded file content in string using ReadFile.readFileStringWithCharset given filePath' () {
+ def 'Should return File Content in list of lines using ReadFile.readFileInList given filePath'() {
given:
- def filePath = "src/main/resources/utf8Content.html"
+ def filePath = "src/main/resources/fileContent.txt"
+
when:
- def encodedContent = readFile.readFileStringWithCharset(filePath)
+ def lines = readFile.readFileInList(filePath)
+
then:
- encodedContent
- encodedContent instanceof String
+ lines
+ lines instanceof List
+ lines.size() == 3
}
-
- def 'Should return binary file content in byte array using ReadFile.readBinaryFile given filePath' () {
+
+ def 'Should return file content in string using ReadFile.readFileString given filePath'() {
given:
- def filePath = "src/main/resources/sample.png"
+ def filePath = "src/main/resources/fileContent.txt"
+
when:
- def binaryContent = readFile.readBinaryFile(filePath)
+ def fileContent = readFile.readFileString(filePath)
+
then:
- binaryContent
- binaryContent instanceof byte[]
- binaryContent.length == 329
+ fileContent
+ fileContent instanceof String
+ fileContent.contains(["Line 1 : Hello World!!!", "Line 2 : This is a file content.", "Line 3 : String content"].join("\r\n"))
}
-
-}
\ No newline at end of file
+
+ def 'Should return UTF-8 encoded file content in string using ReadFile.readFileStringWithCharset given filePath'() {
+ given:
+ def filePath = "src/main/resources/utf8Content.html"
+
+ when:
+ def encodedContent = readFile.readFileStringWithCharset(filePath)
+
+ then:
+ encodedContent
+ encodedContent instanceof String
+ }
+
+ def 'Should return binary file content in byte array using ReadFile.readBinaryFile given filePath'() {
+ given:
+ def filePath = "src/main/resources/sample.png"
+
+ when:
+ def binaryContent = readFile.readBinaryFile(filePath)
+
+ then:
+ binaryContent
+ binaryContent instanceof byte[]
+ binaryContent.length == 329
+ }
+}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/groovy/sql/SqlTest.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/groovy/sql/SqlTest.groovy
index ac96a55773..da982744e9 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/groovy/sql/SqlTest.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/groovy/sql/SqlTest.groovy
@@ -1,28 +1,29 @@
package com.baeldung.groovy.sql
import groovy.sql.GroovyResultSet
-import groovy.sql.GroovyRowResult
import groovy.sql.Sql
-import groovy.transform.CompileStatic
-import static org.junit.Assert.*
import org.junit.Test
+import static org.junit.Assert.*
+
class SqlTest {
- final Map dbConnParams = [url: 'jdbc:hsqldb:mem:testDB', user: 'sa', password: '', driver: 'org.hsqldb.jdbc.JDBCDriver']
+ final Map dbConnParams = [url: 'jdbc:hsqldb:mem:testDB',
+ user: 'sa',
+ password: '',
+ driver: 'org.hsqldb.jdbc.JDBCDriver']
@Test
void whenNewSqlInstance_thenDbIsAccessed() {
def sql = Sql.newInstance(dbConnParams)
sql.close()
- sql.close()
}
@Test
void whenTableDoesNotExist_thenSelectFails() {
try {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.eachRow('select * from PROJECT') {}
+ sql.eachRow('SELECT * FROM PROJECT') {}
}
fail("An exception should have been thrown")
@@ -34,12 +35,12 @@ class SqlTest {
@Test
void whenTableCreated_thenSelectIsPossible() {
Sql.withInstance(dbConnParams) { Sql sql ->
- def result = sql.execute 'create table PROJECT_1 (id integer not null, name varchar(50), url varchar(100))'
+ def result = sql.execute 'CREATE TABLE PROJECT_1 (ID INTEGER NOT NULL, NAME VARCHAR(50), URL VARCHAR(100))'
assertEquals(0, sql.updateCount)
assertFalse(result)
- result = sql.execute('select * from PROJECT_1')
+ result = sql.execute('SELECT * FROM PROJECT_1')
assertTrue(result)
}
@@ -48,7 +49,7 @@ class SqlTest {
@Test
void whenIdentityColumn_thenInsertReturnsNewId() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_2 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_2 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
def ids = sql.executeInsert("INSERT INTO PROJECT_2 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')")
assertEquals(0, ids[0][0])
@@ -62,9 +63,10 @@ class SqlTest {
@Test
void whenUpdate_thenNumberOfAffectedRows() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_3 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_3 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_3 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')")
sql.executeInsert("INSERT INTO PROJECT_3 (NAME, URL) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring')")
+
def count = sql.executeUpdate("UPDATE PROJECT_3 SET URL = 'https://' + URL")
assertEquals(2, count)
@@ -74,7 +76,7 @@ class SqlTest {
@Test
void whenEachRow_thenResultSetHasProperties() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_4 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_4 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_4 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')")
sql.executeInsert("INSERT INTO PROJECT_4 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')")
@@ -93,7 +95,7 @@ class SqlTest {
@Test
void whenPagination_thenSubsetIsReturned() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_5 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')")
sql.executeInsert("INSERT INTO PROJECT_5 (NAME, URL) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring')")
def rows = sql.rows('SELECT * FROM PROJECT_5 ORDER BY NAME', 1, 1)
@@ -106,9 +108,11 @@ class SqlTest {
@Test
void whenParameters_thenReplacement() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_6 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
- sql.execute('INSERT INTO PROJECT_6 (NAME, URL) VALUES (?, ?)', 'tutorials', 'github.com/eugenp/tutorials')
- sql.execute("INSERT INTO PROJECT_6 (NAME, URL) VALUES (:name, :url)", [name: 'REST with Spring', url: 'github.com/eugenp/REST-With-Spring'])
+ sql.execute 'CREATE TABLE PROJECT_6 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute('INSERT INTO PROJECT_6 (NAME, URL) VALUES (?, ?)',
+ 'tutorials', 'github.com/eugenp/tutorials')
+ sql.execute("INSERT INTO PROJECT_6 (NAME, URL) VALUES (:name, :url)",
+ [name: 'REST with Spring', url: 'github.com/eugenp/REST-With-Spring'])
def rows = sql.rows("SELECT * FROM PROJECT_6 WHERE NAME = 'tutorials'")
@@ -123,7 +127,7 @@ class SqlTest {
@Test
void whenParametersInGString_thenReplacement() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_7 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_7 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.execute "INSERT INTO PROJECT_7 (NAME, URL) VALUES (${'tutorials'}, ${'github.com/eugenp/tutorials'})"
def name = 'REST with Spring'
def url = 'github.com/eugenp/REST-With-Spring'
@@ -143,7 +147,7 @@ class SqlTest {
void whenTransactionRollback_thenNoDataInserted() {
Sql.withInstance(dbConnParams) { Sql sql ->
sql.withTransaction {
- sql.execute 'create table PROJECT_8 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_8 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_8 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')")
sql.executeInsert("INSERT INTO PROJECT_8 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')")
sql.rollback()
@@ -159,7 +163,7 @@ class SqlTest {
void whenTransactionRollbackThenCommit_thenOnlyLastInserted() {
Sql.withInstance(dbConnParams) { Sql sql ->
sql.withTransaction {
- sql.execute 'create table PROJECT_9 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_9 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_9 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')")
sql.rollback()
sql.executeInsert("INSERT INTO PROJECT_9 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')")
@@ -179,11 +183,12 @@ class SqlTest {
Sql.withInstance(dbConnParams) { Sql sql ->
try {
sql.withTransaction {
- sql.execute 'create table PROJECT_10 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_10 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_10 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')")
throw new Exception('rollback')
}
- } catch (ignored) {}
+ } catch (ignored) {
+ }
def rows = sql.rows("SELECT * FROM PROJECT_10")
@@ -196,11 +201,12 @@ class SqlTest {
Sql.withInstance(dbConnParams) { Sql sql ->
try {
sql.cacheConnection {
- sql.execute 'create table PROJECT_11 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_11 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_11 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')")
throw new Exception('This does not rollback')
}
- } catch (ignored) {}
+ } catch (ignored) {
+ }
def rows = sql.rows("SELECT * FROM PROJECT_11")
@@ -211,7 +217,7 @@ class SqlTest {
/*@Test
void whenModifyResultSet_thenDataIsChanged() {
Sql.withInstance(dbConnParams) { Sql sql ->
- sql.execute 'create table PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
+ sql.execute 'CREATE TABLE PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))'
sql.executeInsert("INSERT INTO PROJECT_5 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')")
sql.executeInsert("INSERT INTO PROJECT_5 (NAME, URL) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring')")
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/json/JsonParserTest.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/json/JsonParserTest.groovy
index e65550a3be..fa7b2fd3c8 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/json/JsonParserTest.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/json/JsonParserTest.groovy
@@ -1,5 +1,6 @@
package com.baeldung.json
+import groovy.json.JsonGenerator
import spock.lang.Specification
import java.text.SimpleDateFormat
@@ -8,20 +9,42 @@ class JsonParserTest extends Specification {
JsonParser jsonParser
- void setup () {
+ void setup() {
jsonParser = new JsonParser()
}
- def 'Should parse to Account given Json String' () {
+ def 'Should parse to Account given Json String'() {
given:
- def json = '{"id":"1234","value":15.6}'
+ def json = '{"id":"1234","value":15.6}'
+
when:
- def account = jsonParser.toObject(json)
+ def account = jsonParser.toObject(json)
+
then:
- account
- account instanceof Account
- account.id == '1234'
- account.value == 15.6
+ account
+ account instanceof Account
+ account.id == '1234'
+ account.value == 15.6
+ }
+
+ def 'Should format date and exclude value field'() {
+ given:
+ def account = new Account(
+ id: '123',
+ value: 15.6,
+ createdAt: new SimpleDateFormat('MM/dd/yyyy').parse('14/01/2023')
+ )
+
+ def jsonGenerator = new JsonGenerator.Options()
+ .dateFormat('MM/dd/yyyy')
+ .excludeFieldsByName('value')
+ .build()
+
+ when:
+ def accountToJson = jsonGenerator.toJson(account)
+
+ then:
+ accountToJson == '{"createdAt":"01/31/2024","id":"123"}'
}
/*def 'Should parse to Account given Json String with date property' () {
@@ -52,15 +75,20 @@ class JsonParserTest extends Specification {
json == '{"value":15.6,"createdAt":"2018-01-01T00:00:00+0000","id":"123"}'
}*/
- def 'Should prettify given a json string' () {
+ def 'Should prettify given a json string'() {
given:
- String json = '{"value":15.6,"createdAt":"01/01/2018","id":"123456"}'
+ String json = '{"value":15.6,"createdAt":"01/01/2018","id":"123456"}'
+
when:
- def jsonPretty = jsonParser.prettyfy(json)
+ def jsonPretty = jsonParser.prettyfy(json)
+
then:
- jsonPretty
- jsonPretty == '{\n "value": 15.6,\n "createdAt": "01/01/2018",\n "id": "123456"\n}'
+ jsonPretty
+ jsonPretty == '''\
+{
+ "value": 15.6,
+ "createdAt": "01/01/2018",
+ "id": "123456"
+}'''
}
-
-
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/ConcatenateTest.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/ConcatenateTest.groovy
index 3ef4a5d460..e4a178a14b 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/ConcatenateTest.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/ConcatenateTest.groovy
@@ -1,101 +1,88 @@
-import com.baeldung.strings.Concatenate;
+import com.baeldung.strings.Concatenate
+import spock.lang.Specification
-class ConcatenateTest extends GroovyTestCase {
-
- void testSimpleConcat() {
- def name = new Concatenate()
- name.first = 'Joe';
- name.last = 'Smith';
- def expected = 'My name is Joe Smith'
- assertToString(name.doSimpleConcat(), expected)
- }
-
- void testConcatUsingGString() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingGString(), expected)
- }
-
- void testConcatUsingGStringClosures() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingGStringClosures(), expected)
- }
-
- void testConcatUsingStringConcatMethod() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingStringConcatMethod(), expected)
+class ConcatenateTest extends Specification {
+
+ final Concatenate NAME = new Concatenate(first: 'Joe', last: 'Smith')
+ final String EXPECTED = "My name is Joe Smith";
+
+ def "SimpleConcat"() {
+ expect:
+ NAME.doSimpleConcat() == EXPECTED
}
- void testConcatUsingLeftShiftOperator() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingLeftShiftOperator(), expected)
+ def "ConcatUsingGString"() {
+ expect:
+ NAME.doConcatUsingGString() == EXPECTED
}
- void testConcatUsingArrayJoinMethod() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingArrayJoinMethod(), expected)
+ def "ConcatUsingGStringClosures"() {
+ expect:
+ NAME.doConcatUsingGStringClosures() == EXPECTED
}
- void testConcatUsingArrayInjectMethod() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingArrayInjectMethod(), expected)
+ def "ConcatUsingStringConcatMethod"() {
+ expect:
+ NAME.doConcatUsingStringConcatMethod() == EXPECTED
}
- void testConcatUsingStringBuilder() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingStringBuilder(), expected)
+ def "ConcatUsingLeftShiftOperator"() {
+ expect:
+ NAME.doConcatUsingLeftShiftOperator() == EXPECTED
}
- void testConcatUsingStringBuffer() {
- def name = new Concatenate()
- name.first = "Joe";
- name.last = "Smith";
- def expected = "My name is Joe Smith"
- assertToString(name.doConcatUsingStringBuffer(), expected)
+ def "ConcatUsingArrayJoinMethod"() {
+ expect:
+ NAME.doConcatUsingArrayJoinMethod() == EXPECTED
}
- void testConcatMultilineUsingStringConcatMethod() {
- def name = new Concatenate()
- name.first = '''Joe
+ def "ConcatUsingArrayInjectMethod"() {
+ expect:
+ NAME.doConcatUsingArrayInjectMethod() == EXPECTED
+ }
+
+ def "ConcatUsingStringBuilder"() {
+ expect:
+ NAME.doConcatUsingStringBuilder() == EXPECTED
+ }
+
+ def "ConcatUsingStringBuffer"() {
+ expect:
+ NAME.doConcatUsingStringBuffer() == EXPECTED
+ }
+
+ def "ConcatMultilineUsingStringConcatMethod"() {
+ when:
+ NAME.first = '''Joe
Smith
- ''';
- name.last = 'Junior';
+ '''
+ NAME.last = 'Junior'
+
+ then:
def expected = '''My name is Joe
Smith
- Junior''';
- assertToString(name.doConcatUsingStringConcatMethod(), expected)
+ Junior'''
+ NAME.doConcatUsingStringConcatMethod() == expected
}
- void testGStringvsClosure(){
- def first = "Joe";
- def last = "Smith";
- def eagerGString = "My name is $first $last"
- def lazyGString = "My name is ${-> first} ${-> last}"
+ def "GStringvsClosure"() {
+ given:
+ def eagerGString = "My name is $NAME.first $NAME.last"
+ def lazyGString = "My name is ${-> NAME.first} ${-> NAME.last}"
- assert eagerGString == "My name is Joe Smith"
- assert lazyGString == "My name is Joe Smith"
- first = "David";
- assert eagerGString == "My name is Joe Smith"
- assert lazyGString == "My name is David Smith"
- }
+ expect:
+ eagerGString == "My name is Joe Smith"
+ lazyGString == "My name is Joe Smith"
+ }
+
+ def "LazyVsEager"() {
+ given:
+ def eagerGString = "My name is $NAME.first $NAME.last"
+ def lazyGString = "My name is ${-> NAME.first} ${-> NAME.last}"
+ NAME.first = "David"
+
+ expect:
+ eagerGString == "My name is Joe Smith"
+ lazyGString == "My name is David Smith"
+ }
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/StringMatchingSpec.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/StringMatchingSpec.groovy
index 3865bc73fa..89202d9500 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/StringMatchingSpec.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/strings/StringMatchingSpec.groovy
@@ -13,7 +13,7 @@ class StringMatchingSpec extends Specification {
expect:
p instanceof Pattern
- and: "you can use slash strings to avoid escaping of blackslash"
+ and: "you can use slash strings to avoid escaping of backslash"
def digitPattern = ~/\d*/
digitPattern.matcher('4711').matches()
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtoint/ConvertStringToInt.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtoint/ConvertStringToInt.groovy
index 48cf48fa8a..cce6ede989 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtoint/ConvertStringToInt.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtoint/ConvertStringToInt.groovy
@@ -1,110 +1,119 @@
package com.baeldung.stringtoint
-import org.junit.Test
+import spock.lang.Specification
import java.text.DecimalFormat
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNull
+class ConvertStringToInt extends Specification {
-class ConvertStringToInt {
+ final String STRING_NUM = "123"
+ final int EXPECTED_INT = 123
- @Test
- void givenString_whenUsingAsInteger_thenConvertToInteger() {
- def stringNum = "123"
+ def "givenString_whenUsingAsInteger_thenConvertToInteger"() {
+ given:
def invalidString = "123a"
- Integer expectedInteger = 123
- Integer integerNum = stringNum as Integer
+ Integer integerNum = STRING_NUM as Integer
+
+ when:
def intNum = invalidString?.isInteger() ? invalidString as Integer : null
- assertNull(null, intNum)
- assertEquals(integerNum, expectedInteger)
+ then:
+ intNum == null
+ integerNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingAsInt_thenConvertToInt() {
- def stringNum = "123"
- int expectedInt = 123
- int intNum = stringNum as int
+ def "givenString_whenUsingAsInt_thenConvertToInt"() {
+ given:
+ int intNum = STRING_NUM as int
- assertEquals(intNum, expectedInt)
+ expect:
+ intNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingToInteger_thenConvertToInteger() {
- def stringNum = "123"
- int expectedInt = 123
- int intNum = stringNum.toInteger()
+ def "givenString_whenUsingToInteger_thenConvertToInteger"() {
+ given:
+ int intNum = STRING_NUM.toInteger()
- assertEquals(intNum, expectedInt)
+ expect:
+ intNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingParseInt_thenConvertToInteger() {
- def stringNum = "123"
- int expectedInt = 123
- int intNum = Integer.parseInt(stringNum)
+ def "givenString_whenUsingParseInt_thenConvertToInteger"() {
+ given:
+ int intNum = Integer.parseInt(STRING_NUM)
- assertEquals(intNum, expectedInt)
+ expect:
+ intNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingValueOf_thenConvertToInteger() {
- def stringNum = "123"
- int expectedInt = 123
- int intNum = Integer.valueOf(stringNum)
+ def "givenString_whenUsingValueOf_thenConvertToInteger"() {
+ given:
+ int intNum = Integer.valueOf(STRING_NUM)
- assertEquals(intNum, expectedInt)
+ expect:
+ intNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingIntValue_thenConvertToInteger() {
- def stringNum = "123"
- int expectedInt = 123
- int intNum = new Integer(stringNum).intValue()
+ def "givenString_whenUsingIntValue_thenConvertToInteger"() {
+ given:
+ int intNum = Integer.valueOf(STRING_NUM).intValue()
- assertEquals(intNum, expectedInt)
+ expect:
+ intNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingNewInteger_thenConvertToInteger() {
- def stringNum = "123"
- int expectedInt = 123
- int intNum = new Integer(stringNum)
+ def "givenString_whenUsingNewInteger_thenConvertToInteger"() {
+ given:
+ Integer intNum = Integer.valueOf(STRING_NUM)
- assertEquals(intNum, expectedInt)
+ expect:
+ intNum == EXPECTED_INT
}
- @Test
- void givenString_whenUsingDecimalFormat_thenConvertToInteger() {
- def stringNum = "123"
- int expectedInt = 123
+ def "givenString_whenUsingDecimalFormat_thenConvertToInteger"() {
+ given:
DecimalFormat decimalFormat = new DecimalFormat("#")
- int intNum = decimalFormat.parse(stringNum).intValue()
- assertEquals(intNum, expectedInt)
+ when:
+ int intNum = decimalFormat.parse(STRING_NUM).intValue()
+
+ then:
+ intNum == EXPECTED_INT
}
- @Test(expected = NumberFormatException.class)
- void givenInvalidString_whenUsingAs_thenThrowNumberFormatException() {
+ def "givenInvalidString_whenUsingAs_thenThrowNumberFormatException"() {
+ given:
def invalidString = "123a"
+
+ when:
invalidString as Integer
+
+ then:
+ thrown(NumberFormatException)
}
- @Test(expected = NullPointerException.class)
- void givenNullString_whenUsingToInteger_thenThrowNullPointerException() {
+ def "givenNullString_whenUsingToInteger_thenThrowNullPointerException"() {
+ given:
def invalidString = null
+
+ when:
invalidString.toInteger()
+
+ then:
+ thrown(NullPointerException)
}
- @Test
- void givenString_whenUsingIsInteger_thenCheckIfCorrectValue() {
+ def "givenString_whenUsingIsInteger_thenCheckIfCorrectValue"() {
+ given:
def invalidString = "123a"
def validString = "123"
+
+ when:
def invalidNum = invalidString?.isInteger() ? invalidString as Integer : false
def correctNum = validString?.isInteger() ? validString as Integer : false
- assertEquals(false, invalidNum)
- assertEquals(123, correctNum)
+ then:
+ !invalidNum
+ correctNum == 123
}
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/CharacterInGroovy.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/CharacterInGroovy.groovy
index c043723d95..30365ec9d7 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/CharacterInGroovy.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/CharacterInGroovy.groovy
@@ -1,19 +1,18 @@
package groovy.com.baeldung.stringtypes
-import org.junit.Assert
-import org.junit.Test
+import spock.lang.Specification
-class CharacterInGroovy {
+class CharacterInGroovy extends Specification {
- @Test
- void 'character'() {
+ def 'character'() {
+ given:
char a = 'A' as char
char b = 'B' as char
char c = (char) 'C'
- Assert.assertTrue(a instanceof Character)
- Assert.assertTrue(b instanceof Character)
- Assert.assertTrue(c instanceof Character)
+ expect:
+ a instanceof Character
+ b instanceof Character
+ c instanceof Character
}
-
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/DoubleQuotedString.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/DoubleQuotedString.groovy
index a730244d0a..e1074145f4 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/DoubleQuotedString.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/DoubleQuotedString.groovy
@@ -1,67 +1,76 @@
package groovy.com.baeldung.stringtypes
-import org.junit.Assert
-import org.junit.Test
+import spock.lang.Specification
-class DoubleQuotedString {
+class DoubleQuotedString extends Specification {
- @Test
- void 'escape double quoted string'() {
+ def 'escape double quoted string'() {
+ given:
def example = "Hello \"world\"!"
- println(example)
+ expect:
+ example == 'Hello "world"!'
}
- @Test
- void 'String ang GString'() {
+ def 'String ang GString'() {
+ given:
def string = "example"
def stringWithExpression = "example${2}"
- Assert.assertTrue(string instanceof String)
- Assert.assertTrue(stringWithExpression instanceof GString)
- Assert.assertTrue(stringWithExpression.toString() instanceof String)
+ expect:
+ string instanceof String
+ stringWithExpression instanceof GString
+ stringWithExpression.toString() instanceof String
}
- @Test
- void 'placeholder with variable'() {
+ def 'placeholder with variable'() {
+ given:
def name = "John"
+
+ when:
def helloName = "Hello $name!".toString()
- Assert.assertEquals("Hello John!", helloName)
+ then:
+ helloName == "Hello John!"
}
- @Test
- void 'placeholder with expression'() {
+ def 'placeholder with expression'() {
+ given:
def result = "result is ${2 * 2}".toString()
- Assert.assertEquals("result is 4", result)
+ expect:
+ result == "result is 4"
}
- @Test
- void 'placeholder with dotted access'() {
+ def 'placeholder with dotted access'() {
+ given:
def person = [name: 'John']
+ when:
def myNameIs = "I'm $person.name, and you?".toString()
- Assert.assertEquals("I'm John, and you?", myNameIs)
+ then:
+ myNameIs == "I'm John, and you?"
}
- @Test
- void 'placeholder with method call'() {
+ def 'placeholder with method call'() {
+ given:
def name = 'John'
+ when:
def result = "Uppercase name: ${name.toUpperCase()}".toString()
- Assert.assertEquals("Uppercase name: JOHN", result)
+ then:
+ result == "Uppercase name: JOHN"
}
- @Test
- void 'GString and String hashcode'() {
+ def 'GString and String hashcode'() {
+ given:
def string = "2+2 is 4"
def gstring = "2+2 is ${4}"
- Assert.assertTrue(string.hashCode() != gstring.hashCode())
+ expect:
+ string.hashCode() != gstring.hashCode()
}
-
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/SingleQuotedString.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/SingleQuotedString.groovy
index 569991b788..924515570c 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/SingleQuotedString.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/SingleQuotedString.groovy
@@ -1,15 +1,14 @@
package groovy.com.baeldung.stringtypes
-import org.junit.Assert
-import org.junit.Test
+import spock.lang.Specification
-class SingleQuotedString {
+class SingleQuotedString extends Specification {
- @Test
- void 'single quoted string'() {
- def example = 'Hello world'
+ def 'single quoted string'() {
+ given:
+ def example = 'Hello world!'
- Assert.assertEquals('Hello world!', 'Hello' + ' world!')
+ expect:
+ example == 'Hello' + ' world!'
}
-
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/Strings.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/Strings.groovy
index e45f352285..9d29210d81 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/Strings.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/stringtypes/Strings.groovy
@@ -1,26 +1,29 @@
package groovy.com.baeldung.stringtypes
-import org.junit.Assert
-import org.junit.Test
+import spock.lang.Specification
-class Strings {
+class Strings extends Specification {
- @Test
- void 'string interpolation '() {
+ def 'string interpolation '() {
+ given:
def name = "Kacper"
+ when:
def result = "Hello ${name}!"
- Assert.assertEquals("Hello Kacper!", result.toString())
+ then:
+ result.toString() == "Hello Kacper!"
}
- @Test
- void 'string concatenation'() {
+ def 'string concatenation'() {
+ given:
def first = "first"
def second = "second"
+ when:
def concatenation = first + second
- Assert.assertEquals("firstsecond", concatenation)
+ then:
+ concatenation == "firstsecond"
}
}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/traits/TraitsUnitTest.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/traits/TraitsUnitTest.groovy
index 85130e8f07..b47cba6437 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/traits/TraitsUnitTest.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/traits/TraitsUnitTest.groovy
@@ -7,108 +7,111 @@ class TraitsUnitTest extends Specification {
Employee employee
Dog dog
- void setup () {
+ void setup() {
employee = new Employee()
dog = new Dog()
}
- def 'Should return msg string when using Employee.sayHello method provided by UserTrait' () {
+ def 'Should return msg string when using Employee.sayHello method provided by UserTrait'() {
when:
- def msg = employee.sayHello()
+ def msg = employee.sayHello()
+
then:
- msg
- msg instanceof String
- assert msg == "Hello!"
+ msg
+ msg instanceof String
+ msg == "Hello!"
}
-
- def 'Should return displayMsg string when using Employee.showName method' () {
+
+ def 'Should return displayMsg string when using Employee.showName method'() {
when:
- def displayMsg = employee.showName()
+ def displayMsg = employee.showName()
+
then:
- displayMsg
- displayMsg instanceof String
- assert displayMsg == "Hello, Bob!"
+ displayMsg
+ displayMsg instanceof String
+ displayMsg == "Hello, Bob!"
}
-
- def 'Should return greetMsg string when using Employee.greet method' () {
+
+ def 'Should return greetMsg string when using Employee.greet method'() {
when:
- def greetMsg = employee.greet()
+ def greetMsg = employee.greet()
+
then:
- greetMsg
- greetMsg instanceof String
- assert greetMsg == "Hello, from a private method!"
+ greetMsg
+ greetMsg instanceof String
+ greetMsg == "Hello, from a private method!"
}
-
- def 'Should return MissingMethodException when using Employee.greetingMessage method' () {
+
+ def 'Should return MissingMethodException when using Employee.greetingMessage method'() {
when:
- def exception
- try {
- employee.greetingMessage()
- }catch(Exception e) {
- exception = e
- }
-
+ employee.greetingMessage()
+
then:
- exception
- exception instanceof groovy.lang.MissingMethodException
- assert exception.message == "No signature of method: com.baeldung.traits.Employee.greetingMessage()"+
- " is applicable for argument types: () values: []"
+ thrown(MissingMethodException)
+ specificationContext.thrownException.message ==
+ "No signature of method: com.baeldung.traits.Employee.greetingMessage() is applicable for argument types: () values: []"
}
-
- def 'Should return employee instance when using Employee.whoAmI method' () {
+
+ def 'Should return employee instance when using Employee.whoAmI method'() {
when:
- def emp = employee.self()
+ def emp = employee.self()
+
then:
- emp
- emp instanceof Employee
- assert emp.is(employee)
+ emp
+ emp instanceof Employee
+ emp.is(employee)
}
-
- def 'Should display lastName when using Employee.showLastName method' () {
+
+ def 'Should display lastName when using Employee.showLastName method'() {
when:
- def lastNameMsg = employee.showLastName()
+ def lastNameMsg = employee.showLastName()
+
then:
- lastNameMsg
- lastNameMsg instanceof String
- assert lastNameMsg == "Hello, Marley!"
+ lastNameMsg
+ lastNameMsg instanceof String
+ lastNameMsg == "Hello, Marley!"
}
-
- def 'Should be able to define properties of UserTrait in Employee instance' () {
+
+ def 'Should be able to define properties of UserTrait in Employee instance'() {
when:
- employee = new Employee(email: "a@e.com", address: "baeldung.com")
+ employee = new Employee(email: "a@e.com", address: "baeldung.com")
+
then:
- employee
- employee instanceof Employee
- assert employee.email == "a@e.com"
- assert employee.address == "baeldung.com"
+ employee
+ employee instanceof Employee
+ employee.email == "a@e.com"
+ employee.address == "baeldung.com"
}
-
- def 'Should execute basicAbility method from SpeakingTrait and return msg string' () {
+
+ def 'Should execute basicAbility method from SpeakingTrait and return msg string'() {
when:
- def speakMsg = dog.basicAbility()
+ def speakMsg = dog.basicAbility()
+
then:
- speakMsg
- speakMsg instanceof String
- assert speakMsg == "Speaking!!"
+ speakMsg
+ speakMsg instanceof String
+ speakMsg == "Speaking!!"
}
-
- def 'Should verify multiple inheritance with traits and execute overridden traits method' () {
+
+ def 'Should verify multiple inheritance with traits and execute overridden traits method'() {
when:
- def walkSpeakMsg = dog.speakAndWalk()
- println walkSpeakMsg
+ def walkSpeakMsg = dog.speakAndWalk()
+ println walkSpeakMsg
+
then:
- walkSpeakMsg
- walkSpeakMsg instanceof String
- assert walkSpeakMsg == "Walk and speak!!"
+ walkSpeakMsg
+ walkSpeakMsg instanceof String
+ walkSpeakMsg == "Walk and speak!!"
}
-
- def 'Should implement AnimalTrait at runtime and access basicBehavior method' () {
+
+ def 'Should implement AnimalTrait at runtime and access basicBehavior method'() {
when:
- def dogInstance = new Dog() as AnimalTrait
- def basicBehaviorMsg = dogInstance.basicBehavior()
+ def dogInstance = new Dog() as AnimalTrait
+ def basicBehaviorMsg = dogInstance.basicBehavior()
+
then:
- basicBehaviorMsg
- basicBehaviorMsg instanceof String
- assert basicBehaviorMsg == "Animalistic!!"
+ basicBehaviorMsg
+ basicBehaviorMsg instanceof String
+ basicBehaviorMsg == "Animalistic!!"
}
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/pom.xml b/core-groovy-modules/pom.xml
index e1ff538942..6faa7f94c8 100644
--- a/core-groovy-modules/pom.xml
+++ b/core-groovy-modules/pom.xml
@@ -21,12 +21,12 @@
- 2.5.7
- 2.5.6
- 2.5.6
- 2.4.0
- 1.1-groovy-2.4
- 1.6
+ 3.0.15
+ 3.0.15
+ 3.0.15
+ 2.7.1
+ 2.3-groovy-3.0
+ 2.1.0
-
\ No newline at end of file
+
diff --git a/core-java-modules/core-java-10/pom.xml b/core-java-modules/core-java-10/pom.xml
index e2ac8db919..7eccb098a0 100644
--- a/core-java-modules/core-java-10/pom.xml
+++ b/core-java-modules/core-java-10/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-10
- 0.1.0-SNAPSHOT
core-java-10
jar
diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml
index 64a486b5c4..4647814048 100644
--- a/core-java-modules/core-java-11-2/pom.xml
+++ b/core-java-modules/core-java-11-2/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-11-2
- 0.1.0-SNAPSHOT
core-java-11-2
jar
diff --git a/core-java-modules/core-java-11-3/README.md b/core-java-modules/core-java-11-3/README.md
index f46ab02bca..4f5eb3ea56 100644
--- a/core-java-modules/core-java-11-3/README.md
+++ b/core-java-modules/core-java-11-3/README.md
@@ -4,3 +4,5 @@ This module contains articles about Java 11 core features
### Relevant articles
- [Adding Parameters to Java HttpClient Requests](https://www.baeldung.com/java-httpclient-request-parameters)
+- [Writing a List of Strings Into a Text File](https://www.baeldung.com/java-list-to-text-file)
+- [Java HttpClient – Map JSON Response to Java Class](https://www.baeldung.com/java-httpclient-map-json-response)
diff --git a/core-java-modules/core-java-11-3/pom.xml b/core-java-modules/core-java-11-3/pom.xml
index b4a4591b28..22db9e62ab 100644
--- a/core-java-modules/core-java-11-3/pom.xml
+++ b/core-java-modules/core-java-11-3/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-11-3
- 0.1.0-SNAPSHOT
core-java-11-3
jar
@@ -15,6 +14,20 @@
../../pom.xml
+
+
+ com.google.code.gson
+ gson
+ ${gson.version}
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}
+
+
+
@@ -32,6 +45,8 @@
11
11
+ 2.14.1
+ 2.10
\ No newline at end of file
diff --git a/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/BufferedWriterExample.java b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/BufferedWriterExample.java
new file mode 100644
index 0000000000..705f38d4ce
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/BufferedWriterExample.java
@@ -0,0 +1,19 @@
+package com.baeldung.filewriter;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
+public class BufferedWriterExample {
+
+ public static String generateFileFromStringList(List stringList) throws IOException {
+ final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+ BufferedWriter br = new BufferedWriter(new FileWriter(TEXT_FILENAME));
+ for (String str : stringList) {
+ br.write(str + System.lineSeparator());
+ }
+ br.close();
+ return TEXT_FILENAME;
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/FileWriteStringExample.java b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/FileWriteStringExample.java
new file mode 100644
index 0000000000..3c72a53001
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/FileWriteStringExample.java
@@ -0,0 +1,22 @@
+package com.baeldung.filewriter;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+
+public class FileWriteStringExample {
+ public static String generateFileFromStringList(List stringList) throws IOException {
+ final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+ Path filePath = Paths.get(TEXT_FILENAME);
+ Files.deleteIfExists(filePath);
+ Files.createFile(filePath);
+ for (String str : stringList) {
+ Files.writeString(filePath, str + System.lineSeparator(),
+ StandardOpenOption.APPEND);
+ }
+ return filePath.toString();
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/FileWriterExample.java b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/FileWriterExample.java
new file mode 100644
index 0000000000..fcc7305d59
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/filewriter/FileWriterExample.java
@@ -0,0 +1,18 @@
+package com.baeldung.filewriter;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
+public class FileWriterExample {
+
+ public static String generateFileFromStringList(List stringList) throws IOException {
+ final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+ FileWriter fileWriter = new FileWriter(TEXT_FILENAME);
+ for (String str : stringList) {
+ fileWriter.write(str + System.lineSeparator());
+ }
+ fileWriter.close();
+ return TEXT_FILENAME;
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/main/java/com/baeldung/httppojo/Todo.java b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/httppojo/Todo.java
new file mode 100644
index 0000000000..01a1ee5c52
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/httppojo/Todo.java
@@ -0,0 +1,73 @@
+package com.baeldung.httppojo;
+
+import java.util.Objects;
+
+public class Todo {
+
+ int userId;
+ int id;
+ String title;
+ boolean completed;
+
+ public Todo() {
+ }
+
+ public Todo(int userId, int id, String title, boolean completed) {
+ this.userId = userId;
+ this.id = id;
+ this.title = title;
+ this.completed = completed;
+ }
+
+ public int getUserId() {
+ return userId;
+ }
+
+ public void setUserId(int userId) {
+ this.userId = userId;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public boolean isCompleted() {
+ return completed;
+ }
+
+ public void setCompleted(boolean completed) {
+ this.completed = completed;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ Todo todo = (Todo) o;
+ return userId == todo.userId && id == todo.id && completed == todo.completed && Objects.equals(title, todo.title);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(userId, id, title, completed);
+ }
+
+ @Override
+ public String toString() {
+ return "{" + "userId=" + userId + ", id=" + id + ", title='" + title + '\'' + ", completed=" + completed + '}';
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/main/java/com/baeldung/httppojo/TodoAppClient.java b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/httppojo/TodoAppClient.java
new file mode 100644
index 0000000000..c2295d97ce
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/main/java/com/baeldung/httppojo/TodoAppClient.java
@@ -0,0 +1,107 @@
+package com.baeldung.httppojo;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.List;
+import java.util.concurrent.CompletionException;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
+public class TodoAppClient {
+
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ Gson gson = new GsonBuilder().create();
+
+ public String sampleApiRequest() throws Exception {
+ HttpClient client = HttpClient.newHttpClient();
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create("https://jsonplaceholder.typicode.com/todos"))
+ .build();
+
+ HttpResponse response = client.send(request, BodyHandlers.ofString());
+
+ return response.body();
+
+ }
+
+ public Todo syncGson() throws Exception {
+ String response = sampleApiRequest();
+
+ List todo = gson.fromJson(response, new TypeToken>() {
+ }.getType());
+
+ return todo.get(1);
+
+ }
+
+ public Todo syncJackson() throws Exception {
+ String response = sampleApiRequest();
+
+ Todo[] todo = objectMapper.readValue(response, Todo[].class);
+
+ return todo[1];
+
+ }
+
+ public Todo asyncJackson() throws Exception {
+
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create("https://jsonplaceholder.typicode.com/todos"))
+ .build();
+
+ TodoAppClient todoAppClient = new TodoAppClient();
+
+ List todo = HttpClient.newHttpClient()
+ .sendAsync(request, BodyHandlers.ofString())
+ .thenApply(HttpResponse::body)
+ .thenApply(todoAppClient::readValueJackson)
+ .get();
+
+ return todo.get(1);
+
+ }
+
+ public Todo asyncGson() throws Exception {
+
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create("https://jsonplaceholder.typicode.com/todos"))
+ .build();
+ TodoAppClient todoAppClient = new TodoAppClient();
+
+ List todo = HttpClient.newHttpClient()
+ .sendAsync(request, BodyHandlers.ofString())
+ .thenApply(HttpResponse::body)
+ .thenApply(todoAppClient::readValueGson)
+ .get();
+
+ return todo.get(1);
+
+ }
+
+ List readValueJackson(String content) {
+
+ try {
+ return objectMapper.readValue(content, new TypeReference>() {
+ });
+ } catch (IOException ioe) {
+ throw new CompletionException(ioe);
+ }
+ }
+
+ List readValueGson(String content) {
+
+ return gson.fromJson(content, new TypeToken>() {
+ }.getType());
+
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/BufferedWriterUnitTest.java b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/BufferedWriterUnitTest.java
new file mode 100644
index 0000000000..8c45ac07b3
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/BufferedWriterUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.filewriter;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+public class BufferedWriterUnitTest {
+
+ private static final List stringList = Arrays.asList("Hello", "World");
+
+ @Test
+ public void givenUsingBufferedWriter_whenStringList_thenGetTextFile() throws IOException {
+ String fileName = BufferedWriterExample.generateFileFromStringList(stringList);
+ long count = Files.lines(Paths.get(fileName)).count();
+ assertTrue("No. of lines in file should be equal to no. of Strings in List", ((int) count) == stringList.size());
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/FileWriteStringUnitTest.java b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/FileWriteStringUnitTest.java
new file mode 100644
index 0000000000..fbae98e701
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/FileWriteStringUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.filewriter;
+
+import org.junit.jupiter.api.Test;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+
+public class FileWriteStringUnitTest {
+
+ private static final List stringList = Arrays.asList("Hello", "World");
+
+ @Test
+ public void givenUsingFileWriteString_whenStringList_thenGetTextFile() throws IOException {
+ String fileName = FileWriteStringExample.generateFileFromStringList(stringList);
+ long count = Files.lines(Paths.get(fileName)).count();
+ assertTrue("No. of lines in file should be equal to no. of Strings in List", ((int) count) == stringList.size());
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/FileWriterUnitTest.java b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/FileWriterUnitTest.java
new file mode 100644
index 0000000000..f5dd3d1a70
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/filewriter/FileWriterUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.filewriter;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+public class FileWriterUnitTest {
+
+ private static final List stringList = Arrays.asList("Hello", "World");
+
+ @Test
+ public void givenUsingFileWriter_whenStringList_thenGetTextFile() throws IOException {
+ String fileName = FileWriterExample.generateFileFromStringList(stringList);
+ long count = Files.lines(Paths.get(fileName)).count();
+ assertTrue("No. of lines in file should be equal to no. of Strings in List", ((int) count) == stringList.size());
+ }
+}
diff --git a/core-java-modules/core-java-11-3/src/test/java/com/baeldung/httppojo/HttpClientPojoClassUnitTest.java b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/httppojo/HttpClientPojoClassUnitTest.java
new file mode 100644
index 0000000000..a364a8d27e
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/test/java/com/baeldung/httppojo/HttpClientPojoClassUnitTest.java
@@ -0,0 +1,45 @@
+package com.baeldung.httppojo;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class HttpClientPojoClassUnitTest {
+
+ Todo expectedTodo = new Todo(1, 2, "quis ut nam facilis et officia qui", false);
+
+ @Test
+ public void givenSampleApiCall_whenResponseIsMappedByGson_thenCompareResponseMappedByGson() throws Exception {
+ TodoAppClient sampleGson = new TodoAppClient();
+
+ assertEquals(expectedTodo, sampleGson.syncGson());
+
+ }
+
+ @Test
+ public void givenSampleApiCall_whenResponseIsMappedByJackson_thenCompareResponseMappedByJackson() throws Exception {
+ TodoAppClient sampleJackson = new TodoAppClient();
+
+ assertEquals(expectedTodo, sampleJackson.syncJackson());
+ }
+
+ @Test
+ public void givenSampleRestApi_whenApiIsConsumedByHttpClient_thenCompareJsonString() throws Exception {
+ TodoAppClient sampleTest = new TodoAppClient();
+ assertNotNull(sampleTest.sampleApiRequest());
+
+ }
+
+ @Test
+ public void givenSampleApiAsyncCall_whenResponseIsMappedByJackson_thenCompareResponseMappedByJackson() throws Exception {
+ TodoAppClient sampleAsynJackson = new TodoAppClient();
+ assertEquals(expectedTodo, sampleAsynJackson.asyncJackson());
+ }
+
+ @Test
+ public void givenSampleApiAsyncCall_whenResponseIsMappedByGson_thenCompareResponseMappedByGson() throws Exception {
+ TodoAppClient sampleAsynGson = new TodoAppClient();
+ assertEquals(expectedTodo, sampleAsynGson.asyncGson());
+ }
+
+}
diff --git a/core-java-modules/core-java-11-3/src/test/resources/sampleTextFile.txt b/core-java-modules/core-java-11-3/src/test/resources/sampleTextFile.txt
new file mode 100644
index 0000000000..f9264f7fbd
--- /dev/null
+++ b/core-java-modules/core-java-11-3/src/test/resources/sampleTextFile.txt
@@ -0,0 +1,2 @@
+Hello
+World
diff --git a/core-java-modules/core-java-11/pom.xml b/core-java-modules/core-java-11/pom.xml
index 28a218c400..d0c2c0acaa 100644
--- a/core-java-modules/core-java-11/pom.xml
+++ b/core-java-modules/core-java-11/pom.xml
@@ -4,10 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-11
- 0.1.0-SNAPSHOT
core-java-11
jar
- http://maven.apache.org
com.baeldung
diff --git a/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md b/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md
index 6f8f95970e..8b13789179 100644
--- a/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md
+++ b/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md
@@ -1,3 +1 @@
-## Relevant articles:
-- [Negate a Predicate Method Reference with Java 11](https://www.baeldung.com/java-negate-predicate-method-reference)
diff --git a/core-java-modules/core-java-12/pom.xml b/core-java-modules/core-java-12/pom.xml
index 9f95b1bc3f..ba6dfc62bc 100644
--- a/core-java-modules/core-java-12/pom.xml
+++ b/core-java-modules/core-java-12/pom.xml
@@ -4,10 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-12
- 0.1.0-SNAPSHOT
core-java-12
jar
- http://maven.apache.org
com.baeldung
diff --git a/core-java-modules/core-java-13/pom.xml b/core-java-modules/core-java-13/pom.xml
index 9e42838971..11d6ee7007 100644
--- a/core-java-modules/core-java-13/pom.xml
+++ b/core-java-modules/core-java-13/pom.xml
@@ -3,12 +3,9 @@
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
core-java-13
- 0.1.0-SNAPSHOT
core-java-13
jar
- http://maven.apache.org
com.baeldung
diff --git a/core-java-modules/core-java-14/README.md b/core-java-modules/core-java-14/README.md
index 00fd2fa320..7260891f7a 100644
--- a/core-java-modules/core-java-14/README.md
+++ b/core-java-modules/core-java-14/README.md
@@ -12,3 +12,5 @@ This module contains articles about Java 14.
- [Java 14 Record Keyword](https://www.baeldung.com/java-record-keyword)
- [New Features in Java 14](https://www.baeldung.com/java-14-new-features)
- [Java 14 Record vs. Lombok](https://www.baeldung.com/java-record-vs-lombok)
+- [Record vs. Final Class in Java](https://www.baeldung.com/java-record-vs-final-class)
+- [Custom Constructor in Java Records](https://www.baeldung.com/java-records-custom-constructor)
diff --git a/core-java-modules/core-java-14/pom.xml b/core-java-modules/core-java-14/pom.xml
index f78edd622a..9f48c0b8b2 100644
--- a/core-java-modules/core-java-14/pom.xml
+++ b/core-java-modules/core-java-14/pom.xml
@@ -6,7 +6,6 @@
core-java-14
core-java-14
jar
- http://maven.apache.org
com.baeldung
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentClassic.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentClassic.java
new file mode 100644
index 0000000000..cfaa3e1cd4
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentClassic.java
@@ -0,0 +1,61 @@
+package org.example;
+
+import java.util.Objects;
+
+public class StudentClassic {
+ private String name;
+ private int rollNo;
+ private int marks;
+
+ public StudentClassic(String name, int rollNo, int marks) {
+ this.name = name;
+ this.rollNo = rollNo;
+ this.marks = marks;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getRollNo() {
+ return rollNo;
+ }
+
+ public int getMarks() {
+ return marks;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setRollNo(int rollNo) {
+ this.rollNo = rollNo;
+ }
+
+ public void setMarks(int marks) {
+ this.marks = marks;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ StudentClassic that = (StudentClassic) o;
+ return rollNo == that.rollNo && marks == that.marks && Objects.equals(name, that.name);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name, rollNo, marks);
+ }
+
+ @Override
+ public String toString() {
+ return "StudentClassic{" +
+ "name='" + name + '\'' +
+ ", rollNo=" + rollNo +
+ ", marks=" + marks +
+ '}';
+ }
+}
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecord.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecord.java
new file mode 100644
index 0000000000..84633c5c5e
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecord.java
@@ -0,0 +1,19 @@
+package org.example;
+
+import java.util.Comparator;
+import java.util.List;
+
+public record StudentRecord(String name, int rollNo, int marks) {
+ public StudentRecord(String name){
+ this(name, 0,0);
+ }
+ public StudentRecord {
+ if (marks < 0 || marks > 100) {
+ throw new IllegalArgumentException("Marks should be between 0 and 100.");
+ }
+ if (name == null) {
+ throw new IllegalArgumentException("Name cannot be null");
+ }
+ }
+}
+
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV2.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV2.java
new file mode 100644
index 0000000000..07b2193fcc
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV2.java
@@ -0,0 +1,22 @@
+package org.example;
+
+record StudentRecordV2(String name, int rollNo, int marks, char grade) {
+ public StudentRecordV2(String name, int rollNo, int marks) {
+ this(name, rollNo, marks, calculateGrade(marks));
+ }
+
+ private static char calculateGrade(int marks) {
+ if (marks >= 90) {
+ return 'A';
+ } else if (marks >= 80) {
+ return 'B';
+ } else if (marks >= 70) {
+ return 'C';
+ } else if (marks >= 60) {
+ return 'D';
+ } else {
+ return 'F';
+ }
+ }
+}
+
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV3.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV3.java
new file mode 100644
index 0000000000..b1035d5b10
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV3.java
@@ -0,0 +1,11 @@
+package org.example;
+
+import java.util.UUID;
+
+record StudentRecordV3(String name, int rollNo, int marks, String id) {
+
+ public StudentRecordV3(String name, int rollNo, int marks) {
+ this(name, rollNo, marks, UUID.randomUUID().toString());
+ }
+}
+
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordvsfinal/USCitizen.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordvsfinal/USCitizen.java
new file mode 100644
index 0000000000..9ff3676ae7
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordvsfinal/USCitizen.java
@@ -0,0 +1,18 @@
+package com.baeldung.java14.recordvsfinal;
+
+public record USCitizen(String firstName, String lastName, String address) {
+ static int countryCode;
+
+ // static initializer
+ static {
+ countryCode = 1;
+ }
+
+ public static int getCountryCode() {
+ return countryCode;
+ }
+
+ public String getFullName() {
+ return firstName + " " + lastName;
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordJUnitTest.java b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordJUnitTest.java
new file mode 100644
index 0000000000..3d932541ba
--- /dev/null
+++ b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordJUnitTest.java
@@ -0,0 +1,37 @@
+import org.example.StudentRecord;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public class StudentRecordJUnitTest {
+
+ @Test
+ public void givenStudentRecordData_whenCreated_thenStudentPropertiesMatch() {
+ StudentRecord s1 = new StudentRecord("John", 1, 90);
+ StudentRecord s2 = new StudentRecord("Jane", 2, 80);
+ assertEquals("John", s1.name());
+ assertEquals(1, s1.rollNo());
+ assertEquals(90, s1.marks());
+ assertEquals("Jane", s2.name());
+ assertEquals(2, s2.rollNo());
+ assertEquals(80, s2.marks());
+ }
+ @Test
+ public void givenStudentRecordsList_whenSortingDataWithName_thenStudentsSorted(){
+ List studentRecords = List.of(
+ new StudentRecord("Dana", 1, 85),
+ new StudentRecord("Jim", 2, 90),
+ new StudentRecord("Jane", 3, 80)
+ );
+
+ List mutableStudentRecords = new ArrayList<>(studentRecords);
+ mutableStudentRecords.sort(Comparator.comparing(StudentRecord::name));
+
+ List sortedStudentRecords = List.copyOf(mutableStudentRecords);
+ assertEquals("Jane", sortedStudentRecords.get(1).name());
+ }
+}
diff --git a/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordvsfinal/USCitizenUnitTest.java b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordvsfinal/USCitizenUnitTest.java
new file mode 100644
index 0000000000..bb4c16b500
--- /dev/null
+++ b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordvsfinal/USCitizenUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.java14.recordvsfinal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class USCitizenUnitTest {
+
+ @Test
+ public void givenName_whenGetNameAndCode_thenExpectedValuesReturned() {
+
+ String firstName = "Joan";
+ String lastName = "Winn";
+ String address = "1892 Black Stallion Road";
+ int countryCode = 1;
+
+ USCitizen citizen = new USCitizen(firstName, lastName, address);
+
+ assertEquals(firstName + " " + lastName, citizen.getFullName());
+ assertEquals(countryCode, USCitizen.getCountryCode());
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-15/pom.xml b/core-java-modules/core-java-15/pom.xml
index a4923054ac..059e2cc8f3 100644
--- a/core-java-modules/core-java-15/pom.xml
+++ b/core-java-modules/core-java-15/pom.xml
@@ -6,7 +6,6 @@
core-java-15
core-java-15
jar
- http://maven.apache.org
com.baeldung
diff --git a/core-java-modules/core-java-16/pom.xml b/core-java-modules/core-java-16/pom.xml
index 4adc3ee6d1..f8d287880a 100644
--- a/core-java-modules/core-java-16/pom.xml
+++ b/core-java-modules/core-java-16/pom.xml
@@ -4,10 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-16
- 0.1.0-SNAPSHOT
core-java-16
jar
- http://maven.apache.org
com.baeldung
@@ -63,4 +61,4 @@
3.0.0-M5
-
\ No newline at end of file
+
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/enumallt/DinosaurEnum.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/enumallt/DinosaurEnum.java
new file mode 100644
index 0000000000..a50f79947c
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/enumallt/DinosaurEnum.java
@@ -0,0 +1,19 @@
+package com.baeldung.instanceofalternative.enumallt;
+
+public enum DinosaurEnum {
+ Anatotitan {
+ @Override
+ public String move() {
+ return "running";
+ }
+ },
+ Euraptor {
+ @Override
+ public String move() {
+ return "flying";
+ }
+ };
+
+ public abstract String move();
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Anatotitan.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Anatotitan.java
new file mode 100644
index 0000000000..ce59b58ad7
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Anatotitan.java
@@ -0,0 +1,15 @@
+package com.baeldung.instanceofalternative.model;
+
+public class Anatotitan extends Dinosaur {
+ // polymorphism
+ @Override
+ public String move() {
+ return "running";
+ }
+
+ // non-polymorphism
+ public String run() {
+ return "running";
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Dinosaur.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Dinosaur.java
new file mode 100644
index 0000000000..38055054f5
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Dinosaur.java
@@ -0,0 +1,9 @@
+package com.baeldung.instanceofalternative.model;
+
+public class Dinosaur {
+
+ public String move() {
+ return "default movement";
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Euraptor.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Euraptor.java
new file mode 100644
index 0000000000..1de5257a0d
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/model/Euraptor.java
@@ -0,0 +1,15 @@
+package com.baeldung.instanceofalternative.model;
+
+public class Euraptor extends Dinosaur {
+ // polymorphism
+ @Override
+ public String move() {
+ return "flying";
+ }
+
+ // non-polymorphism
+ public String flies() {
+ return "flying";
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Anatotitan.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Anatotitan.java
new file mode 100644
index 0000000000..84d93e7350
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Anatotitan.java
@@ -0,0 +1,14 @@
+package com.baeldung.instanceofalternative.visitorspattern;
+
+public class Anatotitan implements Dino {
+
+ String run() {
+ return "running";
+ }
+
+ @Override
+ public String move(Visitor dinobehave) {
+ return dinobehave.visit(this);
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Dino.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Dino.java
new file mode 100644
index 0000000000..ef33baf2a4
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Dino.java
@@ -0,0 +1,7 @@
+package com.baeldung.instanceofalternative.visitorspattern;
+
+public interface Dino {
+
+ String move(Visitor dinoMove);
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/DinoVisitorImpl.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/DinoVisitorImpl.java
new file mode 100644
index 0000000000..6fd71374fa
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/DinoVisitorImpl.java
@@ -0,0 +1,15 @@
+package com.baeldung.instanceofalternative.visitorspattern;
+
+public class DinoVisitorImpl implements Visitor {
+
+ @Override
+ public String visit(Anatotitan anatotitan) {
+ return anatotitan.run();
+ }
+
+ @Override
+ public String visit(Euraptor euraptor) {
+ return euraptor.flies();
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Euraptor.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Euraptor.java
new file mode 100644
index 0000000000..fdce1e6c0b
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Euraptor.java
@@ -0,0 +1,14 @@
+package com.baeldung.instanceofalternative.visitorspattern;
+
+public class Euraptor implements Dino {
+
+ String flies() {
+ return "flying";
+ }
+
+ @Override
+ public String move(Visitor dinobehave) {
+ return dinobehave.visit(this);
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Visitor.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Visitor.java
new file mode 100644
index 0000000000..75fada3533
--- /dev/null
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceof_alternatives/visitorspattern/Visitor.java
@@ -0,0 +1,9 @@
+package com.baeldung.instanceofalternative.visitorspattern;
+
+public interface Visitor {
+
+ String visit(Anatotitan anatotitan);
+
+ String visit(Euraptor euraptor);
+
+}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/EnumUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/EnumUnitTest.java
new file mode 100644
index 0000000000..73faa2a1ef
--- /dev/null
+++ b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/EnumUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.instanceoftest;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.baeldung.instanceofalternative.enumallt.*;
+
+public class EnumUnitTest {
+ @Test
+ public void givenADinosaurSpecie_whenUsingEnum_thenGetMovementOfEuraptor() {
+
+ assertEquals("flying", moveDinosaurUsingEnum(DinosaurEnum.Euraptor));
+ }
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingEnum_thenGetMovementOfAnatotitan() {
+ assertEquals("running", moveDinosaurUsingEnum(DinosaurEnum.Anatotitan));
+ }
+
+ public static String moveDinosaurUsingEnum(DinosaurEnum dinosaurenum) {
+ return dinosaurenum.move();
+
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/ExampleSetupUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/ExampleSetupUnitTest.java
new file mode 100644
index 0000000000..c42f77849b
--- /dev/null
+++ b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/ExampleSetupUnitTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.instanceoftest;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.baeldung.instanceofalternative.model.*;
+
+public class ExampleSetupUnitTest {
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingInstancof_thenGetMovementOfAnatotitan() {
+
+ assertEquals("running", moveDinosaurUsingInstanceof(new Anatotitan()));
+ }
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingInstanceof_thenGetMovementOfEuraptor() {
+ assertEquals("flying", moveDinosaurUsingInstanceof(new Euraptor()));
+ }
+
+ public static String moveDinosaurUsingInstanceof(Dinosaur dinosaur) {
+
+ if (dinosaur instanceof Anatotitan) {
+
+ Anatotitan anatotitan = (Anatotitan) dinosaur;
+ return anatotitan.run();
+ } else if (dinosaur instanceof Euraptor) {
+ Euraptor euraptor = (Euraptor) dinosaur;
+ return euraptor.flies();
+ }
+ return "";
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/GetClassUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/GetClassUnitTest.java
new file mode 100644
index 0000000000..6a4886c8a3
--- /dev/null
+++ b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/GetClassUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.instanceoftest;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import com.baeldung.instanceofalternative.model.*;
+
+public class GetClassUnitTest {
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingGetClass_thenGetMovementOfAnatotitan() {
+
+ assertEquals("running", moveDinosaurUsingGetClass(new Anatotitan()));
+ }
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingGetClass_thenGetMovementOfEuraptor() {
+ assertEquals("flying", moveDinosaurUsingGetClass(new Euraptor()));
+ }
+
+ public static String moveDinosaurUsingGetClass(Dinosaur dinosaur) {
+
+ if (dinosaur.getClass()
+ .equals(Anatotitan.class)) {
+
+ Anatotitan anatotitan = (Anatotitan) dinosaur;
+ return anatotitan.run();
+ } else if (dinosaur.getClass()
+ .equals(Euraptor.class)) {
+ Euraptor euraptor = (Euraptor) dinosaur;
+ return euraptor.flies();
+ }
+ return "";
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/PolymorphismUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/PolymorphismUnitTest.java
new file mode 100644
index 0000000000..960ed34c82
--- /dev/null
+++ b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/PolymorphismUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.instanceoftest;
+
+import static org.junit.Assert.*;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.baeldung.instanceofalternative.model.*;
+
+public class PolymorphismUnitTest {
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingPolymorphism_thenGetMovementOfAnatotitan() {
+
+ assertEquals("running", moveDinosaurUsingPolymorphism(new Anatotitan()));
+ }
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingPolymorphism_thenGetMovementOfEuraptor() {
+ assertEquals("flying", moveDinosaurUsingPolymorphism(new Euraptor()));
+ }
+
+ public static String moveDinosaurUsingPolymorphism(Dinosaur dinosaur) {
+ return dinosaur.move();
+ }
+
+}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/VisitorsPatternUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/VisitorsPatternUnitTest.java
new file mode 100644
index 0000000000..287f7df798
--- /dev/null
+++ b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceof_alternative_test/VisitorsPatternUnitTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.instanceoftest;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.baeldung.instanceofalternative.visitorspattern.*;
+
+public class VisitorsPatternUnitTest {
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingVisitorPattern_thenGetMovementOfAnatotitan() {
+
+ assertEquals("running", moveDinosaurUsingVisitorPattern((Dino) new Anatotitan()));
+ }
+
+ @Test
+ public void givenADinosaurSpecie_whenUsingVisitorPattern_thenGetMovementOfEuraptor() {
+
+ assertEquals("flying", moveDinosaurUsingVisitorPattern((Dino) new Euraptor()));
+ }
+
+ public static String moveDinosaurUsingVisitorPattern(Dino dinosaur) {
+ Visitor visitor = new DinoVisitorImpl();
+
+ return dinosaur.move(visitor);
+ }
+
+}
diff --git a/core-java-modules/core-java-17/README.md b/core-java-modules/core-java-17/README.md
index 9f39b0289f..1af860b7c4 100644
--- a/core-java-modules/core-java-17/README.md
+++ b/core-java-modules/core-java-17/README.md
@@ -6,3 +6,4 @@
- [New Features in Java 17](https://www.baeldung.com/java-17-new-features)
- [Random Number Generators in Java 17](https://www.baeldung.com/java-17-random-number-generators)
- [Sealed Classes and Interfaces in Java](https://www.baeldung.com/java-sealed-classes-interfaces)
+- [Migrate From Java 8 to Java 17](https://www.baeldung.com/java-migrate-8-to-17)
diff --git a/core-java-modules/core-java-17/pom.xml b/core-java-modules/core-java-17/pom.xml
index bc949d9050..e2d854be44 100644
--- a/core-java-modules/core-java-17/pom.xml
+++ b/core-java-modules/core-java-17/pom.xml
@@ -4,10 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-17
- 0.1.0-SNAPSHOT
core-java-17
jar
- http://maven.apache.org
com.baeldung
diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Address.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Address.java
new file mode 100644
index 0000000000..b654ffe2c5
--- /dev/null
+++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Address.java
@@ -0,0 +1,40 @@
+package com.baeldung.java8to17;
+
+public class Address {
+
+ private String street;
+ private String city;
+ private String pin;
+
+ public Address(String street, String city, String pin) {
+ super();
+ this.street = street;
+ this.city = city;
+ this.pin = pin;
+ }
+
+ public String getStreet() {
+ return street;
+ }
+
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getPin() {
+ return pin;
+ }
+
+ public void setPin(String pin) {
+ this.pin = pin;
+ }
+
+}
diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Circle.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Circle.java
new file mode 100644
index 0000000000..1e346653cf
--- /dev/null
+++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Circle.java
@@ -0,0 +1,4 @@
+package com.baeldung.java8to17;
+
+public record Circle(double radius) implements Shape {
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Person.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Person.java
new file mode 100644
index 0000000000..a6c9f50fc8
--- /dev/null
+++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Person.java
@@ -0,0 +1,30 @@
+package com.baeldung.java8to17;
+
+public class Person {
+
+ private String name;
+ private Address address;
+
+ public Person(String name, Address address) {
+ super();
+ this.name = name;
+ this.address = address;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Address getAddress() {
+ return address;
+ }
+
+ public void setAddress(Address address) {
+ this.address = address;
+ }
+
+}
diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Rectangle.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Rectangle.java
new file mode 100644
index 0000000000..79d2f0358b
--- /dev/null
+++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Rectangle.java
@@ -0,0 +1,4 @@
+package com.baeldung.java8to17;
+
+public record Rectangle(double length, double width) implements Shape {
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Shape.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Shape.java
new file mode 100644
index 0000000000..60b5193468
--- /dev/null
+++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Shape.java
@@ -0,0 +1,5 @@
+package com.baeldung.java8to17;
+
+public interface Shape {
+
+}
diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Student.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Student.java
new file mode 100644
index 0000000000..056bc4b7d5
--- /dev/null
+++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/java8to17/Student.java
@@ -0,0 +1,5 @@
+package com.baeldung.java8to17;
+
+public record Student(int rollNo, String name) {
+
+}
diff --git a/core-java-modules/core-java-17/src/test/java/com/baeldung/java17/Java8to17ExampleUnitTest.java b/core-java-modules/core-java-17/src/test/java/com/baeldung/java17/Java8to17ExampleUnitTest.java
new file mode 100644
index 0000000000..950fc70988
--- /dev/null
+++ b/core-java-modules/core-java-17/src/test/java/com/baeldung/java17/Java8to17ExampleUnitTest.java
@@ -0,0 +1,87 @@
+package com.baeldung.java17;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.java8to17.Address;
+import com.baeldung.java8to17.Circle;
+import com.baeldung.java8to17.Person;
+import com.baeldung.java8to17.Rectangle;
+import com.baeldung.java8to17.Student;
+
+public class Java8to17ExampleUnitTest {
+
+ @Test
+ void givenMultiLineText_whenUsingTextBlock_thenStringIsReturned() {
+ String value = """
+ This is a
+ Multi-line
+ Text
+ """;
+
+ assertThat(value).isEqualTo("This is a\nMulti-line\nText\n");
+ }
+
+ @Test
+ void givenString_whenUsingUtilFunctions_thenReturnsExpectedResult() {
+ assertThat(" ".isBlank());
+ assertThat("Twinkle ".repeat(2)).isEqualTo("Twinkle Twinkle ");
+ assertThat("Format Line".indent(4)).isEqualTo(" Format Line\n");
+ assertThat("Line 1 \n Line2".lines()).asList().size().isEqualTo(2);
+ assertThat(" Text with white spaces ".strip()).isEqualTo("Text with white spaces");
+ assertThat("Car, Bus, Train".transform(s1 -> Arrays.asList(s1.split(","))).get(0)).isEqualTo("Car");
+ }
+
+ @Test
+ void givenDataModel_whenUsingRecordType_thenBehavesLikeDTO() {
+ Student student = new Student(10, "Priya");
+ Student student2 = new Student(10, "Priya");
+
+ assertThat(student.rollNo()).isEqualTo(10);
+ assertThat(student.name()).isEqualTo("Priya");
+ assertThat(student.equals(student2));
+ assertThat(student.hashCode()).isEqualTo(student2.hashCode());
+ }
+
+ @Test
+ void givenObject_whenThrowingNPE_thenReturnsHelpfulMessage() {
+ Person student = new Person("Lakshmi", new Address("35, West Street", null, null));
+
+ Exception exception = assertThrows(NullPointerException.class, () -> {
+ student.getAddress().getCity().toLowerCase();
+ });
+
+ assertThat(exception.getMessage()).isEqualTo(
+ "Cannot invoke \"String.toLowerCase()\" because the return value of \"com.baeldung.java8to17.Address.getCity()\" is null");
+ }
+
+ @Test
+ void givenGenericObject_whenUsingPatternMatching_thenReturnsTargetType() {
+ String city = null;
+ Object obj = new Address("35, West Street", "Chennai", "6000041");
+
+ if (obj instanceof Address address) {
+ city = address.getCity();
+ }
+
+ assertThat(city).isEqualTo("Chennai");
+ }
+
+ @Test
+ void givenGenericObject_whenUsingSwitchExpression_thenPatternMatchesRightObject() {
+ Object shape = new Rectangle(10, 20);
+
+ double circumference = switch (shape) {
+ case Rectangle r -> 2 * r.length() + 2 * r.width();
+ case Circle c -> 2 * c.radius() * Math.PI;
+ default -> throw new IllegalArgumentException("Unknown shape");
+ };
+
+ assertThat(circumference).isEqualTo(60);
+ }
+
+}
diff --git a/core-java-modules/core-java-19/README.md b/core-java-modules/core-java-19/README.md
new file mode 100644
index 0000000000..68244d9f91
--- /dev/null
+++ b/core-java-modules/core-java-19/README.md
@@ -0,0 +1,4 @@
+## Relevant Articles
+- [Record Patterns in Java 19](https://www.baeldung.com/java-19-record-patterns)
+- [Structured Concurrency in Java 19](https://www.baeldung.com/java-structured-concurrency)
+- [Possible Root Causes for High CPU Usage in Java](https://www.baeldung.com/java-high-cpu-usage-causes)
diff --git a/core-java-modules/core-java-19/pom.xml b/core-java-modules/core-java-19/pom.xml
new file mode 100644
index 0000000000..930b37391c
--- /dev/null
+++ b/core-java-modules/core-java-19/pom.xml
@@ -0,0 +1,35 @@
+
+
+ 4.0.0
+ core-java-19
+ core-java-19
+
+
+ com.baeldung.core-java-modules
+ core-java-modules
+ 0.0.1-SNAPSHOT
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 19
+ 19
+ --enable-preview
+
+
+
+
+
+
+ 19
+ 19
+ UTF-8
+
+
+
\ No newline at end of file
diff --git a/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/GPSPoint.java b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/GPSPoint.java
new file mode 100644
index 0000000000..961575c88d
--- /dev/null
+++ b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/GPSPoint.java
@@ -0,0 +1,3 @@
+package com.baeldung.features.records;
+
+public record GPSPoint (double lat, double lng) { }
\ No newline at end of file
diff --git a/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/ILocation.java b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/ILocation.java
new file mode 100644
index 0000000000..00851c8d5e
--- /dev/null
+++ b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/ILocation.java
@@ -0,0 +1,9 @@
+package com.baeldung.features.records;
+
+public sealed interface ILocation permits Location {
+ default String getName() {
+ return switch (this) {
+ case Location(var name, var ignored) -> name;
+ };
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/Location.java b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/Location.java
new file mode 100644
index 0000000000..fb50fbe645
--- /dev/null
+++ b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/Location.java
@@ -0,0 +1,5 @@
+package com.baeldung.features.records;
+
+public record Location(String name, GPSPoint gpsPoint) implements ILocation {
+}
+
diff --git a/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/LocationWrapper.java b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/LocationWrapper.java
new file mode 100644
index 0000000000..e7ddfef5f0
--- /dev/null
+++ b/core-java-modules/core-java-19/src/main/java/com/baeldung/features/records/LocationWrapper.java
@@ -0,0 +1,3 @@
+package com.baeldung.features.records;
+
+public record LocationWrapper(T t, String description) { }
diff --git a/core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java b/core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java
new file mode 100644
index 0000000000..82162406b3
--- /dev/null
+++ b/core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java
@@ -0,0 +1,20 @@
+package com.baeldung.highcpu;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.IntUnaryOperator;
+import java.util.stream.IntStream;
+
+public class Application {
+
+ static List generateList() {
+ return IntStream.range(0, 10000000).parallel().map(IntUnaryOperator.identity()).collect(LinkedList::new, List::add, List::addAll);
+ }
+
+ public static void main(String[] args) {
+ List list = generateList();
+ long start = System.nanoTime();
+ int value = list.get(9500000);
+ System.out.printf("Found value %d in %d nanos\n", value, (System.nanoTime() - start));
+ }
+}
diff --git a/core-java-modules/core-java-19/src/test/java/com/baeldung/features/JEP405RecordPatternsUnitTest.java b/core-java-modules/core-java-19/src/test/java/com/baeldung/features/JEP405RecordPatternsUnitTest.java
new file mode 100644
index 0000000000..10ad33b411
--- /dev/null
+++ b/core-java-modules/core-java-19/src/test/java/com/baeldung/features/JEP405RecordPatternsUnitTest.java
@@ -0,0 +1,99 @@
+package com.baeldung.features;
+
+import com.baeldung.features.records.GPSPoint;
+import com.baeldung.features.records.Location;
+import com.baeldung.features.records.LocationWrapper;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+
+public class JEP405RecordPatternsUnitTest {
+
+ Object object = new Location("Home", new GPSPoint(1.0, 2.0));
+
+ @Test
+ void givenObject_whenTestInstanceOfAndCastIdiom_shouldMatchNewInstanceOf() {
+ // old Code
+ if (object instanceof Location) {
+ Location l = (Location) object;
+ assertThat(l).isInstanceOf(Location.class);
+ }
+ // new code
+ if (object instanceof Location l) {
+ assertThat(l).isInstanceOf(Location.class);
+ }
+ }
+
+ @Test
+ void givenObject_whenTestDestruct_shouldMatch() {
+ // when
+ if (object instanceof Location(var name, var gpsPoint)) {
+ // then
+ assertThat(name).isEqualTo("Home");
+ assertThat(gpsPoint).isInstanceOf(GPSPoint.class);
+ }
+
+ if (object instanceof Location(var name, GPSPoint(var lat, var lng))) {
+ assertThat(lat).isEqualTo(1.0);
+ assertThat(lng).isEqualTo(2.0);
+ }
+ }
+
+ @Test
+ void givenObjectIsNull_whenTestNullCheck_shouldNotMatch() {
+ Location l = null;
+ if (l instanceof Location location) {
+ assertThat(location).isNotNull();
+ }
+ }
+
+
+ @Test
+ void givenObject_whenTestGenericTypeInstanceOf_shouldMatch() {
+ LocationWrapper locationWrapper = new LocationWrapper<>(new Location("Home", new GPSPoint(1.0, 2.0)), "Description");
+ if (locationWrapper instanceof LocationWrapper(var ignored, var description)) {
+ assertThat(description).isEqualTo("Description");
+ }
+ }
+
+
+ @Test
+ void givenObject_whenTestSwitchExpressionWithTypePattern_shouldMatch() {
+ String result = switch (object) {
+ case Location l -> l.name();
+ default -> "default";
+ };
+ assertThat(result).isEqualTo("Home");
+ Double result2 = switch (object) {
+ case Location(var name, GPSPoint(var lat, var lng)) -> lat;
+ default -> 0.0;
+ };
+ assertThat(result2).isEqualTo(1.0);
+ }
+
+ @Test
+ void givenObject_whenTestGuardedSwitchExpressionWithTypePattern_shouldMatchAndGuard() {
+ String result = switch (object) {
+ case Location(var name, var ignored) when name.equals("Home") -> "Test";
+ case Location(var name, var ignored) -> name;
+ default -> "default";
+ };
+ assertThat(result).isEqualTo("Test");
+
+ String otherResult = switch (new Location("Other", new GPSPoint(1.0, 2.0))) {
+ case Location(var name, var ignored) when name.equals("Home") -> "Test";
+ case Location(var name, var ignored) -> name;
+ default -> "default";
+ };
+ assertThat(otherResult).isEqualTo("Other");
+
+ Object noLocation = new GPSPoint(1.0, 2.0);
+ String noLocationResult = switch (noLocation) {
+ case Location(var name, var ignored) when name.equals("Home") -> "Test";
+ case Location(var name, var ignored) -> name;
+ default -> "default";
+ };
+ assertThat(noLocationResult).isEqualTo("default");
+ }
+}
diff --git a/core-java-modules/core-java-19/src/test/java/com/baeldung/features/JEP428StructuredConcurrencyUnitTest.java b/core-java-modules/core-java-19/src/test/java/com/baeldung/features/JEP428StructuredConcurrencyUnitTest.java
new file mode 100644
index 0000000000..64cd84ba01
--- /dev/null
+++ b/core-java-modules/core-java-19/src/test/java/com/baeldung/features/JEP428StructuredConcurrencyUnitTest.java
@@ -0,0 +1,122 @@
+package com.baeldung.features;
+
+import jdk.incubator.concurrent.StructuredTaskScope;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.*;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+public class JEP428StructuredConcurrencyUnitTest {
+
+ private static final String ERROR_MESSAGE = "Failed to get the result";
+
+ @Test
+ public void givenStructuredConcurrency_whenThrowingException_thenCorrect() {
+ assertThatThrownBy(() -> {
+ try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
+ Future shelter = scope.fork(this::getShelter);
+ Future> dogs = scope.fork(this::getDogsWithException);
+ scope.throwIfFailed(e -> new RuntimeException(ERROR_MESSAGE));
+ scope.join();
+ Response response = new Response(shelter.resultNow(), dogs.resultNow());
+
+ assertThat(response).isNotNull();
+ assertThat(response.shelter()).isNotNull();
+ assertThat(response.dogs()).isNotNull();
+ assertThat(response.dogs().size()).isEqualTo(2);
+ }
+ }).isInstanceOf(RuntimeException.class)
+ .hasMessage(ERROR_MESSAGE);
+ }
+
+ @Test
+ public void givenStructuredConcurrency_whenSlowTasksReachesDeadline_thenCorrect() {
+ assertThatThrownBy(() -> {
+ try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
+ Future shelter = scope.fork(this::getShelter);
+ Future> dogs = scope.fork(this::getDogsSlowly);
+ scope.throwIfFailed(e -> new RuntimeException(ERROR_MESSAGE));
+ scope.join();
+ scope.joinUntil(Instant.now().plusMillis(50));
+ Response response = new Response(shelter.resultNow(), dogs.resultNow());
+
+ assertThat(response).isNotNull();
+ assertThat(response.shelter()).isNotNull();
+ assertThat(response.dogs()).isNotNull();
+ assertThat(response.dogs().size()).isEqualTo(2);
+
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }).isInstanceOf(IllegalStateException.class);
+ }
+
+ @Test
+ public void givenStructuredConcurrency_whenResultNow_thenCorrect() {
+ try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
+ Future shelter = scope.fork(this::getShelter);
+ Future> dogs = scope.fork(this::getDogs);
+ scope.join();
+
+ Response response = new Response(shelter.resultNow(), dogs.resultNow());
+
+ assertThat(response).isNotNull();
+ assertThat(response.shelter()).isNotNull();
+ assertThat(response.dogs()).isNotNull();
+ assertThat(response.dogs().size()).isEqualTo(2);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ public void givenUnstructuredConcurrency_whenGet_thenCorrect() {
+ Future shelter;
+ Future> dogs;
+ try (ExecutorService executorService = Executors.newFixedThreadPool(3)) {
+ shelter = executorService.submit(this::getShelter);
+ dogs = executorService.submit(this::getDogs);
+ Shelter theShelter = shelter.get(); // Join the shelter
+ List theDogs = dogs.get(); // Join the dogs
+ Response response = new Response(theShelter, theDogs);
+
+ assertThat(response).isNotNull();
+ assertThat(response.shelter()).isNotNull();
+ assertThat(response.dogs()).isNotNull();
+ assertThat(response.dogs().size()).isEqualTo(2);
+
+ } catch (ExecutionException | InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private Shelter getShelter() {
+ return new Shelter("Shelter");
+ }
+
+ private List getDogs() {
+ return List.of(new Dog("Buddy"), new Dog("Simba"));
+ }
+
+ private List getDogsWithException() {
+ throw new RuntimeException(ERROR_MESSAGE);
+ }
+
+ private List getDogsSlowly() throws InterruptedException {
+ Thread.sleep(1500);
+ throw new RuntimeException(ERROR_MESSAGE);
+ }
+
+ record Shelter(String name) {
+ }
+
+ record Dog(String name) {
+ }
+
+ record Response(Shelter shelter, List dogs) {
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-20/README.md b/core-java-modules/core-java-20/README.md
new file mode 100644
index 0000000000..aba4e9e240
--- /dev/null
+++ b/core-java-modules/core-java-20/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Scoped Values in Java 20](https://www.baeldung.com/java-20-scoped-values)
diff --git a/core-java-modules/core-java-20/pom.xml b/core-java-modules/core-java-20/pom.xml
new file mode 100644
index 0000000000..9562a41b1c
--- /dev/null
+++ b/core-java-modules/core-java-20/pom.xml
@@ -0,0 +1,65 @@
+
+
+ 4.0.0
+
+ com.baeldung.core-java-modules
+ core-java-modules
+ 0.0.1-SNAPSHOT
+
+
+ core-java-20
+
+
+ 20
+ 20
+ UTF-8
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 20
+ 20
+
+ --enable-preview
+ --add-modules=jdk.incubator.concurrent
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ --enable-preview --add-modules=jdk.incubator.concurrent
+
+
+
+
+
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ 6.0.0
+ provided
+
+
+ org.assertj
+ assertj-core
+ 3.24.2
+ test
+
+
+ org.mockito
+ mockito-junit-jupiter
+ 5.2.0
+ test
+
+
+
+
\ No newline at end of file
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Controller.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Controller.java
new file mode 100644
index 0000000000..92edc57e48
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Controller.java
@@ -0,0 +1,33 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Optional;
+
+public class Controller {
+
+ private final Service service = new Service();
+
+ public void processRequest(HttpServletRequest request, HttpServletResponse response, User loggedInUser) {
+ Optional data = service.getData(request, loggedInUser);
+ if (data.isPresent()) {
+ try {
+ PrintWriter out = response.getWriter();
+ response.setContentType("application/json");
+ out.print(data.get());
+ out.flush();
+ response.setStatus(200);
+ } catch (IOException e) {
+ response.setStatus(500);
+ }
+ } else {
+ response.setStatus(400);
+ }
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Repository.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Repository.java
new file mode 100644
index 0000000000..3085b3be58
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Repository.java
@@ -0,0 +1,16 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+
+import java.util.Optional;
+
+public class Repository {
+
+ public Optional getData(String id, User user) {
+ return user.isAdmin()
+ ? Optional.of(new Data(id, "Title 1", "Description 1"))
+ : Optional.empty();
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Server.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Server.java
new file mode 100644
index 0000000000..71afa9e675
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Server.java
@@ -0,0 +1,42 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.*;
+
+public class Server {
+
+ private static final List AUTHENTICATED_USERS = List.of(
+ new User("1", "admin", "123456", true),
+ new User("2", "user", "123456", false)
+ );
+ private final Controller controller = new Controller();
+ private final ExecutorService executor = Executors.newFixedThreadPool(5);
+
+ public void serve(HttpServletRequest request, HttpServletResponse response) throws InterruptedException, ExecutionException {
+ Optional user = authenticateUser(request);
+ if (user.isPresent()) {
+ Future future = executor.submit(() ->
+ controller.processRequest(request, response, user.get()));
+ future.get();
+ } else {
+ response.setStatus(401);
+ }
+ }
+
+ private Optional authenticateUser(HttpServletRequest request) {
+ return AUTHENTICATED_USERS.stream()
+ .filter(user -> checkUserPassword(user, request))
+ .findFirst();
+ }
+
+ private boolean checkUserPassword(User user, HttpServletRequest request) {
+ return user.name().equals(request.getParameter("user_name"))
+ && user.password().equals(request.getParameter("user_pw"));
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Service.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Service.java
new file mode 100644
index 0000000000..011f793001
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Service.java
@@ -0,0 +1,18 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Optional;
+
+public class Service {
+
+ private final Repository repository = new Repository();
+
+ public Optional getData(HttpServletRequest request, User loggedInUser) {
+ String id = request.getParameter("data_id");
+ return repository.getData(id, loggedInUser);
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/Data.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/Data.java
new file mode 100644
index 0000000000..70be41c1ac
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/Data.java
@@ -0,0 +1,3 @@
+package com.baeldung.scopedvalues.data;
+
+public record Data(String id, String title, String description) {}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/User.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/User.java
new file mode 100644
index 0000000000..22e0a4243f
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/User.java
@@ -0,0 +1,3 @@
+package com.baeldung.scopedvalues.data;
+
+public record User(String id, String name, String password, boolean isAdmin) {}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Controller.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Controller.java
new file mode 100644
index 0000000000..239ee88f19
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Controller.java
@@ -0,0 +1,37 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.Data;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.ScopedValue;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Optional;
+
+public class Controller {
+
+ private final Service internalService = new Service();
+
+ public void processRequest(HttpServletRequest request, HttpServletResponse response) {
+ Optional data = internalService.getData(request);
+
+ ScopedValue.where(Server.LOGGED_IN_USER, null)
+ .run(internalService::extractData);
+
+ if (data.isPresent()) {
+ try {
+ PrintWriter out = response.getWriter();
+ response.setContentType("application/json");
+ out.print(data.get());
+ out.flush();
+ response.setStatus(200);
+ } catch (IOException e) {
+ response.setStatus(500);
+ }
+ } else {
+ response.setStatus(400);
+ }
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Repository.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Repository.java
new file mode 100644
index 0000000000..a40191eb3c
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Repository.java
@@ -0,0 +1,17 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+
+import java.util.Optional;
+
+public class Repository {
+
+ public Optional getData(String id) {
+ User loggedInUser = Server.LOGGED_IN_USER.get();
+ return loggedInUser.isAdmin()
+ ? Optional.of(new Data(id, "Title 1", "Description 1"))
+ : Optional.empty();
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Server.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Server.java
new file mode 100644
index 0000000000..559e4efd56
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Server.java
@@ -0,0 +1,41 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.ScopedValue;
+
+import java.util.List;
+import java.util.Optional;
+
+public class Server {
+
+ private static final List AUTHENTICATED_USERS = List.of(
+ new User("1", "admin", "123456", true),
+ new User("2", "user", "123456", false)
+ );
+ public final static ScopedValue LOGGED_IN_USER = ScopedValue.newInstance();
+ private final Controller controller = new Controller();
+
+ public void serve(HttpServletRequest request, HttpServletResponse response) {
+ Optional user = authenticateUser(request);
+ if (user.isPresent()) {
+ ScopedValue.where(LOGGED_IN_USER, user.get())
+ .run(() -> controller.processRequest(request, response));
+ } else {
+ response.setStatus(401);
+ }
+ }
+
+ private Optional authenticateUser(HttpServletRequest request) {
+ return AUTHENTICATED_USERS.stream()
+ .filter(user -> checkUserPassword(user, request))
+ .findFirst();
+ }
+
+ private boolean checkUserPassword(User user, HttpServletRequest request) {
+ return user.name().equals(request.getParameter("user_name"))
+ && user.password().equals(request.getParameter("user_pw"));
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Service.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Service.java
new file mode 100644
index 0000000000..e35d98cae5
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Service.java
@@ -0,0 +1,23 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Optional;
+
+public class Service {
+
+ private final Repository repository = new Repository();
+
+ public Optional getData(HttpServletRequest request) {
+ String id = request.getParameter("data_id");
+ return repository.getData(id);
+ }
+
+ public void extractData() {
+ User loggedInUser = Server.LOGGED_IN_USER.get();
+ assert loggedInUser == null;
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Controller.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Controller.java
new file mode 100644
index 0000000000..e4742c0998
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Controller.java
@@ -0,0 +1,44 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.Data;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.StructuredTaskScope;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class Controller {
+
+ private final InternalService internalService = new InternalService();
+ private final ExternalService externalService = new ExternalService();
+
+ public void processRequest(HttpServletRequest request, HttpServletResponse response) {
+ try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
+ Future> internalData = scope.fork(() -> internalService.getData(request));
+ Future externalData = scope.fork(externalService::getData);
+ try {
+ scope.join();
+ scope.throwIfFailed();
+
+ Optional data = internalData.resultNow();
+ if (data.isPresent()) {
+ PrintWriter out = response.getWriter();
+ response.setContentType("application/json");
+ out.println(data.get());
+ out.print(externalData.resultNow());
+ out.flush();
+ response.setStatus(200);
+ } else {
+ response.setStatus(400);
+ }
+ } catch (InterruptedException | ExecutionException | IOException e) {
+ response.setStatus(500);
+ }
+ }
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/ExternalService.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/ExternalService.java
new file mode 100644
index 0000000000..88fa4dfb74
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/ExternalService.java
@@ -0,0 +1,9 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+public class ExternalService {
+
+ public String getData() {
+ return "External data";
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/InternalService.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/InternalService.java
new file mode 100644
index 0000000000..ace46b254c
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/InternalService.java
@@ -0,0 +1,17 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.Data;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Optional;
+
+public class InternalService {
+
+ private final Repository repository = new Repository();
+
+ public Optional getData(HttpServletRequest request) {
+ String id = request.getParameter("data_id");
+ return repository.getData(id);
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Repository.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Repository.java
new file mode 100644
index 0000000000..22d18b2fac
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Repository.java
@@ -0,0 +1,17 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+
+import java.util.Optional;
+
+public class Repository {
+
+ public Optional getData(String id) {
+ User loggedInUser = Server.LOGGED_IN_USER.get();
+ return loggedInUser.isAdmin()
+ ? Optional.of(new Data(id, "Title 1", "Description 1"))
+ : Optional.empty();
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Server.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Server.java
new file mode 100644
index 0000000000..5f04a1eedd
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Server.java
@@ -0,0 +1,41 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.ScopedValue;
+
+import java.util.List;
+import java.util.Optional;
+
+public class Server {
+
+ private static final List AUTHENTICATED_USERS = List.of(
+ new User("1", "admin", "123456", true),
+ new User("2", "user", "123456", false)
+ );
+ public final static ScopedValue LOGGED_IN_USER = ScopedValue.newInstance();
+ private final Controller controller = new Controller();
+
+ public void serve(HttpServletRequest request, HttpServletResponse response) {
+ Optional user = authenticateUser(request);
+ if (user.isPresent()) {
+ ScopedValue.where(LOGGED_IN_USER, user.get())
+ .run(() -> controller.processRequest(request, response));
+ } else {
+ response.setStatus(401);
+ }
+ }
+
+ private Optional authenticateUser(HttpServletRequest request) {
+ return AUTHENTICATED_USERS.stream()
+ .filter(user -> checkUserPassword(user, request))
+ .findFirst();
+ }
+
+ private boolean checkUserPassword(User user, HttpServletRequest request) {
+ return user.name().equals(request.getParameter("user_name"))
+ && user.password().equals(request.getParameter("user_pw"));
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/classic/ServerUnitTest.java b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/classic/ServerUnitTest.java
new file mode 100644
index 0000000000..e0b9366c22
--- /dev/null
+++ b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/classic/ServerUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.scopedvalues.classic;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.concurrent.ExecutionException;
+
+import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.*;
+@ExtendWith(MockitoExtension.class)
+public class ServerUnitTest {
+
+ @Mock
+ private HttpServletRequest request;
+
+ @Mock
+ private HttpServletResponse response;
+
+ private final StringWriter writer = new StringWriter();
+
+ private final Server server = new Server();
+
+ @Test
+ void givenMockedRequestWithAdminCredentials_whenServeMethodIsCalled_thenDataIsReturned() throws InterruptedException, IOException, ExecutionException {
+ when(request.getParameter("user_name")).thenReturn("admin");
+ when(request.getParameter("user_pw")).thenReturn("123456");
+ when(request.getParameter("data_id")).thenReturn("1");
+ when(response.getWriter()).thenReturn(new PrintWriter(writer));
+
+ server.serve(request, response);
+
+ assertThat(writer.toString()).isEqualTo("Data[id=1, title=Title 1, description=Description 1]");
+ }
+
+ @Test
+ void givenMockedRequestWithUserCredentials_whenServeMethodIsCalled_thenNoDataIsReturned() throws InterruptedException, ExecutionException {
+ when(request.getParameter("user_name")).thenReturn("user");
+ when(request.getParameter("user_pw")).thenReturn("123456");
+
+ server.serve(request, response);
+
+ assertThat(writer.toString()).isEqualTo("");
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/ServerUnitTest.java b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/ServerUnitTest.java
new file mode 100644
index 0000000000..034e6683e3
--- /dev/null
+++ b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/ServerUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.scopedvalues.scoped;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class ServerUnitTest {
+
+ @Mock
+ private HttpServletRequest request;
+
+ @Mock
+ private HttpServletResponse response;
+
+ private final StringWriter writer = new StringWriter();
+
+ private final Server server = new Server();
+
+ @Test
+ void givenMockedRequestWithAdminCredentials_whenServeMethodIsCalled_thenDataIsReturned() throws IOException {
+ when(request.getParameter("user_name")).thenReturn("admin");
+ when(request.getParameter("user_pw")).thenReturn("123456");
+ when(request.getParameter("data_id")).thenReturn("1");
+ when(response.getWriter()).thenReturn(new PrintWriter(writer));
+
+ server.serve(request, response);
+
+ assertThat(writer.toString()).isEqualTo("Data[id=1, title=Title 1, description=Description 1]");
+ }
+
+ @Test
+ void givenMockedRequestWithUserCredentials_whenServeMethodIsCalled_thenNoDataIsReturned() throws IOException {
+ when(request.getParameter("user_name")).thenReturn("user");
+ when(request.getParameter("user_pw")).thenReturn("123456");
+
+ server.serve(request, response);
+
+ assertThat(writer.toString()).isEqualTo("");
+ }
+
+}
diff --git a/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/inheriting/ServerUnitTest.java b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/inheriting/ServerUnitTest.java
new file mode 100644
index 0000000000..230b017c18
--- /dev/null
+++ b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/inheriting/ServerUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class ServerUnitTest {
+
+ @Mock
+ private HttpServletRequest request;
+
+ @Mock
+ private HttpServletResponse response;
+
+ private final StringWriter writer = new StringWriter();
+
+ private final Server server = new Server();
+
+ @Test
+ void givenMockedRequestWithAdminCredentials_whenServeMethodIsCalled_thenDataIsReturned() throws IOException {
+ when(request.getParameter("user_name")).thenReturn("admin");
+ when(request.getParameter("user_pw")).thenReturn("123456");
+ when(request.getParameter("data_id")).thenReturn("1");
+ when(response.getWriter()).thenReturn(new PrintWriter(writer));
+
+ server.serve(request, response);
+
+ assertThat(writer.toString()).isEqualTo("Data[id=1, title=Title 1, description=Description 1]\nExternal data");
+ }
+
+ @Test
+ void givenMockedRequestWithUserCredentials_whenServeMethodIsCalled_thenNoDataIsReturned() throws IOException {
+ when(request.getParameter("user_name")).thenReturn("user");
+ when(request.getParameter("user_pw")).thenReturn("123456");
+
+ server.serve(request, response);
+
+ assertThat(writer.toString()).isEqualTo("");
+ }
+
+}
diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
index c0bc63f21f..c723a827b1 100644
--- a/core-java-modules/core-java-8-2/README.md
+++ b/core-java-modules/core-java-8-2/README.md
@@ -10,4 +10,7 @@ This module contains articles about Java 8 core features
- [Interface With Default Methods vs Abstract Class](https://www.baeldung.com/java-interface-default-method-vs-abstract-class)
- [Convert Between Byte Array and UUID in Java](https://www.baeldung.com/java-byte-array-to-uuid)
- [Create a Simple “Rock-Paper-Scissors” Game in Java](https://www.baeldung.com/java-rock-paper-scissors)
+- [VarArgs vs Array Input Parameters in Java](https://www.baeldung.com/varargs-vs-array)
+- [Lambda Expression vs. Anonymous Inner Class](https://www.baeldung.com/java-lambdas-vs-anonymous-class)
+- [Java Helper vs. Utility Classes](https://www.baeldung.com/java-helper-vs-utility-classes)
- [[<-- Prev]](/core-java-modules/core-java-8)
diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
index 7db1e1ed4e..589e384613 100644
--- a/core-java-modules/core-java-8-2/pom.xml
+++ b/core-java-modules/core-java-8-2/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-8-2
- 0.1.0-SNAPSHOT
core-java-8-2
jar
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java
new file mode 100644
index 0000000000..1ea85942ee
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java
@@ -0,0 +1,14 @@
+package com.baeldung.anonymousclass;
+
+public class AnonymousClassExample{
+
+ public static void main(String[] args){
+ Thread t1 = new Thread(new Runnable(){
+ @Override
+ public void run() {
+ System.out.println("Thread: "+Thread.currentThread().getName()+" started");
+ }
+ });
+ t1.start();
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/argsVsvarargs/StringArrayAndVarargs.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/argsVsvarargs/StringArrayAndVarargs.java
new file mode 100644
index 0000000000..dc9137646f
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/argsVsvarargs/StringArrayAndVarargs.java
@@ -0,0 +1,19 @@
+package com.baeldung.argsVsvarargs;
+
+public class StringArrayAndVarargs {
+ public static void capitalizeNames(String[] args) {
+ for(int i = 0; i < args.length; i++){
+ args[i] = args[i].toUpperCase();
+ }
+
+ }
+
+ public static String[] firstLetterOfWords(String... args) {
+ String[] firstLetter = new String[args.length];
+ for(int i = 0; i < args.length; i++){
+ firstLetter[i] = String.valueOf(args[i].charAt(0));
+ }
+ return firstLetter;
+ }
+
+}
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyHelperClass.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyHelperClass.java
new file mode 100644
index 0000000000..40b58bf200
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyHelperClass.java
@@ -0,0 +1,40 @@
+package com.baeldung.helpervsutilityclasses;
+
+class MyHelperClass {
+ public double discount;
+ public MyHelperClass(double discount) {
+ if (discount > 0 && discount < 1) {
+ this.discount = discount;
+ }
+ }
+ public double discountedPrice(double price) {
+ return price - (price * discount);
+ }
+
+ public static int getMaxNumber(int[] numbers) {
+ if (numbers.length == 0) {
+ throw new IllegalArgumentException("Ensure array is not empty");
+ }
+ int max = numbers[0];
+ for (int i = 1; i < numbers.length; i++) {
+ if (numbers[i] > max) {
+ max = numbers[i];
+ }
+ }
+ return max;
+ }
+
+ public static int getMinNumber(int[] numbers) {
+ if (numbers.length == 0) {
+ throw new IllegalArgumentException("Ensure array is not empty");
+ }
+ int min = numbers[0];
+ for (int i = 1; i < numbers.length; i++) {
+ if (numbers[i] < min) {
+ min = numbers[i];
+ }
+ }
+ return min;
+ }
+
+}
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyUtilityClass.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyUtilityClass.java
new file mode 100644
index 0000000000..1f0075995c
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyUtilityClass.java
@@ -0,0 +1,19 @@
+package com.baeldung.helpervsutilityclasses;
+
+public final class MyUtilityClass {
+
+ private MyUtilityClass(){}
+
+ public static String returnUpperCase(String stringInput) {
+ return stringInput.toUpperCase();
+ }
+
+ public static String returnLowerCase(String stringInput) {
+ return stringInput.toLowerCase();
+ }
+
+ public static String[] splitStringInput(String stringInput, String delimiter) {
+ return stringInput.split(delimiter);
+ }
+
+}
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java
new file mode 100644
index 0000000000..95128b934c
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java
@@ -0,0 +1,9 @@
+package com.baeldung.lambdaexpression;
+
+public class LambdaExpressionExample{
+
+ public static void main(String[] args){
+ Thread t1 = new Thread(()->System.out.println("Thread: "+Thread.currentThread().getName()+" started"));
+ t1.start();
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/argsVsvarargs/StringArrayAndVarargsUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/argsVsvarargs/StringArrayAndVarargsUnitTest.java
new file mode 100644
index 0000000000..f917373229
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/argsVsvarargs/StringArrayAndVarargsUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.argsVsvarargs;
+
+import static com.baeldung.argsVsvarargs.StringArrayAndVarargs.capitalizeNames;
+import static com.baeldung.argsVsvarargs.StringArrayAndVarargs.firstLetterOfWords;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class StringArrayAndVarargsUnitTest {
+
+ @Test
+ void whenCheckingArgumentClassName_thenNameShouldBeStringArray() {
+ String[] names = {"john", "ade", "kofi", "imo"};
+ assertNotNull(names);
+ assertEquals("java.lang.String[]", names.getClass().getTypeName());
+ capitalizeNames(names);
+ }
+
+ @Test
+ void whenCheckingReturnedObjectClass_thenClassShouldBeStringArray() {
+ assertEquals(String[].class, firstLetterOfWords("football", "basketball", "volleyball").getClass());
+ assertEquals(3, firstLetterOfWords("football", "basketball", "volleyball").length);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyHelperClassUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyHelperClassUnitTest.java
new file mode 100644
index 0000000000..a0c1afea52
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyHelperClassUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.helpervsutilityclasses;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class MyHelperClassUnitTest {
+
+ @Test
+ void whenCreatingHelperObject_thenHelperObjectShouldBeCreated() {
+ MyHelperClass myHelperClassObject = new MyHelperClass(0.10);
+ int[] numberArray = {15, 23, 66, 3, 51, 79};
+
+ assertNotNull(myHelperClassObject);
+
+ assertEquals(90, myHelperClassObject.discountedPrice(100.00));
+ assertEquals( 79, MyHelperClass.getMaxNumber(numberArray));
+ assertEquals(3, MyHelperClass.getMinNumber(numberArray));
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyUtilityClassUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyUtilityClassUnitTest.java
new file mode 100644
index 0000000000..8b29f51959
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyUtilityClassUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.helpervsutilityclasses;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class MyUtilityClassUnitTest {
+
+ @Test
+ void whenUsingUtilityMethods_thenAccessMethodsViaClassName(){
+ assertEquals( "INIUBONG", MyUtilityClass.returnUpperCase("iniubong"));
+ assertEquals("accra", MyUtilityClass.returnLowerCase("AcCrA"));
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-datetime-2/README.md b/core-java-modules/core-java-8-datetime-2/README.md
index f16563aacc..56f66c10fb 100644
--- a/core-java-modules/core-java-8-datetime-2/README.md
+++ b/core-java-modules/core-java-8-datetime-2/README.md
@@ -2,4 +2,5 @@
- [Generating Random Dates in Java](https://www.baeldung.com/java-random-dates)
- [Creating a LocalDate with Values in Java](https://www.baeldung.com/java-creating-localdate-with-values)
-- [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)
\ No newline at end of file
+- [Parsing Date Strings with Varying Formats](https://www.baeldung.com/java-parsing-dates-many-formats)
+- [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)
diff --git a/core-java-modules/core-java-8-datetime-2/pom.xml b/core-java-modules/core-java-8-datetime-2/pom.xml
index 9e54b0ee12..ce349d9dc3 100644
--- a/core-java-modules/core-java-8-datetime-2/pom.xml
+++ b/core-java-modules/core-java-8-datetime-2/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-8-datetime-2
- ${project.parent.version}
core-java-8-datetime-2
jar
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/daysinmonth/DaysInMonthUtils.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/daysinmonth/DaysInMonthUtils.java
new file mode 100644
index 0000000000..93140e7459
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/daysinmonth/DaysInMonthUtils.java
@@ -0,0 +1,21 @@
+package com.baeldung.daysinmonth;
+
+import java.time.YearMonth;
+import java.util.Calendar;
+
+public class DaysInMonthUtils {
+
+ public int getDaysInMonthWithYearOfMonth(int month, int year) {
+ YearMonth yearMonth = YearMonth.of(year, month);
+ return yearMonth.lengthOfMonth();
+ }
+
+ public int getDaysInMonthWithCalendar(int month, int year) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.YEAR, year);
+ calendar.set(Calendar.MONTH, month - 1);
+ return calendar.getActualMaximum(Calendar.DATE);
+ }
+
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormat.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormat.java
new file mode 100644
index 0000000000..a82f3bce2b
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormat.java
@@ -0,0 +1,20 @@
+package com.baeldung.parsingDates;
+
+import java.util.Arrays;
+import java.util.List;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormat;
+
+public class SimpleDateTimeFormat {
+
+ public static LocalDate parseDate(String date) {
+ List patternList = Arrays.asList("MM/dd/yyyy", "dd.MM.yyyy", "yyyy-MM-dd");
+ for (String pattern : patternList) {
+ try {
+ return DateTimeFormat.forPattern(pattern).parseLocalDate(date);
+ } catch (IllegalArgumentException e) {
+ }
+ }
+ return null;
+ }
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormater.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormater.java
new file mode 100644
index 0000000000..aa12038032
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormater.java
@@ -0,0 +1,17 @@
+package com.baeldung.parsingDates;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
+public class SimpleDateTimeFormater {
+
+ public static LocalDate parseDate(String date) {
+ DateTimeFormatterBuilder dateTimeFormatterBuilder = new DateTimeFormatterBuilder()
+ .append(DateTimeFormatter.ofPattern("[MM/dd/yyyy]" + "[dd-MM-yyyy]" + "[yyyy-MM-dd]"));
+
+ DateTimeFormatter dateTimeFormatter = dateTimeFormatterBuilder.toFormatter();
+
+ return LocalDate.parse(date, dateTimeFormatter);
+ }
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateUtils.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateUtils.java
new file mode 100644
index 0000000000..8a154d3cd8
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateUtils.java
@@ -0,0 +1,18 @@
+package com.baeldung.parsingDates;
+
+import java.text.ParseException;
+import java.util.Date;
+import org.apache.commons.lang3.time.DateUtils;
+
+public class SimpleDateUtils {
+
+ public static Date parseDate(String date) {
+ try {
+ return DateUtils.parseDateStrictly(date,
+ new String[]{"yyyy/MM/dd", "dd/MM/yyyy", "yyyy-MM-dd"});
+ } catch (ParseException ex) {
+ return null;
+ }
+ }
+
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleParseDate.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleParseDate.java
new file mode 100644
index 0000000000..cb024eea53
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleParseDate.java
@@ -0,0 +1,19 @@
+package com.baeldung.parsingDates;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+public class SimpleParseDate {
+
+ public Date parseDate(String dateString, List formatStrings) {
+ for (String formatString : formatStrings) {
+ try {
+ return new SimpleDateFormat(formatString).parse(dateString);
+ } catch (ParseException e) {
+ }
+ }
+ return null;
+ }
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/daysinmonth/DaysInMonthUtilsUnitTest.java b/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/daysinmonth/DaysInMonthUtilsUnitTest.java
new file mode 100644
index 0000000000..ffaf231f7b
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/daysinmonth/DaysInMonthUtilsUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.daysinmonth;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DaysInMonthUtilsUnitTest {
+
+ @Test
+ void whenGetDaysInMonthWithYearOfMonth_thenCorrectResult() {
+ assertEquals(31, new DaysInMonthUtils().getDaysInMonthWithYearOfMonth(3, 2024));
+ assertEquals(30, new DaysInMonthUtils().getDaysInMonthWithYearOfMonth(11, 1999));
+ assertEquals(28, new DaysInMonthUtils().getDaysInMonthWithYearOfMonth(2, 2025));
+ assertEquals(29, new DaysInMonthUtils().getDaysInMonthWithYearOfMonth(2, 2004));
+ }
+
+ @Test
+ void whenGetDaysInMonthWithCalendar_thenCorrectResult() {
+ assertEquals(31, new DaysInMonthUtils().getDaysInMonthWithCalendar(3, 2024));
+ assertEquals(30, new DaysInMonthUtils().getDaysInMonthWithCalendar(11, 1999));
+ assertEquals(28, new DaysInMonthUtils().getDaysInMonthWithCalendar(2, 2025));
+ assertEquals(29, new DaysInMonthUtils().getDaysInMonthWithCalendar(2, 2004));
+ }
+
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/parsingDates/SimpleParseDateUnitTest.java b/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/parsingDates/SimpleParseDateUnitTest.java
new file mode 100644
index 0000000000..d7cbb6a834
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/parsingDates/SimpleParseDateUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.parsingDates;
+
+import com.baeldung.parsingDates.SimpleDateTimeFormat;
+import com.baeldung.parsingDates.SimpleDateTimeFormater;
+import com.baeldung.parsingDates.SimpleDateUtils;
+import com.baeldung.parsingDates.SimpleParseDate;
+import java.time.format.DateTimeParseException;
+import java.util.Arrays;
+import org.junit.*;
+import static org.junit.Assert.*;
+import org.joda.time.LocalDate;
+
+public class SimpleParseDateUnitTest {
+
+ @Test
+ public void whenInvalidInput_thenGettingUnexpectedResult() {
+ SimpleParseDate simpleParseDate = new SimpleParseDate();
+ String date = "2022-40-40";
+ assertEquals("Sat May 10 00:00:00 UTC 2025", simpleParseDate.parseDate(date, Arrays.asList("MM/dd/yyyy", "dd.MM.yyyy", "yyyy-MM-dd")).toString());
+ }
+
+ @Test
+ public void whenInvalidDate_thenAssertThrows() {
+ SimpleDateTimeFormater simpleDateTimeFormater = new SimpleDateTimeFormater();
+ assertEquals(java.time.LocalDate.parse("2022-12-04"), simpleDateTimeFormater.parseDate("2022-12-04"));
+ assertThrows(DateTimeParseException.class, () -> simpleDateTimeFormater.parseDate("2022-13-04"));
+ }
+
+ @Test
+ public void whenDateIsCorrect_thenParseCorrect() {
+ SimpleDateUtils simpleDateUtils = new SimpleDateUtils();
+ assertNull(simpleDateUtils.parseDate("53/10/2014"));
+ assertEquals("Wed Sep 10 00:00:00 UTC 2014", simpleDateUtils.parseDate("10/09/2014").toString());
+ }
+
+ @Test
+ public void whenDateIsCorrect_thenResultCorrect() {
+ SimpleDateTimeFormat simpleDateTimeFormat = new SimpleDateTimeFormat();
+ assertNull(simpleDateTimeFormat.parseDate("53/10/2014"));
+ assertEquals(LocalDate.parse("2014-10-10"), simpleDateTimeFormat.parseDate("2014-10-10"));
+ }
+
+}
diff --git a/core-java-modules/core-java-8-datetime/pom.xml b/core-java-modules/core-java-8-datetime/pom.xml
index 01ec6c0b76..481b1a6a69 100644
--- a/core-java-modules/core-java-8-datetime/pom.xml
+++ b/core-java-modules/core-java-8-datetime/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-8-datetime
- ${project.parent.version}
core-java-8-datetime
jar
diff --git a/core-java-modules/core-java-8/README.md b/core-java-modules/core-java-8/README.md
index ff4ceaf6db..6061f3318d 100644
--- a/core-java-modules/core-java-8/README.md
+++ b/core-java-modules/core-java-8/README.md
@@ -11,4 +11,5 @@ This module contains articles about Java 8 core features
- [Finding Min/Max in an Array with Java](https://www.baeldung.com/java-array-min-max)
- [Internationalization and Localization in Java 8](https://www.baeldung.com/java-8-localization)
- [Generalized Target-Type Inference in Java](https://www.baeldung.com/java-generalized-target-type-inference)
+- [Monads in Java](https://www.baeldung.com/java-monads)
- [[More -->]](/core-java-modules/core-java-8-2)
diff --git a/core-java-modules/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
index 89925bdbbb..fff7b7f2f9 100644
--- a/core-java-modules/core-java-8/pom.xml
+++ b/core-java-modules/core-java-8/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-8
- 0.1.0-SNAPSHOT
core-java-8
jar
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/monad/MonadSamples.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/monad/MonadSamples.java
new file mode 100644
index 0000000000..87b7fe697e
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/monad/MonadSamples.java
@@ -0,0 +1,82 @@
+package com.baeldung.monad;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+class MonadBaseExample {
+
+ public double multiplyBy2(double n) {
+ return n * 2;
+ }
+
+ public double divideBy2(double n) {
+ return n / 2;
+ }
+
+ public double add3(double n) {
+ return n + 3;
+ }
+
+ public double subtract1(double n) {
+ return n - 1;
+ }
+
+}
+
+class MonadSample1 extends MonadBaseExample {
+
+ public double apply(double n) {
+ return subtract1(add3(divideBy2(multiplyBy2(multiplyBy2(2)))));
+ }
+}
+
+class MonadSample2 extends MonadBaseExample {
+ public double apply(double n) {
+ double n1 = multiplyBy2(n);
+ double n2 = multiplyBy2(n1);
+ double n3 = divideBy2(n2);
+ double n4 = add3(n3);
+ return subtract1(n4);
+ }
+}
+
+class MonadSample3 extends MonadBaseExample {
+
+ public double apply(double n) {
+ return Optional.of(n)
+ .flatMap(value -> Optional.of(multiplyBy2(value)))
+ .flatMap(value -> Optional.of(multiplyBy2(value)))
+ .flatMap(value -> Optional.of(divideBy2(value)))
+ .flatMap(value -> Optional.of(add3(value)))
+ .flatMap(value -> Optional.of(subtract1(value)))
+ .get();
+ }
+
+}
+
+ class MonadSample4 extends MonadBaseExample {
+ public boolean leftIdentity() {
+ Function> mapping = value -> Optional.of(value + 1);
+ return Optional.of(3).flatMap(mapping).equals(mapping.apply(3));
+ }
+
+ public boolean rightIdentity() {
+ return Optional.of(3).flatMap(Optional::of).equals(Optional.of(3));
+ }
+
+ public boolean associativity() {
+ Function> mapping = value -> Optional.of(value + 1);
+ Optional leftSide = Optional.of(3).flatMap(mapping).flatMap(Optional::of);
+ Optional rightSide = Optional.of(3).flatMap(v -> mapping.apply(v).flatMap(Optional::of));
+ return leftSide.equals(rightSide);
+ }
+
+ }
+
+class MonadSample5 extends MonadBaseExample {
+ public boolean fail() {
+ Function> mapping = value -> Optional.of(value == null ? -1 : value + 1);
+ return Optional.ofNullable((Integer) null).flatMap(mapping).equals(mapping.apply(null));
+ }
+}
+
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Article.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Article.java
new file mode 100644
index 0000000000..7b9ef00078
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Article.java
@@ -0,0 +1,44 @@
+package com.baeldung.spliterator;
+
+import java.util.List;
+
+public class Article {
+ private List listOfAuthors;
+ private int id;
+ private String name;
+
+ public Article(String name) {
+ this.name = name;
+ }
+
+ public Article(List listOfAuthors, int id) {
+ super();
+ this.listOfAuthors = listOfAuthors;
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public List getListOfAuthors() {
+ return listOfAuthors;
+ }
+
+ public void setListOfAuthors(List listOfAuthors) {
+ this.listOfAuthors = listOfAuthors;
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Author.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Author.java
new file mode 100644
index 0000000000..ae204657b5
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Author.java
@@ -0,0 +1,33 @@
+package com.baeldung.spliterator;
+
+public class Author {
+ private String name;
+ private int relatedArticleId;
+
+ public Author(String name, int relatedArticleId) {
+ this.name = name;
+ this.relatedArticleId = relatedArticleId;
+ }
+
+ public int getRelatedArticleId() {
+ return relatedArticleId;
+ }
+
+ public void setRelatedArticleId(int relatedArticleId) {
+ this.relatedArticleId = relatedArticleId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "[name: " + name + ", relatedId: " + relatedArticleId + "]";
+ }
+}
+
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Executor.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Executor.java
new file mode 100644
index 0000000000..3dc2fa06bb
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/Executor.java
@@ -0,0 +1,12 @@
+package com.baeldung.spliterator;
+
+import java.util.stream.Stream;
+
+public class Executor {
+
+ public static int countAutors(Stream stream) {
+ RelatedAuthorCounter wordCounter = stream.reduce(new RelatedAuthorCounter(0, true),
+ RelatedAuthorCounter::accumulate, RelatedAuthorCounter::combine);
+ return wordCounter.getCounter();
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/RelatedAuthorCounter.java
similarity index 95%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/RelatedAuthorCounter.java
index 282c0be727..8800eac55b 100644
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorCounter.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/RelatedAuthorCounter.java
@@ -1,4 +1,4 @@
-package com.baeldung.spliteratorAPI;
+package com.baeldung.spliterator;
public class RelatedAuthorCounter {
private final int counter;
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/RelatedAuthorSpliterator.java
similarity index 96%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
rename to core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/RelatedAuthorSpliterator.java
index 094638da37..93c83b8127 100644
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/RelatedAuthorSpliterator.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliterator/RelatedAuthorSpliterator.java
@@ -1,4 +1,4 @@
-package com.baeldung.spliteratorAPI;
+package com.baeldung.spliterator;
import java.util.List;
import java.util.Spliterator;
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
deleted file mode 100644
index 3cd2a00da1..0000000000
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Article.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.List;
-
-public class Article {
- private List listOfAuthors;
- private int id;
- private String name;
-
- public Article(String name) {
- this.name = name;
- }
-
- public Article(List listOfAuthors, int id) {
- super();
- this.listOfAuthors = listOfAuthors;
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public List getListOfAuthors() {
- return listOfAuthors;
- }
-
- public void setListOfAuthors(List listOfAuthors) {
- this.listOfAuthors = listOfAuthors;
- }
-
-}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
deleted file mode 100644
index 18bbbd073e..0000000000
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Author.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.baeldung.spliteratorAPI;
-
-public class Author {
- private String name;
- private int relatedArticleId;
-
- public Author(String name, int relatedArticleId) {
- this.name = name;
- this.relatedArticleId = relatedArticleId;
- }
-
- public int getRelatedArticleId() {
- return relatedArticleId;
- }
-
- public void setRelatedArticleId(int relatedArticleId) {
- this.relatedArticleId = relatedArticleId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return "[name: " + name + ", relatedId: " + relatedArticleId + "]";
- }
-}
-
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
deleted file mode 100644
index dd124948d8..0000000000
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class Executor {
-
- public static int countAutors(Stream stream) {
- RelatedAuthorCounter wordCounter = stream.reduce(new RelatedAuthorCounter(0, true),
- RelatedAuthorCounter::accumulate, RelatedAuthorCounter::combine);
- return wordCounter.getCounter();
- }
-
- public static List generateElements() {
- return Stream.generate(() -> new Article("Java")).limit(35000).collect(Collectors.toList());
- }
-
-}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
deleted file mode 100644
index 06a124cc98..0000000000
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.Spliterator;
-import java.util.concurrent.Callable;
-
-public class Task implements Callable {
- private Spliterator spliterator;
- private final static String SUFFIX = "- published by Baeldung";
-
- public Task(Spliterator spliterator) {
- this.spliterator = spliterator;
- }
-
- @Override
- public String call() {
- int current = 0;
- while (spliterator.tryAdvance(article -> {
- article.setName(article.getName()
- .concat(SUFFIX));
- })) {
- current++;
- }
- ;
- return Thread.currentThread()
- .getName() + ":" + current;
- }
-}
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/monad/MonadSampleUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/monad/MonadSampleUnitTest.java
new file mode 100644
index 0000000000..c851f5f750
--- /dev/null
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/monad/MonadSampleUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.monad;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MonadSampleUnitTest {
+
+ @Test
+ public void whenNotUsingMonad_shouldBeOk() {
+ MonadSample1 test = new MonadSample1();
+ Assert.assertEquals(6.0, test.apply(2), 0.000);
+ }
+
+ @Test
+ public void whenNotUsingMonadButUsingTempVars_shouldBeOk() {
+ MonadSample2 test = new MonadSample2();
+ Assert.assertEquals(6.0, test.apply(2), 0.000);
+ }
+
+ @Test
+ public void whenUsingMonad_shouldBeOk() {
+ MonadSample3 test = new MonadSample3();
+ Assert.assertEquals(6.0, test.apply(2), 0.000);
+ }
+
+ @Test
+ public void whenTestingMonadProperties_shouldBeOk() {
+ MonadSample4 test = new MonadSample4();
+ Assert.assertEquals(true, test.leftIdentity());
+ Assert.assertEquals(true, test.rightIdentity());
+ Assert.assertEquals(true, test.associativity());
+ }
+
+ @Test
+ public void whenBreakingMonadProperties_shouldBeFalse() {
+ MonadSample5 test = new MonadSample5();
+ Assert.assertEquals(false, test.fail());
+ }
+}
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/spliterator/ExecutorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/spliterator/ExecutorUnitTest.java
new file mode 100644
index 0000000000..4628f95481
--- /dev/null
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/spliterator/ExecutorUnitTest.java
@@ -0,0 +1,76 @@
+package com.baeldung.spliterator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ExecutorUnitTest {
+ Article article;
+ Stream stream;
+ Spliterator spliterator;
+
+ @Before
+ public void init() {
+ article = new Article(Arrays.asList(new Author("Ahmad", 0), new Author("Eugen", 0), new Author("Alice", 1), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
+ new Author("Alice", 1), new Author("Mike", 0), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
+ new Author("Mike", 0), new Author("Michał", 0), new Author("Loredana", 1)), 0);
+
+ spliterator = new RelatedAuthorSpliterator(article.getListOfAuthors());
+ }
+
+ @Test
+ public void givenAstreamOfAuthors_whenProcessedInParallelWithCustomSpliterator_coubtProducessRightOutput() {
+ Stream stream2 = StreamSupport.stream(spliterator, true);
+ assertThat(Executor.countAutors(stream2.parallel())).isEqualTo(9);
+ }
+
+ @Test
+ public void givenAStreamOfArticles_whenProcessedSequentiallyWithSpliterator_ProducessRightOutput() {
+ List articles = Stream.generate(() -> new Article("Java"))
+ .limit(35000)
+ .collect(Collectors.toList());
+
+ Spliterator spliterator = articles.spliterator();
+ while (spliterator.tryAdvance(article -> article.setName(article.getName()
+ .concat("- published by Baeldung"))))
+ ;
+
+ articles.forEach(article -> assertThat(article.getName()).isEqualTo("Java- published by Baeldung"));
+ }
+
+ @Test
+ public void givenAStreamOfArticle_whenProcessedUsingTrySplit_thenSplitIntoEqualHalf() {
+ List articles = Stream.generate(() -> new Article("Java"))
+ .limit(35000)
+ .collect(Collectors.toList());
+
+ Spliterator split1 = articles.spliterator();
+ Spliterator split2 = split1.trySplit();
+
+ log.info("Size: " + split1.estimateSize());
+ log.info("Characteristics: " + split1.characteristics());
+
+ List articlesListOne = new ArrayList<>();
+ List articlesListTwo = new ArrayList<>();
+
+ split1.forEachRemaining(articlesListOne::add);
+ split2.forEachRemaining(articlesListTwo::add);
+
+ assertThat(articlesListOne.size()).isEqualTo(17500);
+ assertThat(articlesListTwo.size()).isEqualTo(17500);
+
+ assertThat(articlesListOne).doesNotContainAnyElementsOf(articlesListTwo);
+ }
+}
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
deleted file mode 100644
index 6981898500..0000000000
--- a/core-java-modules/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.baeldung.spliteratorAPI;
-
-import java.util.Arrays;
-import java.util.Spliterator;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static org.assertj.core.api.Assertions.*;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ExecutorUnitTest {
- Article article;
- Stream stream;
- Spliterator spliterator;
- Spliterator split1;
- Spliterator split2;
-
- @Before
- public void init() {
- article = new Article(Arrays.asList(new Author("Ahmad", 0), new Author("Eugen", 0), new Author("Alice", 1),
- new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
- new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
- new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
- new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
- new Author("Mike", 0), new Author("Michał", 0), new Author("Loredana", 1)), 0);
- stream = article.getListOfAuthors().stream();
- split1 = Executor.generateElements().spliterator();
- split2 = split1.trySplit();
- spliterator = new RelatedAuthorSpliterator(article.getListOfAuthors());
- }
-
- @Test
- public void givenAstreamOfAuthors_whenProcessedInParallelWithCustomSpliterator_coubtProducessRightOutput() {
- Stream stream2 = StreamSupport.stream(spliterator, true);
- assertThat(Executor.countAutors(stream2.parallel())).isEqualTo(9);
- }
-
- @Test
- public void givenSpliterator_whenAppliedToAListOfArticle_thenSplittedInHalf() {
- assertThat(new Task(split1).call()).containsSequence(Executor.generateElements().size() / 2 + "");
- assertThat(new Task(split2).call()).containsSequence(Executor.generateElements().size() / 2 + "");
- }
-}
diff --git a/core-java-modules/core-java-9-improvements/pom.xml b/core-java-modules/core-java-9-improvements/pom.xml
index 56d4ccff9f..f6f13ff409 100644
--- a/core-java-modules/core-java-9-improvements/pom.xml
+++ b/core-java-modules/core-java-9-improvements/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-9-improvements
- 0.2-SNAPSHOT
core-java-9-improvements
diff --git a/core-java-modules/core-java-9-jigsaw/README.md b/core-java-modules/core-java-9-jigsaw/README.md
index cfffb86588..73905e6033 100644
--- a/core-java-modules/core-java-9-jigsaw/README.md
+++ b/core-java-modules/core-java-9-jigsaw/README.md
@@ -8,5 +8,5 @@ This module contains articles about Project Jigsaw and the Java Platform Module
- [A Guide to Java 9 Modularity](https://www.baeldung.com/java-9-modularity)
- [Java 9 java.lang.Module API](https://www.baeldung.com/java-9-module-api)
- [Java 9 Illegal Reflective Access Warning](https://www.baeldung.com/java-illegal-reflective-access)
-
+- [Java Modularity and Unit Testing](https://www.baeldung.com/java-modularity-unit-testing)
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core-module.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core-module.sh
new file mode 100644
index 0000000000..fa0d4d5f14
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core-module.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+javac -d mods/com.baeldung.library.core $(find library-core/src/main -name "*.java")
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core-tests.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core-tests.sh
new file mode 100644
index 0000000000..751906103b
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core-tests.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+javac --class-path outDir/library-core/:\
+libs/junit-jupiter-engine-5.9.2.jar:\
+libs/junit-platform-engine-1.9.2.jar:\
+libs/apiguardian-api-1.1.2.jar:\
+libs/junit-jupiter-params-5.9.2.jar:\
+libs/junit-jupiter-api-5.9.2.jar:\
+libs/opentest4j-1.2.0.jar:\
+libs/junit-platform-commons-1.9.2.jar \
+-d outDir/library-test library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core-with-tests.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core-with-tests.sh
new file mode 100644
index 0000000000..c873a9003c
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core-with-tests.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+javac --class-path libs/junit-jupiter-engine-5.9.2.jar:\
+libs/junit-platform-engine-1.9.2.jar:\
+libs/apiguardian-api-1.1.2.jar:\
+libs/junit-jupiter-params-5.9.2.jar:\
+libs/junit-jupiter-api-5.9.2.jar:\
+libs/opentest4j-1.2.0.jar:\
+libs/junit-platform-commons-1.9.2.jar \
+-d outDir/library-core \
+library-core/src/main/java/com/baeldung/library/core/Book.java \
+library-core/src/main/java/com/baeldung/library/core/Library.java \
+library-core/src/main/java/com/baeldung/library/core/Main.java \
+library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core.sh
new file mode 100644
index 0000000000..7531148d0f
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+javac --class-path libs/junit-jupiter-engine-5.9.2.jar:\
+libs/junit-platform-engine-1.9.2.jar:\
+libs/apiguardian-api-1.1.2.jar:\
+libs/junit-jupiter-params-5.9.2.jar:\
+libs/junit-jupiter-api-5.9.2.jar:\
+libs/opentest4j-1.2.0.jar:\
+libs/junit-platform-commons-1.9.2.jar \
+-d outDir/library-core \
+library-core/src/main/java/com/baeldung/library/core/Book.java \
+library-core/src/main/java/com/baeldung/library/core/Library.java \
+library-core/src/main/java/com/baeldung/library/core/Main.java
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-test-module.sh b/core-java-modules/core-java-9-jigsaw/compile-library-test-module.sh
new file mode 100644
index 0000000000..c6fd614fd0
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-test-module.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+javac --module-path mods:libs -d mods/com.baeldung.library.test $(find library-test/src/test -name "*.java")
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/download-junit-dependencies.sh b/core-java-modules/core-java-9-jigsaw/download-junit-dependencies.sh
new file mode 100644
index 0000000000..64c72a5429
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/download-junit-dependencies.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+wget -P libs/ https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/1.9.2/junit-platform-commons-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/1.9.2/junit-platform-engine-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/1.9.2/junit-platform-reporting-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console/1.9.2/junit-platform-console-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/1.9.2/junit-platform-launcher-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.9.2/junit-jupiter-engine-5.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/5.9.2/junit-jupiter-params-5.9.2.jar
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/pom.xml b/core-java-modules/core-java-9-jigsaw/library-core/pom.xml
new file mode 100644
index 0000000000..b860d89932
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/pom.xml
@@ -0,0 +1,55 @@
+
+
+ 4.0.0
+
+ com.baeldung
+ core-java-9-jigsaw
+ 0.2-SNAPSHOT
+
+
+ library-core
+
+
+ 19
+ 19
+ UTF-8
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.9.2
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.9.2
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+ 9
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.0.0-M5
+
+ false
+
+
+
+
+
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Book.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Book.java
new file mode 100644
index 0000000000..782de8fa10
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Book.java
@@ -0,0 +1,52 @@
+package com.baeldung.library.core;
+
+import java.util.Objects;
+
+public class Book {
+
+ private String title;
+ private String author;
+
+ public Book(String title, String author) {
+ this.title = title;
+ this.author = author;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+
+ @Override
+ public String toString() {
+ return "Book [title=" + title + ", author=" + author + "]";
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final Book book = (Book) o;
+
+ if (!Objects.equals(title, book.title)) {
+ return false;
+ }
+ return Objects.equals(author, book.author);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = title != null ? title.hashCode() : 0;
+ result = 31 * result + (author != null ? author.hashCode() : 0);
+ return result;
+ }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Library.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Library.java
new file mode 100644
index 0000000000..ee2225810d
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Library.java
@@ -0,0 +1,25 @@
+package com.baeldung.library.core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Library {
+
+ private List books = new ArrayList<>();
+
+ public void addBook(Book book) {
+ books.add(book);
+ }
+
+ public List getBooks() {
+ return books;
+ }
+
+ void removeBook(Book book) {
+ books.remove(book);
+ }
+
+ protected void removeBookByAuthor(String author) {
+ books.removeIf(book -> book.getAuthor().equals(author));
+ }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Main.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Main.java
new file mode 100644
index 0000000000..18839602c2
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Main.java
@@ -0,0 +1,16 @@
+package com.baeldung.library.core;
+
+public class Main {
+
+ public static void main(String[] args) {
+ Library library = new Library();
+ library.addBook(new Book("The Lord of the Rings", "J.R.R. Tolkien"));
+ library.addBook(new Book("The Hobbit", "J.R.R. Tolkien"));
+ library.addBook(new Book("The Silmarillion", "J.R.R. Tolkien"));
+ library.addBook(new Book("The Chronicles of Narnia", "C.S. Lewis"));
+ library.addBook(new Book("The Lion, the Witch and the Wardrobe", "C.S. Lewis"));
+ System.out.println("Welcome to our library!");
+ System.out.println("We have the following books:");
+ library.getBooks().forEach(System.out::println);
+ }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/module-info.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/module-info.java
new file mode 100644
index 0000000000..bdf88d8bc9
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.baeldung.library.core {
+ exports com.baeldung.library.core;
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java b/core-java-modules/core-java-9-jigsaw/library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
new file mode 100644
index 0000000000..20a4889e8c
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.library.core;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class LibraryUnitTest {
+
+ @Test
+ void givenEmptyLibrary_whenAddABook_thenLibraryHasOneBook() {
+ Library library = new Library();
+ Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+ library.addBook(theLordOfTheRings);
+ int expected = 1;
+ int actual = library.getBooks().size();
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ void givenTheLibraryWithABook_whenRemoveABook_thenLibraryIsEmpty() {
+ Library library = new Library();
+ Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+ library.addBook(theLordOfTheRings);
+ library.removeBook(theLordOfTheRings);
+ int expected = 0;
+ int actual = library.getBooks().size();
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ void givenTheLibraryWithSeveralBook_whenRemoveABookByAuthor_thenLibraryHasNoBooksByTheAuthor() {
+ Library library = new Library();
+ Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+ Book theHobbit = new Book("The Hobbit", "J.R.R. Tolkien");
+ Book theSilmarillion = new Book("The Silmarillion", "J.R.R. Tolkien");
+ Book theHungerGames = new Book("The Hunger Games", "Suzanne Collins");
+ library.addBook(theLordOfTheRings);
+ library.addBook(theHobbit);
+ library.addBook(theSilmarillion);
+ library.addBook(theHungerGames);
+ library.removeBookByAuthor("J.R.R. Tolkien");
+ int expected = 1;
+ int actual = library.getBooks().size();
+ assertEquals(expected, actual);
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/LibraryUnitTest.java b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/LibraryUnitTest.java
new file mode 100644
index 0000000000..31eae89bba
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/LibraryUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.library.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.baeldung.library.core.Book;
+import com.baeldung.library.core.Library;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.junit.jupiter.api.Test;
+
+class LibraryUnitTest {
+
+ @Test
+ void givenEmptyLibrary_whenAddABook_thenLibraryHasOneBook() {
+ Library library = new Library();
+ Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+ library.addBook(theLordOfTheRings);
+ int expected = 1;
+ int actual = library.getBooks().size();
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ void givenTheLibraryWithABook_whenRemoveABook_thenLibraryIsEmpty()
+ throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ Library library = new Library();
+ Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+ library.addBook(theLordOfTheRings);
+ Method removeBook = Library.class.getDeclaredMethod("removeBook", Book.class);
+ removeBook.setAccessible(true);
+ removeBook.invoke(library, theLordOfTheRings);
+ int expected = 0;
+ int actual = library.getBooks().size();
+ assertEquals(expected, actual);
+ }
+@Test
+void givenTheLibraryWithSeveralBook_whenRemoveABookByAuthor_thenLibraryHasNoBooksByTheAuthor() {
+ TestLibrary library = new TestLibrary();
+ Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+ Book theHobbit = new Book("The Hobbit", "J.R.R. Tolkien");
+ Book theSilmarillion = new Book("The Silmarillion", "J.R.R. Tolkien");
+ Book theHungerGames = new Book("The Hunger Games", "Suzanne Collins");
+ library.addBook(theLordOfTheRings);
+ library.addBook(theHobbit);
+ library.addBook(theSilmarillion);
+ library.addBook(theHungerGames);
+ library.removeBookByAuthor("J.R.R. Tolkien");
+ int expected = 1;
+ int actual = library.getBooks().size();
+ assertEquals(expected, actual);
+}
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/TestLibrary.java b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/TestLibrary.java
new file mode 100644
index 0000000000..8ee3b0e3fe
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/TestLibrary.java
@@ -0,0 +1,10 @@
+package com.baeldung.library.test;
+
+import com.baeldung.library.core.Library;
+
+public class TestLibrary extends Library {
+ @Override
+ public void removeBookByAuthor(final String author) {
+ super.removeBookByAuthor(author);
+ }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/module-info.java b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/module-info.java
new file mode 100644
index 0000000000..8d60b574f2
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/module-info.java
@@ -0,0 +1,5 @@
+module com.baeldung.library.test {
+ requires com.baeldung.library.core;
+ requires org.junit.jupiter.api;
+ opens com.baeldung.library.test to org.junit.platform.commons;
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/pom.xml b/core-java-modules/core-java-9-jigsaw/pom.xml
index a26a88f4b0..288254b9cf 100644
--- a/core-java-modules/core-java-9-jigsaw/pom.xml
+++ b/core-java-modules/core-java-9-jigsaw/pom.xml
@@ -4,8 +4,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-9-jigsaw
- 0.2-SNAPSHOT
core-java-9-jigsaw
+ pom
+
+ library-core
+
com.baeldung
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-core-module-with-patch.sh b/core-java-modules/core-java-9-jigsaw/run-library-core-module-with-patch.sh
new file mode 100644
index 0000000000..70772a3589
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-core-module-with-patch.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+java --module-path mods:libs \
+--add-modules com.baeldung.library.core \
+--add-opens com.baeldung.library.core/com.baeldung.library.core=org.junit.platform.commons \
+--add-reads com.baeldung.library.core=org.junit.jupiter.api \
+--patch-module com.baeldung.library.core=outDir/library-test \
+--module org.junit.platform.console --select-class com.baeldung.library.core.LibraryUnitTest
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-core-module.sh b/core-java-modules/core-java-9-jigsaw/run-library-core-module.sh
new file mode 100644
index 0000000000..f2bb976512
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-core-module.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+java --module-path mods --module com.baeldung.library.core/com.baeldung.library.core.Main
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-test-class-path.sh b/core-java-modules/core-java-9-jigsaw/run-library-test-class-path.sh
new file mode 100644
index 0000000000..73e3d504bf
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-test-class-path.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+java --module-path libs \
+org.junit.platform.console.ConsoleLauncher \
+--classpath ./outDir/library-core \
+--select-class com.baeldung.library.core.LibraryUnitTest
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-test-module-path.sh b/core-java-modules/core-java-9-jigsaw/run-library-test-module-path.sh
new file mode 100644
index 0000000000..08d149dbd7
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-test-module-path.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+java --module-path mods:libs \
+--add-modules com.baeldung.library.test \
+--add-opens com.baeldung.library.core/com.baeldung.library.core=com.baeldung.library.test \
+org.junit.platform.console.ConsoleLauncher --select-class com.baeldung.library.test.LibraryUnitTest
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-new-features/pom.xml b/core-java-modules/core-java-9-new-features/pom.xml
index 78ffaff010..6821c9c340 100644
--- a/core-java-modules/core-java-9-new-features/pom.xml
+++ b/core-java-modules/core-java-9-new-features/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-9-new-features
- 0.2-SNAPSHOT
core-java-9-new-features
diff --git a/core-java-modules/core-java-9-streams/pom.xml b/core-java-modules/core-java-9-streams/pom.xml
index d3f81780d1..903194b3b3 100644
--- a/core-java-modules/core-java-9-streams/pom.xml
+++ b/core-java-modules/core-java-9-streams/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-9-streams
- 0.1.0-SNAPSHOT
core-java-9-streams
jar
diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md
index 38965d88f1..bd7df0c8a6 100644
--- a/core-java-modules/core-java-9/README.md
+++ b/core-java-modules/core-java-9/README.md
@@ -5,7 +5,6 @@ This module contains articles about Java 9 core features
### Relevant Articles:
- [Method Handles in Java](https://www.baeldung.com/java-method-handles)
-- [Introduction to Chronicle Queue](https://www.baeldung.com/java-chronicle-queue)
- [Iterate Through a Range of Dates in Java](https://www.baeldung.com/java-iterate-date-range)
- [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
- [Immutable ArrayList in Java](https://www.baeldung.com/java-immutable-list)
diff --git a/core-java-modules/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml
index 272af327cb..bcfdacdf1d 100644
--- a/core-java-modules/core-java-9/pom.xml
+++ b/core-java-modules/core-java-9/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-9
- 0.2-SNAPSHOT
core-java-9
diff --git a/core-java-modules/core-java-annotations/pom.xml b/core-java-modules/core-java-annotations/pom.xml
index a1f84ab563..6b1b9d802f 100644
--- a/core-java-modules/core-java-annotations/pom.xml
+++ b/core-java-modules/core-java-annotations/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-annotations
- 0.1.0-SNAPSHOT
core-java-annotations
jar
@@ -24,4 +23,12 @@
+
+
+ javax.annotation
+ javax.annotation-api
+ 1.3.2
+
+
+
\ No newline at end of file
diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java
index aad7cf49eb..d0a325a155 100644
--- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java
+++ b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java
@@ -17,7 +17,7 @@ public class ClassWithSuppressWarningsNames implements Serializable {
list.add(Integer.valueOf(value));
}
- @SuppressWarnings("deprecated")
+ @SuppressWarnings("deprecation")
void suppressDeprecatedWarning() {
ClassWithSuppressWarningsNames cls = new ClassWithSuppressWarningsNames();
cls.deprecatedMethod(); // no warning here
diff --git a/core-java-modules/core-java-arrays-convert/README.md b/core-java-modules/core-java-arrays-convert/README.md
index b28b97cb09..4365fd12f9 100644
--- a/core-java-modules/core-java-arrays-convert/README.md
+++ b/core-java-modules/core-java-arrays-convert/README.md
@@ -6,3 +6,4 @@ This module contains articles about arrays conversion in Java
- [Convert a Float to a Byte Array in Java](https://www.baeldung.com/java-convert-float-to-byte-array)
- [Converting Between Stream and Array in Java](https://www.baeldung.com/java-stream-to-array)
- [Convert a Byte Array to a Numeric Representation in Java](https://www.baeldung.com/java-byte-array-to-number)
+- [Converting a String Array Into an int Array in Java](https://www.baeldung.com/java-convert-string-array-to-int-array)
diff --git a/core-java-modules/core-java-arrays-convert/src/test/java/com/baeldung/array/conversions/StringArrayToIntArrayUnitTest.java b/core-java-modules/core-java-arrays-convert/src/test/java/com/baeldung/array/conversions/StringArrayToIntArrayUnitTest.java
new file mode 100644
index 0000000000..3675778f90
--- /dev/null
+++ b/core-java-modules/core-java-arrays-convert/src/test/java/com/baeldung/array/conversions/StringArrayToIntArrayUnitTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.array.conversions;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+
+public class StringArrayToIntArrayUnitTest {
+ private final String[] stringArray = new String[] { "1", "2", "3", "4", "5", "6", "42" };
+ private final int[] expected = new int[] { 1, 2, 3, 4, 5, 6, 42 };
+
+ private final String[] stringArrayWithInvalidNum = new String[] { "1", "2", "hello", "4", "world", "6", "42" };
+ private final int[] expectedWithInvalidInput = new int[] { 1, 2, Integer.MIN_VALUE, 4, Integer.MIN_VALUE, 6, 42 };
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Test
+ void givenStringArray_whenUseStreamApi_shouldGetExpectedIntArray() {
+ int[] result = Arrays.stream(stringArray).mapToInt(Integer::parseInt).toArray();
+ assertArrayEquals(expected, result);
+ }
+
+ @Test
+ void givenStringArrayWithInvalidNum_whenUseStreamApi_shouldGetExpectedIntArray() {
+ int[] result = Arrays.stream(stringArrayWithInvalidNum).mapToInt(s -> {
+ try {
+ return Integer.parseInt(s);
+ } catch (NumberFormatException ex) {
+ logger.warn("Invalid number format detected: {}, use Int.MinValue as the fallback", s);
+ return Integer.MIN_VALUE;
+ }
+ }).toArray();
+ assertArrayEquals(expectedWithInvalidInput, result);
+ }
+
+ @Test
+ void givenStringArray_whenConvertInLoop_shouldGetExpectedIntArray() {
+ int[] result = new int[stringArray.length];
+ for (int i = 0; i < stringArray.length; i++) {
+ result[i] = Integer.parseInt(stringArray[i]);
+ }
+ assertArrayEquals(expected, result);
+ }
+
+ @Test
+ void givenStringArrayWithInvalidNum_whenConvertInLoop_shouldGetExpectedIntArray() {
+ int[] result = new int[stringArrayWithInvalidNum.length];
+ for (int i = 0; i < stringArrayWithInvalidNum.length; i++) {
+ try {
+ result[i] = Integer.parseInt(stringArrayWithInvalidNum[i]);
+ } catch (NumberFormatException exception) {
+ logger.warn("Invalid number format detected: [{}], use Int.MinValue as the fallback", stringArrayWithInvalidNum[i]);
+ result[i] = Integer.MIN_VALUE;
+ }
+ }
+
+ assertArrayEquals(expectedWithInvalidInput, result);
+ }
+}
diff --git a/core-java-modules/core-java-arrays-guides/README.md b/core-java-modules/core-java-arrays-guides/README.md
index ed10df5b00..0af77980af 100644
--- a/core-java-modules/core-java-arrays-guides/README.md
+++ b/core-java-modules/core-java-arrays-guides/README.md
@@ -5,7 +5,7 @@ This module contains complete guides about arrays in Java
### Relevant Articles:
- [Arrays in Java: A Reference Guide](https://www.baeldung.com/java-arrays-guide)
- [Guide to the java.util.Arrays Class](https://www.baeldung.com/java-util-arrays)
-- [What is [Ljava.lang.Object;?](https://www.baeldung.com/java-tostring-array)
+- [What Is [Ljava.lang.Object;?](https://www.baeldung.com/java-tostring-array)
- [Guide to ArrayStoreException](https://www.baeldung.com/java-arraystoreexception)
- [Creating a Generic Array in Java](https://www.baeldung.com/java-generic-array)
- [Maximum Size of Java Arrays](https://www.baeldung.com/java-arrays-max-size)
diff --git a/core-java-modules/core-java-arrays-multidimensional/README.md b/core-java-modules/core-java-arrays-multidimensional/README.md
index d92747a4fb..d162eca24a 100644
--- a/core-java-modules/core-java-arrays-multidimensional/README.md
+++ b/core-java-modules/core-java-arrays-multidimensional/README.md
@@ -3,5 +3,5 @@
This module contains articles about multidimensional arrays in Java
### Relevant Articles:
-- [Multi-Dimensional Arrays In Java](https://www.baeldung.com/java-jagged-arrays)
-- [Looping Diagonally Through a 2d Java Array](https://www.baeldung.com/java-loop-diagonal-array)
\ No newline at end of file
+- [Multi-Dimensional Arrays in Java](https://www.baeldung.com/java-jagged-arrays)
+- [Looping Diagonally Through a 2d Java Array](https://www.baeldung.com/java-loop-diagonal-array)
diff --git a/core-java-modules/core-java-arrays-operations-advanced/README.md b/core-java-modules/core-java-arrays-operations-advanced/README.md
index f0d3d1fd93..1f55338644 100644
--- a/core-java-modules/core-java-arrays-operations-advanced/README.md
+++ b/core-java-modules/core-java-arrays-operations-advanced/README.md
@@ -7,7 +7,8 @@ This module contains articles about advanced operations on arrays in Java. They
- [How to Copy an Array in Java](https://www.baeldung.com/java-array-copy)
- [Arrays.deepEquals](https://www.baeldung.com/java-arrays-deepequals)
- [Find Sum and Average in a Java Array](https://www.baeldung.com/java-array-sum-average)
-- [Intersection Between two Integer Arrays](https://www.baeldung.com/java-array-intersection)
+- [Intersection Between Two Integer Arrays](https://www.baeldung.com/java-array-intersection)
- [Comparing Arrays in Java](https://www.baeldung.com/java-comparing-arrays)
- [Concatenate Two Arrays in Java](https://www.baeldung.com/java-concatenate-arrays)
- [Performance of System.arraycopy() vs. Arrays.copyOf()](https://www.baeldung.com/java-system-arraycopy-arrays-copyof-performance)
+- [Slicing Arrays in Java](https://www.baeldung.com/java-slicing-arrays)
diff --git a/core-java-modules/core-java-arrays-operations-advanced/src/main/java/com/baeldung/arrayconcat/CombiningByteArrays.java b/core-java-modules/core-java-arrays-operations-advanced/src/main/java/com/baeldung/arrayconcat/CombiningByteArrays.java
new file mode 100644
index 0000000000..d05cafc677
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-advanced/src/main/java/com/baeldung/arrayconcat/CombiningByteArrays.java
@@ -0,0 +1,49 @@
+package com.baeldung.arrayconcat;
+
+import com.google.common.primitives.Bytes;
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.nio.ByteBuffer;
+
+public class CombiningByteArrays {
+
+ public byte[] combineArraysUsingArrayCopy(byte[] first, byte[] second) {
+ byte[] combined = new byte[first.length + second.length];
+
+ System.arraycopy(first, 0, combined, 0, first.length);
+ System.arraycopy(second, 0, combined, first.length, second.length);
+ return combined;
+ }
+
+ public byte[] combineArraysUsingByteBuffer(byte[] first, byte[] second, byte[] third) {
+ byte[] combined = new byte[first.length + second.length + third.length];
+
+ ByteBuffer buffer = ByteBuffer.wrap(combined);
+ buffer.put(first);
+ buffer.put(second);
+ buffer.put(third);
+ return buffer.array();
+ }
+
+ public byte[] combineArraysUsingCustomMethod(byte[] first, byte[] second) {
+ byte[] combined = new byte[first.length + second.length];
+
+ for (int i = 0; i < combined.length; ++i) {
+ combined[i] = i < first.length ? first[i] : second[i - first.length];
+ }
+ return combined;
+ }
+
+ public byte[] combineArraysUsingGuava(byte[] first, byte[] second, byte[] third) {
+ byte[] combined = Bytes.concat(first, second, third);
+
+ return combined;
+ }
+
+ public byte[] combineArraysUsingApacheCommons(byte[] first, byte[] second) {
+ byte[] combined = ArrayUtils.addAll(first, second);
+
+ return combined;
+ }
+
+}
diff --git a/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arrayconcat/CombiningByteArraysUnitTest.java b/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arrayconcat/CombiningByteArraysUnitTest.java
new file mode 100644
index 0000000000..2aa06b7570
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arrayconcat/CombiningByteArraysUnitTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.arrayconcat;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertArrayEquals;
+
+public class CombiningByteArraysUnitTest {
+
+ CombiningByteArrays combiningByteArrays;
+
+ @Before
+ public void init() {
+ combiningByteArrays = new CombiningByteArrays();
+ }
+
+ @Test
+ public void givenTwoArrays_whenCombinedUsingArraysCopy_thenArrayContainingAllElementsMustBeReturned() {
+ byte[] first = {69, 121, 101, 45, 62, 118, 114};
+ byte[] second = {58, 120, 100, 46, 64, 114, 103, 117};
+
+ byte[] combined = combiningByteArrays.combineArraysUsingArrayCopy(first, second);
+
+ byte[] expectedArray = {69, 121, 101, 45, 62, 118, 114, 58, 120, 100, 46, 64, 114, 103, 117};
+ assertArrayEquals(expectedArray, combined);
+ }
+
+ @Test
+ public void givenTwoArrays_whenCombinedUsingByteBuffer_thenArrayContainingAllElementsMustBeReturned() {
+ byte[] first = {69, 121, 101, 45};
+ byte[] second = {64, 114, 103, 117};
+ byte[] third = {11, 22, 33};
+
+ byte[] combined = combiningByteArrays.combineArraysUsingByteBuffer(first, second, third);
+
+ byte[] expectedArray = {69, 121, 101, 45, 64, 114, 103, 117, 11, 22, 33};
+ assertArrayEquals(expectedArray, combined);
+ }
+
+ @Test
+ public void givenTwoArrays_whenCombinedUsingCustomMethod_thenArrayContainingAllElementsMustBeReturned() {
+ byte[] first = {101, 45, 62 };
+ byte[] second = {58, 120, 100, 46, 64, 114};
+
+ byte[] combined = combiningByteArrays.combineArraysUsingCustomMethod(first, second);
+
+ byte[] expectedArray = {101, 45, 62, 58, 120, 100, 46, 64, 114};
+ assertArrayEquals(expectedArray, combined);
+ }
+
+ @Test
+ public void givenTwoArrays_whenCombinedUsingGuava_thenArrayContainingAllElementsMustBeReturned() {
+ byte[] first = {69, 121, 101, 118, 114};
+ byte[] second = {58, 120, 114, 103, 117};
+ byte[] third = {11, 22, 33};
+
+ byte[] combined = combiningByteArrays.combineArraysUsingGuava(first, second, third);
+
+ byte[] expectedArray = {69, 121, 101, 118, 114, 58, 120, 114, 103, 117, 11, 22, 33};
+ assertArrayEquals(expectedArray, combined);
+ }
+
+ @Test
+ public void givenTwoArrays_whenCombinedUsingApacheCommons_thenArrayContainingAllElementsMustBeReturned() {
+ byte[] first = {45, 62, 114};
+ byte[] second = {58, 120, 100};
+
+ byte[] combined = combiningByteArrays.combineArraysUsingApacheCommons(first, second);
+
+ byte[] expectedArray = {45, 62, 114, 58, 120, 100};
+ assertArrayEquals(expectedArray, combined);
+ }
+}
diff --git a/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arrayslicing/SlicingArrayUnitTest.java b/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arrayslicing/SlicingArrayUnitTest.java
new file mode 100644
index 0000000000..b8ed21ed41
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arrayslicing/SlicingArrayUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.arrayslicing;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+public class SlicingArrayUnitTest {
+ private static final String[] LANGUAGES = new String[] { "Python", "Java", "Kotlin", "Scala", "Ruby", "Go", "Rust" };
+ private static final String[] JVM_LANGUAGES = new String[] { "Java", "Kotlin", "Scala" };
+
+ @Test
+ void givenAnArray_whenSlicingUsingStream_shouldGetExpectedResult() {
+ String[] result = Arrays.stream(LANGUAGES, 1, 4).toArray(String[]::new);
+ assertArrayEquals(JVM_LANGUAGES, result);
+ }
+
+ @Test
+ void givenAnArray_whenSlicingUsingArraysCopyOfRange_shouldGetExpectedResult() {
+ String[] result = Arrays.copyOfRange(LANGUAGES, 1, 4);
+ assertArrayEquals(JVM_LANGUAGES, result);
+ }
+
+
+ @Test
+ void givenAnArray_whenSlicingUsingSystemArraycopy_shouldGetExpectedResult() {
+ String[] result = new String[3];
+ System.arraycopy(LANGUAGES, 1, result, 0, 3);
+ assertArrayEquals(JVM_LANGUAGES, result);
+
+ String[] result2 = new String[] { "value one", "value two", "value three", "value four", "value five", "value six", "value seven" };
+ System.arraycopy(LANGUAGES, 1, result2, 2, 3);
+ assertArrayEquals(new String[] { "value one", "value two", "Java", "Kotlin", "Scala", "value six", "value seven" }, result2);
+ }
+
+ @Test
+ void givenAnArray_whenSlicingUsingArrayUtils_shouldGetExpectedResult() {
+ String[] result = ArrayUtils.subarray(LANGUAGES, 1, 4);
+ assertArrayEquals(JVM_LANGUAGES, result);
+ }
+}
diff --git a/core-java-modules/core-java-arrays-operations-basic/README.md b/core-java-modules/core-java-arrays-operations-basic/README.md
index ca81c23c98..76f4044355 100644
--- a/core-java-modules/core-java-arrays-operations-basic/README.md
+++ b/core-java-modules/core-java-arrays-operations-basic/README.md
@@ -10,3 +10,6 @@ This module contains articles about Java array fundamentals. They assume no prev
- [Removing an Element from an Array in Java](https://www.baeldung.com/java-array-remove-element)
- [Removing the First Element of an Array](https://www.baeldung.com/java-array-remove-first-element)
- [Extending an Array’s Length](https://www.baeldung.com/java-array-add-element-at-the-end)
+- [Initializing a Boolean Array in Java](https://www.baeldung.com/java-initializing-boolean-array)
+- [Find the Index of an Element in a Java Array](https://www.baeldung.com/java-array-find-index)
+- [Comparing Two Byte Arrays in Java](https://www.baeldung.com/java-comparing-byte-arrays)
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/main/java/com/baeldung/arrayindex/ArrayIndex.java b/core-java-modules/core-java-arrays-operations-basic/src/main/java/com/baeldung/arrayindex/ArrayIndex.java
new file mode 100644
index 0000000000..596e0d424f
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/main/java/com/baeldung/arrayindex/ArrayIndex.java
@@ -0,0 +1,28 @@
+package com.baeldung.arrayindex;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+class ArrayIndex {
+ static int forLoop(int[] numbers, int target) {
+ for (int index = 0; index < numbers.length; index++) {
+ if (numbers[index] == target) {
+ return index;
+ }
+ }
+ return -1;
+ }
+
+ static int listIndexOf(Integer[] numbers, int target) {
+ List list = Arrays.asList(numbers);
+ return list.indexOf(target);
+ }
+
+ static int intStream(int[] numbers, int target) {
+ return IntStream.range(0, numbers.length)
+ .filter(i -> numbers[i] == target)
+ .findFirst()
+ .orElse(-1);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/compare/CompareByteArraysUnitTest.java b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/compare/CompareByteArraysUnitTest.java
new file mode 100644
index 0000000000..4274acf83d
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/compare/CompareByteArraysUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.array.compare;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+public class CompareByteArraysUnitTest {
+ private final static String INPUT = "I am a magic string.";
+ private final static byte[] ARRAY1 = INPUT.getBytes();
+ private final static byte[] ARRAY2 = INPUT.getBytes();
+
+ @Test
+ void whenUsingEqualsSign_thenTwoArraysAreNotEqual() {
+ assertFalse(ARRAY1 == ARRAY2);
+ }
+
+ @Test
+ void whenUsingEquals_thenTwoArraysAreNotEqual() {
+ assertFalse(ARRAY1.equals(ARRAY2));
+ }
+
+ @Test
+ void whenUsingArrayEquals_thenTwoArraysAreEqual() {
+ assertTrue(Arrays.equals(ARRAY1, ARRAY2));
+ }
+
+ @Test
+ void whenComparingStringArrays_thenGetExpectedResult() {
+ String[] strArray1 = new String[] { "Java", "is", "great" };
+ String[] strArray2 = new String[] { "Java", "is", "great" };
+
+ assertFalse(strArray1 == strArray2);
+ assertFalse(strArray1.equals(strArray2));
+ assertTrue(Arrays.equals(strArray1, strArray2));
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/initbooleanarray/InitBooleanArrayUnitTest.java b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/initbooleanarray/InitBooleanArrayUnitTest.java
new file mode 100644
index 0000000000..86766ad80d
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/initbooleanarray/InitBooleanArrayUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.array.initbooleanarray;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+public class InitBooleanArrayUnitTest {
+ @Test
+ void whenInitPrimitiveBooleanArray_shouldGetExpectedArray() {
+ boolean[] expected = { false, false, false, false, false };
+ boolean[] myArray = new boolean[5];
+ assertArrayEquals(expected, myArray);
+ }
+
+ @Test
+ void whenInitPrimitiveBooleanArrayAndUseArrayFill_shouldGetExpectedArray() {
+ boolean[] expected = { true, true, true, true, true };
+ boolean[] myArray = new boolean[5];
+ Arrays.fill(myArray, true);
+ assertArrayEquals(expected, myArray);
+ }
+
+ @Test
+ void whenInitBooleanArray_shouldGetExpectedArray() {
+ Boolean[] expectedAllNull = { null, null, null, null, null };
+ Boolean[] myNullArray = new Boolean[5];
+ assertArrayEquals(expectedAllNull, myNullArray);
+
+ Boolean[] expectedAllFalse = { false, false, false, false, false };
+ Boolean[] myFalseArray = new Boolean[5];
+ Arrays.fill(myFalseArray, false);
+ assertArrayEquals(expectedAllFalse, myFalseArray);
+
+ Boolean[] expectedAllTrue = { true, true, true, true, true };
+ Boolean[] myTrueArray = new Boolean[5];
+ Arrays.fill(myTrueArray, true);
+ assertArrayEquals(expectedAllTrue, myTrueArray);
+ }
+}
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/isobjectarray/CheckObjectIsArrayUnitTest.java b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/isobjectarray/CheckObjectIsArrayUnitTest.java
new file mode 100644
index 0000000000..ed38ab0765
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/isobjectarray/CheckObjectIsArrayUnitTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.array.isobjectarray;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Array;
+
+import org.junit.jupiter.api.Test;
+
+public class CheckObjectIsArrayUnitTest {
+ private static final Object ARRAY_INT = new int[] { 1, 2, 3, 4, 5 };
+ private static final Object ARRAY_PERSON = new Person[] { new Person("Jackie Chan", "Hong Kong"), new Person("Tom Hanks", "United States") };
+
+ boolean isArray(Object obj) {
+ return obj instanceof Object[] || obj instanceof boolean[] || obj instanceof byte[] || obj instanceof short[] || obj instanceof char[] || obj instanceof int[] || obj instanceof long[] || obj instanceof float[] || obj instanceof double[];
+ }
+
+ @Test
+ void givenAnArrayObject_whenUsingInstanceof_getExpectedResult() {
+ assertTrue(ARRAY_PERSON instanceof Object[]);
+ assertFalse(ARRAY_INT instanceof Object[]);
+ assertTrue(ARRAY_INT instanceof int[]);
+ }
+
+ @Test
+ void givenAnArrayObject_whenUsingOurIsArray_getExpectedResult() {
+ assertTrue(isArray(ARRAY_PERSON));
+ assertTrue(isArray(ARRAY_INT));
+ }
+
+ @Test
+ void givenAnArrayObject_whenUsingClassIsArray_getExpectedResult() {
+ assertTrue(ARRAY_INT.getClass()
+ .isArray());
+ assertTrue(ARRAY_PERSON.getClass()
+ .isArray());
+
+ assertEquals(Person.class, ARRAY_PERSON.getClass()
+ .getComponentType());
+ assertEquals(int.class, ARRAY_INT.getClass()
+ .getComponentType());
+
+ }
+
+ @Test
+ void givenAnArrayObject_whenUsingArrayGet_getExpectedElement() {
+ if (ARRAY_PERSON.getClass()
+ .isArray() && ARRAY_PERSON.getClass()
+ .getComponentType() == Person.class) {
+ Person person = (Person) Array.get(ARRAY_PERSON, 1);
+ assertEquals("Tom Hanks", person.getName());
+ }
+ if (ARRAY_INT.getClass()
+ .isArray() && ARRAY_INT.getClass()
+ .getComponentType() == int.class) {
+ assertEquals(2, ((int) Array.get(ARRAY_INT, 1)));
+ }
+ }
+}
+
+class Person {
+ private String name;
+ private String Location;
+
+ public Person(String name, String location) {
+ this.name = name;
+ this.Location = location;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getLocation() {
+ return Location;
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/arrayindex/ArrayIndexUnitTest.java b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/arrayindex/ArrayIndexUnitTest.java
new file mode 100644
index 0000000000..84c868d5e0
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/arrayindex/ArrayIndexUnitTest.java
@@ -0,0 +1,106 @@
+package com.baeldung.arrayindex;
+
+import static com.baeldung.arrayindex.ArrayIndex.forLoop;
+import static com.baeldung.arrayindex.ArrayIndex.intStream;
+import static com.baeldung.arrayindex.ArrayIndex.listIndexOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.jupiter.api.Test;
+
+import com.google.common.primitives.Ints;
+
+class ArrayIndexUnitTest {
+
+ @Test
+ void givenIntegerArray_whenUseForLoop_thenWillGetElementIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(2, forLoop(numbers, 30));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseForLoop_thenWillGetElementMinusOneIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, forLoop(numbers, 100));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseIndexOf_thenWillGetElementIndex() {
+ Integer[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(2, listIndexOf(numbers, 30));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseIndexOf_thenWillGetElementMinusOneIndex() {
+ Integer[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, listIndexOf(numbers, 100));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseIntStream_thenWillGetElementIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(2, intStream(numbers, 30));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseIntStream_thenWillGetElementMinusOneIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, intStream(numbers, 100));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseBinarySearch_thenWillGetElementIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(2, Arrays.binarySearch(numbers, 30));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseBinarySearch_thenWillGetUpperBoundMinusIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-6, Arrays.binarySearch(numbers, 100));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseBinarySearch_thenWillGetInArrayMinusIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-2, Arrays.binarySearch(numbers, 15));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseBinarySearch_thenWillGetLowerBoundMinusIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, Arrays.binarySearch(numbers, -15));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseApacheCommons_thenWillGetElementIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(2, ArrayUtils.indexOf(numbers, 30));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseApacheCommonsStartingFromIndex_thenWillGetNegativeIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, ArrayUtils.indexOf(numbers, 30, 3));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseApacheCommons_thenWillGetElementMinusOneIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, ArrayUtils.indexOf(numbers, 100));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseGuavaInts_thenWillGetElementIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(2, Ints.indexOf(numbers, 30));
+ }
+
+ @Test
+ void givenIntegerArray_whenUseGuavaInts_thenWillGetElementMinusOneIndex() {
+ int[] numbers = { 10, 20, 30, 40, 50 };
+ assertEquals(-1, Ints.indexOf(numbers, 100));
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-booleans/README.md b/core-java-modules/core-java-booleans/README.md
new file mode 100644
index 0000000000..fe7068c6f4
--- /dev/null
+++ b/core-java-modules/core-java-booleans/README.md
@@ -0,0 +1,6 @@
+## Core Java Booleans
+
+This module contains articles about Java Booleans.
+
+### Relevant Articles:
+- [Convert Boolean to String in Java](https://www.baeldung.com/java-convert-boolean-to-string)
diff --git a/core-java-modules/core-java-booleans/pom.xml b/core-java-modules/core-java-booleans/pom.xml
new file mode 100644
index 0000000000..3b0c28208f
--- /dev/null
+++ b/core-java-modules/core-java-booleans/pom.xml
@@ -0,0 +1,16 @@
+
+
+ 4.0.0
+ core-java-booleans
+ core-java-booleans
+ jar
+
+
+ com.baeldung.core-java-modules
+ core-java-modules
+ 0.0.1-SNAPSHOT
+
+
+
\ No newline at end of file
diff --git a/core-java-modules/core-java-booleans/src/test/java/com/baeldung/booleans/BooleanToStringUnitTest.java b/core-java-modules/core-java-booleans/src/test/java/com/baeldung/booleans/BooleanToStringUnitTest.java
new file mode 100644
index 0000000000..e20cc3508f
--- /dev/null
+++ b/core-java-modules/core-java-booleans/src/test/java/com/baeldung/booleans/BooleanToStringUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.booleans;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class BooleanToStringUnitTest {
+ String optionToString(String optionName, boolean optionValue) {
+ return String.format("The option '%s' is %s.", optionName, optionValue ? "Enabled" : "Disabled");
+ }
+
+ @Test
+ void givenPrimitiveBoolean_whenConvertingUsingTernaryOperator_thenSuccess() {
+ boolean primitiveBoolean = true;
+ assertEquals("true", primitiveBoolean ? "true" : "false");
+
+ primitiveBoolean = false;
+ assertEquals("false", primitiveBoolean ? "true" : "false");
+
+ assertEquals("The option 'IgnoreWarnings' is Enabled.", optionToString("IgnoreWarnings", true));
+ }
+
+
+ @Test
+ void givenBooleanObject_whenConvertingUsingBooleanToString_thenSuccess() {
+ Boolean myBoolean = Boolean.TRUE;
+ assertEquals("true", myBoolean.toString());
+
+ myBoolean = Boolean.FALSE;
+ assertEquals("false", myBoolean.toString());
+
+ Boolean nullBoolean = null;
+ assertThrows(NullPointerException.class, () -> nullBoolean.toString());
+ }
+
+ @Test
+ void givenBooleanObject_whenConvertingUsingStringValueOf_thenSuccess() {
+ Boolean myBoolean = Boolean.TRUE;
+ assertEquals("true", String.valueOf(myBoolean));
+
+ myBoolean = Boolean.FALSE;
+ assertEquals("false", String.valueOf(myBoolean));
+
+ Boolean nullBoolean = null;
+ assertEquals("null", String.valueOf(nullBoolean));
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-char/README.md b/core-java-modules/core-java-char/README.md
index 5f33aa6914..e4af3121c5 100644
--- a/core-java-modules/core-java-char/README.md
+++ b/core-java-modules/core-java-char/README.md
@@ -4,3 +4,4 @@ This module contains articles about Java Character Class
### Relevant Articles:
- [Character#isAlphabetic vs. Character#isLetter](https://www.baeldung.com/java-character-isletter-isalphabetic)
+- [Difference Between Java’s “char” and “String”](https://www.baeldung.com/java-char-vs-string)
diff --git a/core-java-modules/core-java-char/pom.xml b/core-java-modules/core-java-char/pom.xml
index 7dc0923fb5..eb6cbee952 100644
--- a/core-java-modules/core-java-char/pom.xml
+++ b/core-java-modules/core-java-char/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-char
- 0.1.0-SNAPSHOT
core-java-char
jar
diff --git a/core-java-modules/core-java-char/src/test/java/com/baeldung/charandstring/DifferenceBetweenCharAndStringUnitTest.java b/core-java-modules/core-java-char/src/test/java/com/baeldung/charandstring/DifferenceBetweenCharAndStringUnitTest.java
new file mode 100644
index 0000000000..b4e1da6d71
--- /dev/null
+++ b/core-java-modules/core-java-char/src/test/java/com/baeldung/charandstring/DifferenceBetweenCharAndStringUnitTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.charandstring;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
+import org.junit.jupiter.api.Test;
+
+public class DifferenceBetweenCharAndStringUnitTest {
+
+ @Test
+ void whenPlusTwoChars_thenGetSumAsInteger() {
+ char h = 'H'; // the value is 72
+ char i = 'i'; // the value is 105
+ assertEquals(177, h + i);
+ assertInstanceOf(Integer.class, h + i);
+ }
+
+ @Test
+ void whenPlusTwoStrings_thenConcatenateThem() {
+ String i = "i";
+ String h = "H";
+ assertEquals("Hi", h + i);
+ }
+
+ @Test
+ void whenPlusCharsAndStrings_thenGetExpectedValues() {
+ char c = 'C';
+ assertEquals("C", "" + c);
+
+ char h = 'H'; // the value is 72
+ char i = 'i'; // the value is 105
+ assertEquals("Hi", "" + h + i);
+ assertEquals("Hi", h + "" + i);
+ assertEquals("177", h + i + "");
+ }
+
+ @Test
+ void whenStringChars_thenGetCharArray() {
+ char h = 'h';
+ char e = 'e';
+ char l = 'l';
+ char o = 'o';
+
+ String hello = "hello";
+ assertEquals(h, hello.charAt(0));
+ assertEquals(e, hello.charAt(1));
+ assertEquals(l, hello.charAt(2));
+ assertEquals(l, hello.charAt(3));
+ assertEquals(o, hello.charAt(4));
+
+ char[] chars = new char[] { h, e, l, l, o };
+ char[] charsFromString = hello.toCharArray();
+ assertArrayEquals(chars, charsFromString);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-2/README.md b/core-java-modules/core-java-collections-2/README.md
index d482ed7773..fa4880bade 100644
--- a/core-java-modules/core-java-collections-2/README.md
+++ b/core-java-modules/core-java-collections-2/README.md
@@ -8,8 +8,9 @@
- [Join and Split Arrays and Collections in Java](https://www.baeldung.com/java-join-and-split)
- [Java – Combine Multiple Collections](https://www.baeldung.com/java-combine-multiple-collections)
- [Combining Different Types of Collections in Java](https://www.baeldung.com/java-combine-collections)
-- [Shuffling Collections In Java](https://www.baeldung.com/java-shuffle-collection)
+- [Shuffling Collections in Java](https://www.baeldung.com/java-shuffle-collection)
- [Sorting in Java](https://www.baeldung.com/java-sorting)
- [Getting the Size of an Iterable in Java](https://www.baeldung.com/java-iterable-size)
- [Java Null-Safe Streams from Collections](https://www.baeldung.com/java-null-safe-streams-from-collections)
- [Differences Between Iterator and Iterable and How to Use Them?](https://www.baeldung.com/java-iterator-vs-iterable)
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections) [[next -->]](/core-java-modules/core-java-collections-3)
diff --git a/core-java-modules/core-java-collections-3/README.md b/core-java-modules/core-java-collections-3/README.md
index 4249d8ad30..4c0657da2d 100644
--- a/core-java-modules/core-java-collections-3/README.md
+++ b/core-java-modules/core-java-collections-3/README.md
@@ -6,7 +6,7 @@
- [Time Comparison of Arrays.sort(Object[]) and Arrays.sort(int[])](https://www.baeldung.com/arrays-sortobject-vs-sortint)
- [Java ArrayList vs Vector](https://www.baeldung.com/java-arraylist-vs-vector)
-- [Differences Between HashMap and Hashtable](https://www.baeldung.com/hashmap-hashtable-differences)
+- [Differences Between HashMap and Hashtable in Java](https://www.baeldung.com/hashmap-hashtable-differences)
- [Differences Between Collection.clear() and Collection.removeAll()](https://www.baeldung.com/java-collection-clear-vs-removeall)
- [Performance of contains() in a HashSet vs ArrayList](https://www.baeldung.com/java-hashset-arraylist-contains-performance)
- [Fail-Safe Iterator vs Fail-Fast Iterator](https://www.baeldung.com/java-fail-safe-vs-fail-fast-iterator)
diff --git a/core-java-modules/core-java-collections-3/pom.xml b/core-java-modules/core-java-collections-3/pom.xml
index 6ef8e3c81a..373dc9db14 100644
--- a/core-java-modules/core-java-collections-3/pom.xml
+++ b/core-java-modules/core-java-collections-3/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-collections-3
- 0.1.0-SNAPSHOT
core-java-collections-3
jar
diff --git a/core-java-modules/core-java-collections-4/README.md b/core-java-modules/core-java-collections-4/README.md
index d8fbafcbe4..460af21179 100644
--- a/core-java-modules/core-java-collections-4/README.md
+++ b/core-java-modules/core-java-collections-4/README.md
@@ -7,6 +7,11 @@
- [ArrayList vs. LinkedList vs. HashMap in Java](https://www.baeldung.com/java-arraylist-vs-linkedlist-vs-hashmap)
- [Java Deque vs. Stack](https://www.baeldung.com/java-deque-vs-stack)
- [Collection.toArray(new T[0]) or .toArray(new T[size])](https://www.baeldung.com/java-collection-toarray-methods)
-- [Create an Empty Map in Java](https://www.baeldung.com/java-create-empty-map)
- [Sorting Objects in a List by Date](https://www.baeldung.com/java-sort-list-by-date)
- [Fixed Size Queue Implementations in Java](https://www.baeldung.com/java-fixed-size-queue)
+- [Difference Between Java Enumeration and Iterator](https://www.baeldung.com/java-enumeration-vs-iterator)
+- [Sort Collection of Objects by Multiple Fields in Java](https://www.baeldung.com/java-sort-collection-multiple-fields)
+- [Guide to Java PriorityQueue](https://www.baeldung.com/java-priorityqueue)
+- [Java Generics PECS – Producer Extends Consumer Super](https://www.baeldung.com/java-generics-pecs)
+- [Reversing a Stack in Java](https://www.baeldung.com/java-reversing-a-stack)
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections-3)
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-4/pom.xml b/core-java-modules/core-java-collections-4/pom.xml
index aaf63a2b2a..1a59411ecb 100644
--- a/core-java-modules/core-java-collections-4/pom.xml
+++ b/core-java-modules/core-java-collections-4/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-collections-4
- 0.1.0-SNAPSHOT
core-java-collections-4
jar
@@ -20,10 +19,22 @@
commons-lang
${commons-lang.version}
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+
+
+ org.junit.platform
+ junit-platform-runner
+ ${junit-platform.version}
+ test
+
2.2
+ 3.12.0
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/ProducerExtendsConsumerSupers.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/ProducerExtendsConsumerSupers.java
new file mode 100644
index 0000000000..3c4b136b09
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/ProducerExtendsConsumerSupers.java
@@ -0,0 +1,59 @@
+package com.baeldung.collections.pecs;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.baeldung.collections.pecs.model.Customer;
+import com.baeldung.collections.pecs.model.Operator;
+import com.baeldung.collections.pecs.model.User;
+
+public class ProducerExtendsConsumerSupers {
+
+ public void producerExtends() {
+ List operators = Arrays.asList(new Operator("sam"), new Operator("daniel"));
+ List customers = Arrays.asList(new Customer("arys"), new Customer("cristiana"));
+
+ // sendEmails(operators); --> will not compile!
+ sendEmailsFixed(operators);
+ sendEmailsFixed(customers);
+ }
+
+ private void sendEmails(List users) {
+ for (User user : users) {
+ System.out.println("sending email to " + user);
+ }
+ }
+
+ private void sendEmailsFixed(List users) {
+ for (User user : users) {
+ System.out.println("sending email to " + user);
+ }
+ }
+
+ public void consumerSupers() {
+ List allOperators = Arrays.asList(new Operator("tom"));
+ List allUsers = Arrays.asList(new Operator("tom"), new Customer("spencer"));
+
+ // addUsersFromMarketingDepartment(allUsers); --> will not compile!
+ addUsersFromMarketingDepartmentFixed(allOperators);
+ addUsersFromMarketingDepartmentFixed(allUsers);
+ }
+
+ private void addUsersFromMarketingDepartment(List users) {
+ users.add(new Operator("john doe"));
+ users.add(new Operator("jane doe"));
+ }
+
+ private void addUsersFromMarketingDepartmentFixed(List users) {
+ users.add(new Operator("john doe"));
+ users.add(new Operator("jane doe"));
+ }
+
+ private void addUsersAndSendEmails(List users) {
+ users.add(new Operator("john doe"));
+ for (User user : users) {
+ System.out.println("sending email to: " + user);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/Customer.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/Customer.java
new file mode 100644
index 0000000000..b3e97deddb
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/Customer.java
@@ -0,0 +1,7 @@
+package com.baeldung.collections.pecs.model;
+
+public class Customer extends User {
+ public Customer(String name) {
+ super(name);
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/Operator.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/Operator.java
new file mode 100644
index 0000000000..e998088496
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/Operator.java
@@ -0,0 +1,7 @@
+package com.baeldung.collections.pecs.model;
+
+public class Operator extends User {
+ public Operator(String name) {
+ super(name);
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/User.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/User.java
new file mode 100644
index 0000000000..a0d9d6a9b7
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/pecs/model/User.java
@@ -0,0 +1,9 @@
+package com.baeldung.collections.pecs.model;
+
+public class User {
+ private final String name;
+
+ public User(String name) {
+ this.name = name;
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/priorityqueue/ColoredNumber.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/priorityqueue/ColoredNumber.java
new file mode 100644
index 0000000000..554a13d642
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/priorityqueue/ColoredNumber.java
@@ -0,0 +1,27 @@
+package com.baeldung.collections.priorityqueue;
+
+public final class ColoredNumber {
+ private int value;
+ private String color;
+
+ public ColoredNumber(int value, String color) {
+ this.value = value;
+ this.color = color;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public void setColor(String color) {
+ this.color = color;
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/priorityqueue/ColoredNumberComparable.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/priorityqueue/ColoredNumberComparable.java
new file mode 100644
index 0000000000..0e9a5ec498
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/priorityqueue/ColoredNumberComparable.java
@@ -0,0 +1,44 @@
+package com.baeldung.collections.priorityqueue;
+
+public final class ColoredNumberComparable implements Comparable {
+ private int value;
+ private String color;
+
+ public ColoredNumberComparable(int value, String color) {
+ this.value = value;
+ this.color = color;
+ }
+
+ @Override
+ public int compareTo(ColoredNumberComparable o) {
+ // (both numbers are red) or (both numbers are not red)
+ if ((this.color.equals("red") && o.color.equals("red")) ||
+ (!this.color.equals("red") && !o.color.equals("red"))) {
+ return Integer.compare(this.value, o.value);
+ }
+ // only the first number is red
+ else if (this.color.equals("red")) {
+ return -1;
+ }
+ // only the second number is red
+ else {
+ return 1;
+ }
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public void setColor(String color) {
+ this.color = color;
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java
index a9e7bc8a38..83466a7208 100644
--- a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/Employee.java
@@ -2,8 +2,11 @@ package com.baeldung.collections.sorting;
import java.util.Date;
+import javax.annotation.Nonnull;
+
public class Employee implements Comparable{
+ @Nonnull
private String name;
private Date joiningDate;
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/CheckFieldsOneByOne.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/CheckFieldsOneByOne.java
new file mode 100644
index 0000000000..a5126f6057
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/CheckFieldsOneByOne.java
@@ -0,0 +1,15 @@
+package com.baeldung.collections.sorting.multiple;
+
+import java.util.Comparator;
+
+
+public class CheckFieldsOneByOne implements Comparator {
+ @Override
+ public int compare(Person o1, Person o2) {
+ int nameCompare = o1.getName().compareTo(o2.getName());
+ if(nameCompare != 0) {
+ return nameCompare;
+ }
+ return Integer.compare(o1.getAge(), o2.getAge());
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/ComparatorLambda.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/ComparatorLambda.java
new file mode 100644
index 0000000000..33cb9c5803
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/ComparatorLambda.java
@@ -0,0 +1,10 @@
+package com.baeldung.collections.sorting.multiple;
+
+import java.util.Comparator;
+
+public class ComparatorLambda {
+ public static Comparator createEmployeeComparator() {
+ return Comparator.comparing(Person::getName)
+ .thenComparing(Person::getAge);
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/CompareToBuilderExample.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/CompareToBuilderExample.java
new file mode 100644
index 0000000000..7ca32c5aff
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/CompareToBuilderExample.java
@@ -0,0 +1,15 @@
+package com.baeldung.collections.sorting.multiple;
+
+import java.util.Comparator;
+
+import org.apache.commons.lang3.builder.CompareToBuilder;
+
+public class CompareToBuilderExample implements Comparator {
+ @Override
+ public int compare(Person o1, Person o2) {
+ return new CompareToBuilder()
+ .append(o1.getName(), o2.getName())
+ .append(o1.getAge(), o2.getAge())
+ .build();
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/ComparisonChainExample.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/ComparisonChainExample.java
new file mode 100644
index 0000000000..7b586a43bd
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/ComparisonChainExample.java
@@ -0,0 +1,15 @@
+package com.baeldung.collections.sorting.multiple;
+
+import java.util.Comparator;
+
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Ordering;
+
+public class ComparisonChainExample implements Comparator {
+ @Override
+ public int compare(Person o1, Person o2) {
+ return ComparisonChain.start()
+ .compare(o1.getName(), o2.getName(), Ordering.natural().nullsFirst())
+ .compare(o1.getAge(), o2.getAge()).result();
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/Person.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/Person.java
new file mode 100644
index 0000000000..08ba7bc965
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/sorting/multiple/Person.java
@@ -0,0 +1,29 @@
+package com.baeldung.collections.sorting.multiple;
+
+public class Person {
+ private String name;
+ private int age;
+
+ public Person(String name, int age) {
+ this.name = name;
+ this.age = age;
+ }
+
+ // getters and setters
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/stackreversal/ReverseStackUsingQueue.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/stackreversal/ReverseStackUsingQueue.java
new file mode 100644
index 0000000000..6851ed7e88
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/stackreversal/ReverseStackUsingQueue.java
@@ -0,0 +1,42 @@
+package com.baeldung.collections.stackreversal;
+
+import com.baeldung.collections.sorting.Employee;
+
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Stack;
+
+public class ReverseStackUsingQueue {
+ public Stack reverseIntegerStack(Stack inputStack) {
+ Queue queue = new LinkedList<>();
+ while (!inputStack.isEmpty()) {
+ queue.add(inputStack.pop());
+ }
+ while (!queue.isEmpty()) {
+ inputStack.add(queue.remove());
+ }
+ return inputStack;
+ }
+
+ public Stack reverseStringStack(Stack inputStack) {
+ Queue queue = new LinkedList<>();
+ while (!inputStack.isEmpty()) {
+ queue.add(inputStack.pop());
+ }
+ while (!queue.isEmpty()) {
+ inputStack.add(queue.remove());
+ }
+ return inputStack;
+ }
+
+ public Stack reverseEmployeeStack(Stack inputStack) {
+ Queue employeeQ = new LinkedList<>();
+ while (!inputStack.isEmpty()) {
+ employeeQ.add(inputStack.pop());
+ }
+ while (!employeeQ.isEmpty()) {
+ inputStack.add(employeeQ.remove());
+ }
+ return inputStack;
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/stackreversal/ReverseStackUsingRecursion.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/stackreversal/ReverseStackUsingRecursion.java
new file mode 100644
index 0000000000..8dbe0c39a6
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/stackreversal/ReverseStackUsingRecursion.java
@@ -0,0 +1,29 @@
+package com.baeldung.collections.stackreversal;
+
+import java.util.Stack;
+
+public class ReverseStackUsingRecursion {
+ public Stack reverseIntegerStack(Stack inputStack) {
+ reverseStack(inputStack);
+ return inputStack;
+ }
+
+ private void reverseStack(Stack stack) {
+ if (stack.isEmpty()) {
+ return;
+ }
+ int top = stack.pop();
+ reverseStack(stack);
+ insertBottom(stack, top);
+ }
+
+ private void insertBottom(Stack stack, int value) {
+ if (stack.isEmpty()) {
+ stack.add(value);
+ } else {
+ int top = stack.pop();
+ insertBottom(stack, value);
+ stack.add(top);
+ }
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/DataUtil.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/DataUtil.java
new file mode 100644
index 0000000000..5d03715b5b
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/DataUtil.java
@@ -0,0 +1,18 @@
+package com.baeldung.enumerationiteratordifferences;
+
+import java.util.Arrays;
+import java.util.List;
+
+public final class DataUtil {
+
+ private DataUtil() {
+ }
+
+ static List getPersons() {
+ Person person1 = new Person("amit", "kumar");
+ Person person2 = new Person("yogi", "kuki");
+ Person person3 = new Person("raj", "dosi");
+ Person person4 = new Person("prakash", "kumar");
+ return Arrays.asList(person1, person2, person3, person4);
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/EnumerationExample.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/EnumerationExample.java
new file mode 100644
index 0000000000..87f068468a
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/EnumerationExample.java
@@ -0,0 +1,19 @@
+package com.baeldung.enumerationiteratordifferences;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+import static com.baeldung.enumerationiteratordifferences.DataUtil.getPersons;
+
+public class EnumerationExample {
+ public static void main(String[] args) {
+
+ Vector people = new Vector<>(getPersons());
+ Enumeration enumeration = people.elements();
+ while (enumeration.hasMoreElements()) {
+ System.out.println("First Name = " + enumeration.nextElement()
+ .getFirstName());
+ }
+ }
+
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/IteratorExample.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/IteratorExample.java
new file mode 100644
index 0000000000..6ee6af6f22
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/IteratorExample.java
@@ -0,0 +1,17 @@
+package com.baeldung.enumerationiteratordifferences;
+
+import java.util.Iterator;
+import java.util.List;
+
+import static com.baeldung.enumerationiteratordifferences.DataUtil.getPersons;
+
+public class IteratorExample {
+ public static void main(String[] args) {
+ List persons = getPersons();
+ Iterator iterator = persons.iterator();
+ while (iterator.hasNext()) {
+ System.out.println("First Name = " + iterator.next()
+ .getFirstName());
+ }
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/Person.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/Person.java
new file mode 100644
index 0000000000..ff7fbbc50f
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/enumerationiteratordifferences/Person.java
@@ -0,0 +1,27 @@
+package com.baeldung.enumerationiteratordifferences;
+
+public class Person {
+ private String firstName;
+ private String lastName;
+
+ public Person(String firstName, String lastName) {
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/HashMapUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/HashMapUnitTest.java
index 3b595472e0..7d4ec8249c 100644
--- a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/HashMapUnitTest.java
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/HashMapUnitTest.java
@@ -2,9 +2,7 @@ package com.baeldung.collections.comparation;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/LinkedListUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/LinkedListUnitTest.java
index aa6b7fa923..00a188737d 100644
--- a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/LinkedListUnitTest.java
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/comparation/LinkedListUnitTest.java
@@ -2,10 +2,8 @@ package com.baeldung.collections.comparation;
import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
-import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/priorityqueue/PriorityQueueComparatorUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/priorityqueue/PriorityQueueComparatorUnitTest.java
new file mode 100644
index 0000000000..db10fa1ae8
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/priorityqueue/PriorityQueueComparatorUnitTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.collections.priorityqueue;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.PriorityQueue;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class PriorityQueueComparatorUnitTest {
+
+ @Test
+ void givenIntegerQueue_defaultComparator_followsNaturalOrdering() {
+ PriorityQueue integerQueue = new PriorityQueue<>();
+ PriorityQueue integerQueueWithComparator = new PriorityQueue<>((Integer c1, Integer c2) -> Integer.compare(c1, c2));
+
+ integerQueueWithComparator.add(3);
+ integerQueue.add(3);
+
+ integerQueueWithComparator.add(2);
+ integerQueue.add(2);
+
+ integerQueueWithComparator.add(1);
+ integerQueue.add(1);
+
+ assertThat(integerQueue.poll()).isEqualTo(1).isEqualTo(integerQueueWithComparator.poll());
+ assertThat(integerQueue.poll()).isEqualTo(2).isEqualTo(integerQueueWithComparator.poll());
+ assertThat(integerQueue.poll()).isEqualTo(3).isEqualTo(integerQueueWithComparator.poll());
+ }
+
+ @Test
+ void givenIntegerQueue_reverseOrderComparator_followsInverseNaturalOrdering() {
+ PriorityQueue reversedQueue = new PriorityQueue<>(Collections.reverseOrder());
+
+ reversedQueue.add(1);
+ reversedQueue.add(2);
+ reversedQueue.add(3);
+
+ assertThat(reversedQueue.poll()).isEqualTo(3);
+ assertThat(reversedQueue.poll()).isEqualTo(2);
+ assertThat(reversedQueue.poll()).isEqualTo(1);
+ }
+
+ @Test
+ void givenNotComparableQueue_classCastException() {
+ assertThatThrownBy(() -> {
+ PriorityQueue queue = new PriorityQueue<>();
+ queue.add(new ColoredNumber(3, "red"));
+ queue.add(new ColoredNumber(2, "blue"));
+ }).isInstanceOf(ClassCastException.class);
+ }
+
+ @Test
+ void givenCustomOrderingQueue_orderIsCorrect() {
+ PriorityQueue queue = new PriorityQueue<>();
+ queue.add(new ColoredNumberComparable(10, "red"));
+ queue.add(new ColoredNumberComparable(20, "red"));
+ queue.add(new ColoredNumberComparable(1, "blue"));
+ queue.add(new ColoredNumberComparable(2, "blue"));
+
+ ColoredNumberComparable first = queue.poll();
+ assertThat(first.getColor()).isEqualTo("red");
+ assertThat(first.getValue()).isEqualTo(10);
+
+ queue.poll();
+
+ ColoredNumberComparable third = queue.poll();
+ assertThat(third.getColor()).isEqualTo("blue");
+ assertThat(third.getValue()).isEqualTo(1);
+ }
+
+}
+
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java
index 250fb7b62b..de2f3d8ca7 100644
--- a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/EmployeeSortingByDateUnitTest.java
@@ -10,7 +10,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.lang.time.DateUtils;
import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class EmployeeSortingByDateUnitTest {
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/multiple/ComparatorsUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/multiple/ComparatorsUnitTest.java
new file mode 100644
index 0000000000..e1297456be
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/collections/sorting/multiple/ComparatorsUnitTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.collections.sorting.multiple;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ComparatorsUnitTest {
+ @Test
+ public void givenPersonsList_whenComparedOnTwoFields_thenReturnCorrectOrder() {
+ Person person1 = new Person("John", 21);
+ Person person2 = new Person("Tom", 20);
+ // Another employee named John
+ Person person3 = new Person("John", 22);
+
+ List> comparators =
+ Arrays.asList(new CheckFieldsOneByOne(),
+ new ComparisonChainExample(),
+ new CompareToBuilderExample(),
+ ComparatorLambda.createEmployeeComparator());
+ // All comparators should produce the same result
+ for(Comparator comparator : comparators) {
+ Assertions.assertIterableEquals(
+ Arrays.asList(person1, person2, person3)
+ .stream()
+ .sorted(comparator)
+ .collect(Collectors.toList()),
+ Arrays.asList(person1, person3, person2));
+ }
+ }
+}
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/listandset/ListAndSetUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/listandset/ListAndSetUnitTest.java
deleted file mode 100644
index abf275865d..0000000000
--- a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/listandset/ListAndSetUnitTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.baeldung.listandset;
-
-import org.junit.Test;
-import java.util.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class ListAndSetUnitTest {
-
- @Test
- public void givenList_whenDuplicates_thenAllowed(){
- List integerList = new ArrayList<>();
- integerList.add(2);
- integerList.add(3);
- integerList.add(4);
- integerList.add(4);
- assertEquals(integerList.size(), 4);
- }
-
- @Test
- public void givenSet_whenDuplicates_thenNotAllowed(){
- Set integerSet = new HashSet<>();
- integerSet.add(2);
- integerSet.add(3);
- integerSet.add(4);
- integerSet.add(4);
- assertEquals(integerSet.size(), 3);
- }
-
- @Test
- public void givenSet_whenOrdering_thenMayBeAllowed(){
- Set set1 = new LinkedHashSet<>();
- set1.add(2);
- set1.add(3);
- set1.add(4);
- Set set2 = new LinkedHashSet<>();
- set2.add(2);
- set2.add(3);
- set2.add(4);
- boolean ordered = true;
- Object[] arr1 = set1.toArray();
- Object[] arr2 = set2.toArray();
- for(int i=0; i < arr1.length; i++){
- if (!arr1[i].equals(arr2[i])) {
- ordered = false;
- break;
- }
- }
- assertTrue(ordered);
- }
-}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/stackreversal/StackReversalUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/stackreversal/StackReversalUnitTest.java
new file mode 100644
index 0000000000..ccadc4e7d3
--- /dev/null
+++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/stackreversal/StackReversalUnitTest.java
@@ -0,0 +1,66 @@
+package com.baeldung.stackreversal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.baeldung.collections.sorting.Employee;
+import com.baeldung.collections.stackreversal.ReverseStackUsingQueue;
+import com.baeldung.collections.stackreversal.ReverseStackUsingRecursion;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class StackReversalUnitTest {
+ @Test
+ public void whenIntegerStack_thenReturnReversedIntegerStack(){
+ ReverseStackUsingQueue reverseStack = new ReverseStackUsingQueue();
+ Stack originalStack = generateStackFromGivenList(Arrays.stream(new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}).boxed().collect(Collectors.toList()), new Stack());
+ Stack reverseList = generateStackFromGivenList(Arrays.stream(new int[]{10, 9, 8, 7, 6, 5, 4, 3, 2, 1}).boxed().collect(Collectors.toList()), new Stack());
+ assertEquals(reverseStack.reverseIntegerStack(originalStack), reverseList);
+ }
+
+ @Test
+ public void whenStringStack_thenReturnReversedStringStack(){
+ ReverseStackUsingQueue stackReversal = new ReverseStackUsingQueue();
+ List listOfWords = Arrays.asList(new String[]{"Hello", "I", "am", "reversing", "a", "stack"});
+ List listOfWordsReversed = new ArrayList<>(listOfWords);
+ Collections.reverse(listOfWordsReversed);
+ Stack originalStack = generateStackFromGivenList(listOfWords, new Stack());
+ Stack reversedStack = generateStackFromGivenList(listOfWordsReversed, new Stack());
+ assertEquals(stackReversal.reverseStringStack(originalStack), reversedStack);
+ }
+
+ @Test
+ public void whenEmployeeStack_thenReturnReversedEmployeeStack(){
+ ReverseStackUsingQueue stackReversal = new ReverseStackUsingQueue();
+ Employee employee1 = new Employee("John Doe", new Date());
+ Employee employee2 = new Employee("John Nash", new Date());
+ Employee employee3 = new Employee("Ryan Howard", new Date());
+ List employeeList = new ArrayList<>();
+ employeeList.add(employee1);
+ employeeList.add(employee2);
+ employeeList.add(employee3);
+ List employeeReversed = new ArrayList<>(employeeList);
+ Collections.reverse(employeeReversed);
+ Stack originalStack = generateStackFromGivenList(employeeList, new Stack());
+ Stack reverseStack = generateStackFromGivenList(employeeReversed, new Stack());
+ assertEquals(stackReversal.reverseEmployeeStack(originalStack), reverseStack);
+ }
+
+ @Test
+ public void givenIntegerStack_whenStackReversed_thenReturnReversedRecursion(){
+ ReverseStackUsingRecursion reverseStack = new ReverseStackUsingRecursion();
+ Stack originalStack = generateStackFromGivenList(Arrays.stream(new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}).boxed().collect(Collectors.toList()), new Stack());
+ Stack reversedStack = generateStackFromGivenList(Arrays.stream(new int[]{10, 9, 8, 7, 6, 5, 4, 3, 2, 1}).boxed().collect(Collectors.toList()), new Stack());
+ assertEquals(reverseStack.reverseIntegerStack(originalStack), reversedStack);
+ }
+
+ private Stack generateStackFromGivenList(List elements, Stack stack){
+ int start = 0;
+ while (start < elements.size()){
+ stack.add(elements.get(start++));
+ }
+ return stack;
+ }
+}
diff --git a/core-java-modules/core-java-collections-5/README.md b/core-java-modules/core-java-collections-5/README.md
new file mode 100644
index 0000000000..1769d11686
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/README.md
@@ -0,0 +1,8 @@
+=========
+
+## Core Java Collections Cookbooks and Examples
+
+### Relevant Articles:
+- [Introduction to Roaring Bitmap](https://www.baeldung.com/java-roaring-bitmap-intro)
+- [Creating Custom Iterator in Java](https://www.baeldung.com/java-creating-custom-iterator)
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections-4)
diff --git a/core-java-modules/core-java-collections-5/pom.xml b/core-java-modules/core-java-collections-5/pom.xml
new file mode 100644
index 0000000000..84f62c696d
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/pom.xml
@@ -0,0 +1,70 @@
+
+
+ 4.0.0
+ core-java-collections-5
+ core-java-collections-5
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 9
+ 9
+
+
+
+
+ jar
+
+
+ com.baeldung.core-java-modules
+ core-java-modules
+ 0.0.1-SNAPSHOT
+
+
+
+
+ org.junit.platform
+ junit-platform-runner
+ ${junit-platform.version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ ${junit.version}
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit.version}
+ test
+
+
+ org.roaringbitmap
+ RoaringBitmap
+ ${roaringbitmap.version}
+
+
+ org.openjdk.jmh
+ jmh-generator-annprocess
+ ${jmh.version}
+
+
+ org.openjdk.jmh
+ jmh-core
+ ${jmh.version}
+
+
+
+
+ 5.9.2
+ 0.9.38
+ 1.36
+
+
+
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/arrayandlistperformance/ArrayAndArrayListPerformance.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/arrayandlistperformance/ArrayAndArrayListPerformance.java
new file mode 100644
index 0000000000..f8a113ff69
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/arrayandlistperformance/ArrayAndArrayListPerformance.java
@@ -0,0 +1,77 @@
+package com.baeldung.arrayandlistperformance;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+@State(Scope.Benchmark)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class ArrayAndArrayListPerformance {
+
+ public static void main(String[] args) throws Exception {
+ org.openjdk.jmh.runner.Runner runner = new org.openjdk.jmh.runner.Runner(new OptionsBuilder().include(ArrayAndArrayListPerformance.class.getSimpleName()).forks(1).build());
+ runner.run();
+ }
+ public static Integer[] array = Collections.nCopies(1000000, 1).toArray(new Integer[0]);
+ public static ArrayList list = new ArrayList(
+ Arrays.asList(array));
+ @Benchmark
+ public Integer[] arrayCreation() {
+ return new Integer[1000000];
+ }
+
+ @Benchmark
+ public ArrayList arrayListCreation() {
+ return new ArrayList<>(1000000);
+ }
+
+ @Benchmark
+ public Integer[] arrayItemsSetting() {
+ for (int i = 0; i < 1000000; i++) {
+ array[i] = i;
+ }
+ return array;
+ }
+
+ @Benchmark
+ public ArrayList arrayListItemsSetting() {
+ for (int i = 0; i < 1000000; i++) {
+ list.add(i);
+ }
+ return list;
+ }
+
+ @Benchmark
+ public void arrayItemsRetrieval(Blackhole blackhole) {
+ for (int i = 0; i < 1000000; i++) {
+ int item = array[i];
+ blackhole.consume(item);
+ }
+ }
+
+ @Benchmark
+ public void arrayListItemsRetrieval(Blackhole blackhole) {
+ for (int i = 0; i < 1000000; i++) {
+ int item = list.get(i);
+ blackhole.consume(item);
+ }
+ }
+
+ @Benchmark
+ public void arrayCloning(Blackhole blackhole) {
+ Integer[] newArray = array.clone();
+ blackhole.consume(newArray);
+ }
+
+ @Benchmark
+ public void arrayListCloning(Blackhole blackhole) {
+ ArrayList newList = new ArrayList<>(list);
+ blackhole.consume(newList);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/CustomMovieIterator.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/CustomMovieIterator.java
new file mode 100644
index 0000000000..a1e34dd4c5
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/CustomMovieIterator.java
@@ -0,0 +1,39 @@
+package com.baeldung.customiterators;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class CustomMovieIterator implements Iterator {
+ private int currentIndex;
+ private final List list;
+
+ public CustomMovieIterator(List list) {
+ this.list = list;
+ this.currentIndex = 0;
+ }
+
+ @Override
+ public boolean hasNext() {
+ while (currentIndex < list.size()) {
+ Movie currentMovie = list.get(currentIndex);
+ if (isMovieEligible(currentMovie)) {
+ return true;
+ }
+ currentIndex++;
+ }
+ return false;
+ }
+
+ @Override
+ public Movie next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+ return list.get(currentIndex++);
+ }
+
+ private boolean isMovieEligible(Movie movie) {
+ return movie.getRating() >= 8;
+ }
+}
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/Movie.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/Movie.java
new file mode 100644
index 0000000000..e1188e69bf
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/Movie.java
@@ -0,0 +1,37 @@
+package com.baeldung.customiterators;
+
+public class Movie {
+ private String name;
+ private String director;
+ private float rating;
+
+ public Movie(String name, String director, float rating) {
+ this.name = name;
+ this.director = director;
+ this.rating = rating;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDirector() {
+ return director;
+ }
+
+ public void setDirector(String director) {
+ this.director = director;
+ }
+
+ public float getRating() {
+ return rating;
+ }
+
+ public void setRating(float rating) {
+ this.rating = rating;
+ }
+}
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/MyList.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/MyList.java
new file mode 100644
index 0000000000..a0b2f4a943
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/MyList.java
@@ -0,0 +1,139 @@
+package com.baeldung.customiterators;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * Please note that this class has been added for representation purposes of how a custom collection and its iterator would be.
+ * This does not have working code.
+ */
+public class MyList implements List {
+ @Override
+ public int size() {
+ return 0;
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return false;
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ return false;
+ }
+
+ @Override
+ public boolean add(E e) {
+ return false;
+ }
+
+ @Override
+ public boolean remove(Object o) {
+ return false;
+ }
+
+ @Override
+ public Iterator iterator() {
+ return new MyListIterator();
+ }
+
+ private class MyListIterator implements Iterator {
+ @Override
+ public boolean hasNext() {
+ return false;
+ }
+
+ @Override
+ public E next() {
+ return null;
+ }
+ }
+
+ @Override
+ public Object[] toArray() {
+ return new Object[0];
+ }
+
+ @Override
+ public T[] toArray(T[] a) {
+ return null;
+ }
+
+ @Override
+ public boolean containsAll(Collection c) {
+ return false;
+ }
+
+ @Override
+ public boolean addAll(Collection c) {
+ return false;
+ }
+
+ @Override
+ public boolean addAll(int index, Collection c) {
+ return false;
+ }
+
+ @Override
+ public boolean removeAll(Collection c) {
+ return false;
+ }
+
+ @Override
+ public boolean retainAll(Collection c) {
+ return false;
+ }
+
+ @Override
+ public void clear() {
+
+ }
+
+ @Override
+ public E get(int index) {
+ return null;
+ }
+
+ @Override
+ public E set(int index, E element) {
+ return null;
+ }
+
+ @Override
+ public void add(int index, E element) {
+
+ }
+
+ @Override
+ public E remove(int index) {
+ return null;
+ }
+
+ @Override
+ public int indexOf(Object o) {
+ return 0;
+ }
+
+ @Override
+ public int lastIndexOf(Object o) {
+ return 0;
+ }
+
+ @Override
+ public ListIterator listIterator() {
+ return null;
+ }
+
+ @Override
+ public ListIterator listIterator(int index) {
+ return null;
+ }
+
+ @Override
+ public List subList(int fromIndex, int toIndex) {
+ return null;
+ }
+}
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/PalindromIterator.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/PalindromIterator.java
new file mode 100644
index 0000000000..50263f52ec
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/customiterators/PalindromIterator.java
@@ -0,0 +1,44 @@
+package com.baeldung.customiterators;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class PalindromIterator implements Iterator {
+ private final List list;
+ private int currentIndex;
+
+ public PalindromIterator(List list) {
+ this.list = list;
+ this.currentIndex = 0;
+ }
+
+ @Override
+ public boolean hasNext() {
+ while (currentIndex < list.size()) {
+ String currString = list.get(currentIndex);
+ if (isPalindrome(currString)) {
+ return true;
+ }
+ currentIndex++;
+ }
+ return false;
+ }
+
+ @Override
+ public String next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+ return list.get(currentIndex++);
+ }
+
+ private boolean isPalindrome(String input) {
+ for (int i = 0; i < input.length() / 2; i++) {
+ if (input.charAt(i) != input.charAt(input.length() - i - 1)) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/roaringbitmap/BitSetsBenchmark.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/roaringbitmap/BitSetsBenchmark.java
new file mode 100644
index 0000000000..4968afb752
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/roaringbitmap/BitSetsBenchmark.java
@@ -0,0 +1,82 @@
+package com.baeldung.roaringbitmap;
+
+import java.util.BitSet;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.roaringbitmap.RoaringBitmap;
+
+@State(Scope.Thread)
+public class BitSetsBenchmark {
+ private RoaringBitmap rb1;
+ private BitSet bs1;
+ private RoaringBitmap rb2;
+ private BitSet bs2;
+ private final static int SIZE = 10_000_000;
+
+ @Setup
+ public void setup() {
+ rb1 = new RoaringBitmap();
+ bs1 = new BitSet(SIZE);
+ rb2 = new RoaringBitmap();
+ bs2 = new BitSet(SIZE);
+ for (int i = 0; i < SIZE / 2; i++) {
+ rb1.add(i);
+ bs1.set(i);
+ }
+ for (int i = SIZE / 2; i < SIZE; i++) {
+ rb2.add(i);
+ bs2.set(i);
+ }
+ }
+
+ @Benchmark
+ public RoaringBitmap roaringBitmapUnion() {
+ return RoaringBitmap.or(rb1, rb2);
+ }
+
+ @Benchmark
+ public BitSet bitSetUnion() {
+ BitSet result = (BitSet) bs1.clone();
+ result.or(bs2);
+ return result;
+ }
+
+ @Benchmark
+ public RoaringBitmap roaringBitmapIntersection() {
+ return RoaringBitmap.and(rb1, rb2);
+ }
+
+ @Benchmark
+ public BitSet bitSetIntersection() {
+ BitSet result = (BitSet) bs1.clone();
+ result.and(bs2);
+ return result;
+ }
+
+ @Benchmark
+ public RoaringBitmap roaringBitmapDifference() {
+ return RoaringBitmap.andNot(rb1, rb2);
+ }
+
+ @Benchmark
+ public BitSet bitSetDifference() {
+ BitSet result = (BitSet) bs1.clone();
+ result.andNot(bs2);
+ return result;
+ }
+
+ @Benchmark
+ public RoaringBitmap roaringBitmapXOR() {
+ return RoaringBitmap.xor(rb1, rb2);
+ }
+
+ @Benchmark
+ public BitSet bitSetXOR() {
+ BitSet result = (BitSet) bs1.clone();
+ result.xor(bs2);
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/roaringbitmap/BitSetsBenchmarkRunner.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/roaringbitmap/BitSetsBenchmarkRunner.java
new file mode 100644
index 0000000000..49d556df7e
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/roaringbitmap/BitSetsBenchmarkRunner.java
@@ -0,0 +1,9 @@
+package com.baeldung.roaringbitmap;
+
+import java.io.IOException;
+
+public class BitSetsBenchmarkRunner {
+ public static void main(String... args) throws IOException {
+ org.openjdk.jmh.Main.main(args);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/customiterators/IteratorsUnitTest.java b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/customiterators/IteratorsUnitTest.java
new file mode 100644
index 0000000000..04389eb1d2
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/customiterators/IteratorsUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.customiterators;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class IteratorsUnitTest {
+ @Test
+ public void givenListOfStrings_whenIteratedWithDefaultIterator() {
+ List listOfStrings = List.of("hello", "world", "this", "is", "a", "test");
+ Iterator iterator = listOfStrings.iterator();
+ Assert.assertTrue(iterator.hasNext());
+ assertEquals(iterator.next(), "hello");
+ }
+
+ @Test
+ public void givenListOfStrings_whenPalindromIterator_thenOnlyPalindromes() {
+ List listOfStrings = List.of("oslo", "madam", "car", "deed", "wow", "test");
+ PalindromIterator palindromIterator = new PalindromIterator(listOfStrings);
+ int count = 0;
+ while (palindromIterator.hasNext()) {
+ palindromIterator.next();
+ count++;
+ }
+ assertEquals(count, 3);
+ }
+
+ @Test
+ public void givenMovieList_whenMovieIteratorUsed_thenOnlyHighRatedMovies() {
+ List movies = getMovies();
+ CustomMovieIterator movieIterator = new CustomMovieIterator(movies);
+ int count = 0;
+ while (movieIterator.hasNext()) {
+ movieIterator.next();
+ count++;
+ }
+ assertEquals(4, movies.size());
+ assertEquals(2, count);
+ }
+
+ private List getMovies() {
+ Movie movie1 = new Movie("The Dark Knight", "Nolan", 10);
+ Movie movie2 = new Movie("Avatar", "Cameron", 9);
+ Movie movie3 = new Movie("Tenet", "Nolan", 7);
+ Movie movie4 = new Movie("Extraction", "Hargrave", 5);
+ return List.of(movie1, movie2, movie3, movie4);
+ }
+
+}
diff --git a/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/roaringbitmap/RoaringBitmapBenchmarkUnitTest.java b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/roaringbitmap/RoaringBitmapBenchmarkUnitTest.java
new file mode 100644
index 0000000000..07170512d9
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/roaringbitmap/RoaringBitmapBenchmarkUnitTest.java
@@ -0,0 +1,45 @@
+package com.baeldung.roaringbitmap;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.roaringbitmap.RoaringBitmap;
+
+class RoaringBitmapBenchmarkUnitTest {
+ @Test
+ public void givenTwoRoaringBitmap_whenUsingOr_thenWillGetSetsUnion() {
+ RoaringBitmap expected = RoaringBitmap.bitmapOf(1, 2, 3, 4, 5, 6, 7, 8);
+ RoaringBitmap A = RoaringBitmap.bitmapOf(1, 2, 3, 4, 5);
+ RoaringBitmap B = RoaringBitmap.bitmapOf(4, 5, 6, 7, 8);
+ RoaringBitmap union = RoaringBitmap.or(A, B);
+ assertEquals(expected, union);
+ }
+
+ @Test
+ public void givenTwoRoaringBitmap_whenUsingAnd_thenWillGetSetsIntersection() {
+ RoaringBitmap expected = RoaringBitmap.bitmapOf(4, 5);
+ RoaringBitmap A = RoaringBitmap.bitmapOfRange(1, 6);
+ RoaringBitmap B = RoaringBitmap.bitmapOf(4, 5, 6, 7, 8);
+ RoaringBitmap intersection = RoaringBitmap.and(A, B);
+ assertEquals(expected, intersection);
+ }
+
+ @Test
+ public void givenTwoRoaringBitmap_whenUsingAndNot_thenWillGetSetsDifference() {
+ RoaringBitmap expected = RoaringBitmap.bitmapOf(1, 2, 3);
+ RoaringBitmap A = new RoaringBitmap();
+ A.add(1L, 6L);
+ RoaringBitmap B = RoaringBitmap.bitmapOf(4, 5, 6, 7, 8);
+ RoaringBitmap difference = RoaringBitmap.andNot(A, B);
+ assertEquals(expected, difference);
+ }
+
+ @Test
+ public void givenTwoRoaringBitmap_whenUsingXOR_thenWillGetSetsSymmetricDifference() {
+ RoaringBitmap expected = RoaringBitmap.bitmapOf(1, 2, 3, 6, 7, 8);
+ RoaringBitmap A = RoaringBitmap.bitmapOfRange(1, 6);
+ RoaringBitmap B = RoaringBitmap.bitmapOfRange(4, 9);
+ RoaringBitmap xor = RoaringBitmap.xor(A, B);
+ assertEquals(expected, xor);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-array-list/README.md b/core-java-modules/core-java-collections-array-list/README.md
index d24f7492bb..e3d41d8f88 100644
--- a/core-java-modules/core-java-collections-array-list/README.md
+++ b/core-java-modules/core-java-collections-array-list/README.md
@@ -9,3 +9,7 @@ This module contains articles about the Java ArrayList collection
- [Multi Dimensional ArrayList in Java](https://www.baeldung.com/java-multi-dimensional-arraylist)
- [Removing an Element From an ArrayList](https://www.baeldung.com/java-arraylist-remove-element)
- [The Capacity of an ArrayList vs the Size of an Array in Java](https://www.baeldung.com/java-list-capacity-array-size)
+- [Case-Insensitive Searching in ArrayList](https://www.baeldung.com/java-arraylist-case-insensitive-search)
+- [Storing Data Triple in a List in Java](https://www.baeldung.com/java-list-storing-triple)
+- [Convert an ArrayList of Object to an ArrayList of String Elements](https://www.baeldung.com/java-object-list-to-strings)
+- [Initialize an ArrayList with Zeroes or Null in Java](https://www.baeldung.com/java-arraylist-with-zeroes-or-null)
diff --git a/core-java-modules/core-java-collections-array-list/pom.xml b/core-java-modules/core-java-collections-array-list/pom.xml
index 6b040739e8..ee0b102bb0 100644
--- a/core-java-modules/core-java-collections-array-list/pom.xml
+++ b/core-java-modules/core-java-collections-array-list/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
core-java-collections-array-list
- 0.1.0-SNAPSHOT
core-java-collections-array-list
jar
@@ -20,6 +19,41 @@
commons-collections4
${commons-collections4.version}
+
+ com.google.guava
+ guava
+ 31.1-jre
+ test
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ ${maven-compiler-plugin.source}
+ ${maven-compiler-plugin.target}
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${surefire.plugin.version}
+
+
+ --add-opens java.base/java.util=ALL-UNNAMED
+
+
+
+
+
+
+
+ 16
+ 16
+ 3.0.0-M3
+
+
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/defaultarraylistcapacity/DefaultArrayListCapacity.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/defaultarraylistcapacity/DefaultArrayListCapacity.java
new file mode 100644
index 0000000000..34f202a4dd
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/defaultarraylistcapacity/DefaultArrayListCapacity.java
@@ -0,0 +1,20 @@
+package com.baeldung.defaultarraylistcapacity;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+public class DefaultArrayListCapacity {
+
+ public static int getDefaultCapacity(ArrayList arrayList) throws Exception {
+
+ if (arrayList == null) {
+ return 0;
+ }
+
+ Field field = ArrayList.class.getDeclaredField("elementData");
+ field.setAccessible(true);
+
+ return ((Object[]) field.get(arrayList)).length;
+ }
+
+}
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/initializearraylistwithnullorzeros/InitializeArrayListWithNullOrZeros.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/initializearraylistwithnullorzeros/InitializeArrayListWithNullOrZeros.java
new file mode 100644
index 0000000000..66862791aa
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/initializearraylistwithnullorzeros/InitializeArrayListWithNullOrZeros.java
@@ -0,0 +1,15 @@
+package com.baeldung.initializearraylistwithnullorzeros;
+
+import java.util.ArrayList;
+
+public class InitializeArrayListWithNullOrZeros {
+
+ public static void main(String[] args) {
+
+ ArrayList arrayList = new ArrayList<>();
+ for (int i = 0; i< 10; i++) {
+ arrayList.add(null);
+ }
+ }
+}
+
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/list/ignorecase/IgnoreCaseSearchUtil.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/list/ignorecase/IgnoreCaseSearchUtil.java
new file mode 100644
index 0000000000..38532ef031
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/list/ignorecase/IgnoreCaseSearchUtil.java
@@ -0,0 +1,14 @@
+package com.baeldung.list.ignorecase;
+
+import java.util.List;
+
+public class IgnoreCaseSearchUtil {
+ public static boolean ignoreCaseContains(List theList, String searchStr) {
+ for (String s : theList) {
+ if (searchStr.equalsIgnoreCase(s)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/list/ignorecase/IgnoreCaseStringList.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/list/ignorecase/IgnoreCaseStringList.java
new file mode 100644
index 0000000000..a27c2650ed
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/list/ignorecase/IgnoreCaseStringList.java
@@ -0,0 +1,29 @@
+package com.baeldung.list.ignorecase;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class IgnoreCaseStringList extends ArrayList {
+
+ public IgnoreCaseStringList() {
+
+ }
+
+ public IgnoreCaseStringList(Collection c) {
+ super(c);
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ String searchStr = (String) o;
+ // Using Stream API:
+ // return this.stream().anyMatch(searchStr::equalsIgnoreCase);
+ for (String s : this) {
+ if (searchStr.equalsIgnoreCase(s)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/listofobjectstolistofstring/Node.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/listofobjectstolistofstring/Node.java
new file mode 100644
index 0000000000..3e2c5693de
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/listofobjectstolistofstring/Node.java
@@ -0,0 +1,17 @@
+package com.baeldung.listofobjectstolistofstring;
+
+public class Node {
+
+ private final int x;
+ private final int y;
+
+ public Node(int x, int y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ @Override
+ public String toString() {
+ return "Node (" + "x=" + x + ", y=" + y + ')';
+ }
+}
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/listofobjectstolistofstring/User.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/listofobjectstolistofstring/User.java
new file mode 100644
index 0000000000..eb9298bce0
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/listofobjectstolistofstring/User.java
@@ -0,0 +1,14 @@
+package com.baeldung.listofobjectstolistofstring;
+
+public class User {
+ private final String fullName;
+
+ public User(String fullName) {
+ this.fullName = fullName;
+ }
+
+ @Override
+ public String toString() {
+ return "User (" + "full name='" + fullName + ')';
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/triple/Triple.java b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/triple/Triple.java
new file mode 100644
index 0000000000..b19266ad21
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/main/java/com/baeldung/triple/Triple.java
@@ -0,0 +1,26 @@
+package com.baeldung.triple;
+
+public class Triple {
+
+ private final L left;
+ private final M middle;
+ private final R right;
+
+ public Triple(L left, M middle, R right) {
+ this.left = left;
+ this.middle = middle;
+ this.right = right;
+ }
+
+ public L getLeft() {
+ return left;
+ }
+
+ public M getMiddle() {
+ return middle;
+ }
+
+ public R getRight() {
+ return right;
+ }
+}
diff --git a/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/defaultarraylistcapacity/DefaultArrayListCapacityUnitTest.java b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/defaultarraylistcapacity/DefaultArrayListCapacityUnitTest.java
new file mode 100644
index 0000000000..0690e93879
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/defaultarraylistcapacity/DefaultArrayListCapacityUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.defaultarraylistcapacity;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+
+import org.junit.jupiter.api.Test;
+
+public class DefaultArrayListCapacityUnitTest {
+
+ @Test
+ void givenEmptyArrayList_whenGetDefaultCapacity_thenReturnZero() throws Exception {
+
+ ArrayList myList = new ArrayList<>();
+ int defaultCapacity = DefaultArrayListCapacity.getDefaultCapacity(myList);
+
+ assertEquals(0, defaultCapacity);
+
+ }
+
+ @Test
+ void givenEmptyArrayList_whenAddItemAndGetDefaultCapacity_thenReturn10() throws Exception {
+
+ ArrayList myList = new ArrayList<>();
+ myList.add("ITEM 1");
+
+ int defaultCapacity = DefaultArrayListCapacity.getDefaultCapacity(myList);
+
+ assertEquals(10, defaultCapacity);
+
+ }
+
+}
diff --git a/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/initializearraylistwithnullorzeros/InitializeArrayListWithNullOrZerosUnitTest.java b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/initializearraylistwithnullorzeros/InitializeArrayListWithNullOrZerosUnitTest.java
new file mode 100644
index 0000000000..00987fa198
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/initializearraylistwithnullorzeros/InitializeArrayListWithNullOrZerosUnitTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.initializearraylistwithnullorzeros;
+
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+public class InitializeArrayListWithNullOrZerosUnitTest {
+
+ @Test
+ public void whenInitializingListWithNCopies_thenListIsCorrectlyPopulated() {
+ // when
+ ArrayList list = IntStream.of(new int[10])
+ .boxed()
+ .collect(Collectors.toCollection(ArrayList::new));
+
+ // then
+ Assertions.assertEquals(10, list.size());
+ Assertions.assertTrue(list.stream().allMatch(elem -> elem == 0));
+ }
+
+ @Test
+ public void whenInitializingListWithStream_thenListIsCorrectlyPopulated() {
+
+ // when
+ ArrayList listWithZeros = Stream.generate(() -> 0)
+ .limit(10).collect(Collectors.toCollection(ArrayList::new));
+
+ ArrayList