From ca436ff5e0da9cbf39911d5027fbf3e6abb8916d Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Sun, 13 Nov 2022 12:16:26 +0000 Subject: [PATCH] [JAVA-13960] Clean up (#12994) * [JAVA-13960] Clean up * [JAVA-13960] Rename classes Co-authored-by: panagiotiskakos --- ...hronizedBlocks.java => SynchronizedBlocks.java} | 6 +++--- ...onizedMethods.java => SynchronizedMethods.java} | 2 +- ...itTest.java => SynchronizedBlocksUnitTest.java} | 10 +++++----- ...tTest.java => SynchronizedMethodsUnitTest.java} | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) rename core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/{BaeldungSynchronizedBlocks.java => SynchronizedBlocks.java} (79%) rename core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/{BaeldungSynchronizedMethods.java => SynchronizedMethods.java} (93%) rename core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/{BaeldungSychronizedBlockUnitTest.java => SynchronizedBlocksUnitTest.java} (76%) rename core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/{BaeldungSynchronizeMethodsUnitTest.java => SynchronizedMethodsUnitTest.java} (70%) diff --git a/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java b/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedBlocks.java similarity index 79% rename from core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java rename to core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedBlocks.java index 332a6d9263..bf5fef2241 100644 --- a/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedBlocks.java +++ b/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedBlocks.java @@ -1,6 +1,6 @@ package com.baeldung.concurrent.synchronize; -public class BaeldungSynchronizedBlocks { +public class SynchronizedBlocks { private int count = 0; private static int staticCount = 0; @@ -12,7 +12,7 @@ public class BaeldungSynchronizedBlocks { } static void performStaticSyncTask() { - synchronized (BaeldungSynchronizedBlocks.class) { + synchronized (SynchronizedBlocks.class) { setStaticCount(getStaticCount() + 1); } } @@ -30,6 +30,6 @@ public class BaeldungSynchronizedBlocks { } private static void setStaticCount(int staticCount) { - BaeldungSynchronizedBlocks.staticCount = staticCount; + SynchronizedBlocks.staticCount = staticCount; } } diff --git a/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java b/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedMethods.java similarity index 93% rename from core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java rename to core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedMethods.java index 179c6fb9ef..cb4138e25b 100644 --- a/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizedMethods.java +++ b/core-java-modules/core-java-concurrency-simple/src/main/java/com/baeldung/concurrent/synchronize/SynchronizedMethods.java @@ -1,6 +1,6 @@ package com.baeldung.concurrent.synchronize; -public class BaeldungSynchronizedMethods { +public class SynchronizedMethods { private int sum = 0; private int syncSum = 0; diff --git a/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java b/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedBlocksUnitTest.java similarity index 76% rename from core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java rename to core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedBlocksUnitTest.java index 427531a446..0e7b0ef7f7 100644 --- a/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java +++ b/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedBlocksUnitTest.java @@ -9,15 +9,15 @@ import java.util.stream.IntStream; import static org.junit.Assert.assertEquals; -public class BaeldungSychronizedBlockUnitTest { +public class SynchronizedBlocksUnitTest { @Test public void givenMultiThread_whenBlockSync() throws InterruptedException { ExecutorService service = Executors.newFixedThreadPool(3); - BaeldungSynchronizedBlocks synchronizedBlocks = new BaeldungSynchronizedBlocks(); + SynchronizedBlocks synchronizedBlocks = new SynchronizedBlocks(); IntStream.range(0, 1000) - .forEach(count -> service.submit(synchronizedBlocks::performSynchronisedTask)); + .forEach(count -> service.submit(synchronizedBlocks::performSynchronisedTask)); service.awaitTermination(500, TimeUnit.MILLISECONDS); assertEquals(1000, synchronizedBlocks.getCount()); @@ -28,10 +28,10 @@ public class BaeldungSychronizedBlockUnitTest { ExecutorService service = Executors.newCachedThreadPool(); IntStream.range(0, 1000) - .forEach(count -> service.submit(BaeldungSynchronizedBlocks::performStaticSyncTask)); + .forEach(count -> service.submit(SynchronizedBlocks::performStaticSyncTask)); service.awaitTermination(500, TimeUnit.MILLISECONDS); - assertEquals(1000, BaeldungSynchronizedBlocks.getStaticCount()); + assertEquals(1000, SynchronizedBlocks.getStaticCount()); } @Test diff --git a/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java b/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedMethodsUnitTest.java similarity index 70% rename from core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java rename to core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedMethodsUnitTest.java index 32648729d5..1ccd18e709 100644 --- a/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java +++ b/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/synchronize/SynchronizedMethodsUnitTest.java @@ -10,16 +10,16 @@ import java.util.stream.IntStream; import static org.junit.Assert.assertEquals; -public class BaeldungSynchronizeMethodsUnitTest { +public class SynchronizedMethodsUnitTest { @Test @Ignore public void givenMultiThread_whenNonSyncMethod() throws InterruptedException { ExecutorService service = Executors.newFixedThreadPool(3); - BaeldungSynchronizedMethods method = new BaeldungSynchronizedMethods(); + SynchronizedMethods method = new SynchronizedMethods(); IntStream.range(0, 1000) - .forEach(count -> service.submit(method::calculate)); + .forEach(count -> service.submit(method::calculate)); service.awaitTermination(100, TimeUnit.MILLISECONDS); assertEquals(1000, method.getSum()); @@ -28,10 +28,10 @@ public class BaeldungSynchronizeMethodsUnitTest { @Test public void givenMultiThread_whenMethodSync() throws InterruptedException { ExecutorService service = Executors.newFixedThreadPool(3); - BaeldungSynchronizedMethods method = new BaeldungSynchronizedMethods(); + SynchronizedMethods method = new SynchronizedMethods(); IntStream.range(0, 1000) - .forEach(count -> service.submit(method::synchronisedCalculate)); + .forEach(count -> service.submit(method::synchronisedCalculate)); service.awaitTermination(100, TimeUnit.MILLISECONDS); assertEquals(1000, method.getSyncSum()); @@ -42,10 +42,10 @@ public class BaeldungSynchronizeMethodsUnitTest { ExecutorService service = Executors.newCachedThreadPool(); IntStream.range(0, 1000) - .forEach(count -> service.submit(BaeldungSynchronizedMethods::syncStaticCalculate)); + .forEach(count -> service.submit(SynchronizedMethods::syncStaticCalculate)); service.awaitTermination(100, TimeUnit.MILLISECONDS); - assertEquals(1000, BaeldungSynchronizedMethods.staticSum); + assertEquals(1000, SynchronizedMethods.staticSum); } }