From 9481177e6280d656b2200409a424afd3ff293a49 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 14 Jul 2020 13:24:41 +0200
Subject: [PATCH 1/2] JAVA-2109: Fix core-java-concurrency-collections-2 module
configuration
---
.../pom.xml | 24 +++++++------------
...ava => ConcurrentLinkedQueueUnitTest.java} | 2 +-
....java => LinkedBlockingQueueUnitTest.java} | 2 +-
3 files changed, 11 insertions(+), 17 deletions(-)
rename core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/{TestConcurrentLinkedQueue.java => ConcurrentLinkedQueueUnitTest.java} (98%)
rename core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/{TestLinkedBlockingQueue.java => LinkedBlockingQueueUnitTest.java} (98%)
diff --git a/core-java-modules/core-java-concurrency-collections-2/pom.xml b/core-java-modules/core-java-concurrency-collections-2/pom.xml
index 7fdd348dc5..f9ee41f6d5 100644
--- a/core-java-modules/core-java-concurrency-collections-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-collections-2/pom.xml
@@ -3,9 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.baeldung.concurrent.lock</groupId>
<artifactId>core-java-concurrency-collections-2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
+ <name>core-java-concurrency-collections-2</name>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>com.baeldung.core-java-modules</groupId>
+ <artifactId>core-java-modules</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
<dependencies>
<dependency>
@@ -30,19 +37,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
<properties>
<jmh.version>1.21</jmh.version>
diff --git a/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/TestConcurrentLinkedQueue.java b/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/ConcurrentLinkedQueueUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/TestConcurrentLinkedQueue.java
rename to core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/ConcurrentLinkedQueueUnitTest.java
index c61becc366..8821887a9e 100644
--- a/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/TestConcurrentLinkedQueue.java
+++ b/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/ConcurrentLinkedQueueUnitTest.java
@@ -19,7 +19,7 @@ import org.junit.FixMethodOrder;
import org.junit.Test;
@FixMethodOrder
-public class TestConcurrentLinkedQueue {
+public class ConcurrentLinkedQueueUnitTest {
@Test
public void givenThereIsExistingCollection_WhenAddedIntoQueue_ThenShouldContainElements() {
diff --git a/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/TestLinkedBlockingQueue.java b/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/LinkedBlockingQueueUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/TestLinkedBlockingQueue.java
rename to core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/LinkedBlockingQueueUnitTest.java
index 7a78bc7b3b..c1460c5196 100644
--- a/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/TestLinkedBlockingQueue.java
+++ b/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/concurrent/queue/LinkedBlockingQueueUnitTest.java
@@ -18,7 +18,7 @@ import org.junit.FixMethodOrder;
import org.junit.Test;
@FixMethodOrder
-public class TestLinkedBlockingQueue {
+public class LinkedBlockingQueueUnitTest {
@Test
public void givenThereIsExistingCollection_WhenAddedIntoQueue_ThenShouldContainElements() {
From 81b412c6e706595ea2f14d23969ff34b139d4d3d Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 14 Jul 2020 13:30:03 +0200
Subject: [PATCH 2/2] JAVA-2109: Move Guide to the Java TransferQueue to the
core-java-concurrency-collections-2
---
.../core-java-concurrency-collections-2/README.md | 2 ++
.../src/main/java/com/baeldung/transferqueue/Consumer.java | 0
.../src/main/java/com/baeldung/transferqueue/Producer.java | 0
.../transferqueue/TransferQueueIntegrationTest.java | 6 +++++-
.../core-java-concurrency-collections/README.md | 2 +-
5 files changed, 8 insertions(+), 2 deletions(-)
rename core-java-modules/{core-java-concurrency-collections => core-java-concurrency-collections-2}/src/main/java/com/baeldung/transferqueue/Consumer.java (100%)
rename core-java-modules/{core-java-concurrency-collections => core-java-concurrency-collections-2}/src/main/java/com/baeldung/transferqueue/Producer.java (100%)
rename core-java-modules/{core-java-concurrency-collections => core-java-concurrency-collections-2}/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java (92%)
diff --git a/core-java-modules/core-java-concurrency-collections-2/README.md b/core-java-modules/core-java-concurrency-collections-2/README.md
index 91da6c623c..6ad6529efc 100644
--- a/core-java-modules/core-java-concurrency-collections-2/README.md
+++ b/core-java-modules/core-java-concurrency-collections-2/README.md
@@ -1,3 +1,5 @@
### Relevant Articles:
- [Introduction to Lock Striping](https://www.baeldung.com/java-lock-stripping)
+- [Guide to the Java TransferQueue](http://www.baeldung.com/java-transfer-queue)
+- [[<-- Prev]](/core-java-modules/core-java-concurrency-collections)
diff --git a/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java b/core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/transferqueue/Consumer.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java
rename to core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/transferqueue/Consumer.java
diff --git a/core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java b/core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/transferqueue/Producer.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java
rename to core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/transferqueue/Producer.java
diff --git a/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java b/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
similarity index 92%
rename from core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
index e49738e983..928597f81e 100644
--- a/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
+++ b/core-java-modules/core-java-concurrency-collections-2/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
@@ -4,7 +4,11 @@ import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TransferQueue;
import static junit.framework.TestCase.assertEquals;
diff --git a/core-java-modules/core-java-concurrency-collections/README.md b/core-java-modules/core-java-concurrency-collections/README.md
index af6e7a8b59..94f93d1bfd 100644
--- a/core-java-modules/core-java-concurrency-collections/README.md
+++ b/core-java-modules/core-java-concurrency-collections/README.md
@@ -10,7 +10,7 @@ This module contains articles about concurrent Java collections
- [Custom Thread Pools In Java 8 Parallel Streams](http://www.baeldung.com/java-8-parallel-streams-custom-threadpool)
- [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue)
- [A Guide to Java SynchronousQueue](http://www.baeldung.com/java-synchronous-queue)
-- [Guide to the Java TransferQueue](http://www.baeldung.com/java-transfer-queue)
- [Guide to the ConcurrentSkipListMap](http://www.baeldung.com/java-concurrent-skip-list-map)
- [Guide to CopyOnWriteArrayList](http://www.baeldung.com/java-copy-on-write-arraylist)
- [LinkedBlockingQueue vs ConcurrentLinkedQueue](https://www.baeldung.com/java-queue-linkedblocking-concurrentlinked)
+- [[Next -->]](/core-java-modules/core-java-concurrency-collections-2)