From 93f1d61555d18be4a363a7e58d0d6ac2c018edad Mon Sep 17 00:00:00 2001 From: Maciej Glowka Date: Wed, 2 Sep 2020 23:56:02 +0200 Subject: [PATCH] BAEL-4297: fixed unsynchronized classes naming, added slf4j logging --- .../illegalmonitorstate/SynchronizedReceiver.java | 8 ++++++-- .../illegalmonitorstate/SynchronizedSender.java | 8 ++++++-- ...izedReceiver.java => UnsynchronizedReceiver.java} | 12 ++++++++---- ...hronizedSender.java => UnsynchronizedSender.java} | 12 ++++++++---- .../IllegalMonitorStateExceptionUnitTest.java | 4 ++-- 5 files changed, 30 insertions(+), 14 deletions(-) rename core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/{UnSynchronizedReceiver.java => UnsynchronizedReceiver.java} (66%) rename core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/{UnSynchronizedSender.java => UnsynchronizedSender.java} (64%) diff --git a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedReceiver.java b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedReceiver.java index 3dffb7b30a..ff6b926cdc 100644 --- a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedReceiver.java +++ b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedReceiver.java @@ -1,6 +1,10 @@ package com.baeldung.exceptions.illegalmonitorstate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class SynchronizedReceiver implements Runnable { + private static Logger log = LoggerFactory.getLogger(SynchronizedReceiver.class); private final Data data; private String message; private boolean illegalMonitorStateExceptionOccurred; @@ -16,10 +20,10 @@ public class SynchronizedReceiver implements Runnable { data.wait(); this.message = data.receive(); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("thread was interrupted", e); Thread.currentThread().interrupt(); } catch (IllegalMonitorStateException e) { - e.printStackTrace(); + log.error("illegal monitor state exception occurred", e); illegalMonitorStateExceptionOccurred = true; } } diff --git a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedSender.java b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedSender.java index 04bac03e77..1618bc8efa 100644 --- a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedSender.java +++ b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/SynchronizedSender.java @@ -1,6 +1,10 @@ package com.baeldung.exceptions.illegalmonitorstate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class SynchronizedSender implements Runnable { + private static Logger log = LoggerFactory.getLogger(SynchronizedSender.class); private final Data data; private boolean illegalMonitorStateExceptionOccurred; @@ -18,10 +22,10 @@ public class SynchronizedSender implements Runnable { data.notifyAll(); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("thread was interrupted", e); Thread.currentThread().interrupt(); } catch (IllegalMonitorStateException e) { - e.printStackTrace(); + log.error("illegal monitor state exception occurred", e); illegalMonitorStateExceptionOccurred = true; } } diff --git a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnSynchronizedReceiver.java b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnsynchronizedReceiver.java similarity index 66% rename from core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnSynchronizedReceiver.java rename to core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnsynchronizedReceiver.java index a8e8befc4d..3a0b72e6cd 100644 --- a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnSynchronizedReceiver.java +++ b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnsynchronizedReceiver.java @@ -1,11 +1,15 @@ package com.baeldung.exceptions.illegalmonitorstate; -public class UnSynchronizedReceiver implements Runnable { +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UnsynchronizedReceiver implements Runnable { + private static Logger log = LoggerFactory.getLogger(UnsynchronizedReceiver.class); private final Data data; private String message; private boolean illegalMonitorStateExceptionOccurred; - public UnSynchronizedReceiver(Data data) { + public UnsynchronizedReceiver(Data data) { this.data = data; } @@ -15,10 +19,10 @@ public class UnSynchronizedReceiver implements Runnable { data.wait(); this.message = data.receive(); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("thread was interrupted", e); Thread.currentThread().interrupt(); } catch (IllegalMonitorStateException e) { - e.printStackTrace(); + log.error("illegal monitor state exception occurred", e); illegalMonitorStateExceptionOccurred = true; } } diff --git a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnSynchronizedSender.java b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnsynchronizedSender.java similarity index 64% rename from core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnSynchronizedSender.java rename to core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnsynchronizedSender.java index eb6fa16649..7f15418bfa 100644 --- a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnSynchronizedSender.java +++ b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/illegalmonitorstate/UnsynchronizedSender.java @@ -1,10 +1,14 @@ package com.baeldung.exceptions.illegalmonitorstate; -public class UnSynchronizedSender implements Runnable { +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UnsynchronizedSender implements Runnable { + private static Logger log = LoggerFactory.getLogger(UnsynchronizedSender.class); private final Data data; private boolean illegalMonitorStateExceptionOccurred; - public UnSynchronizedSender(Data data) { + public UnsynchronizedSender(Data data) { this.data = data; } @@ -17,10 +21,10 @@ public class UnSynchronizedSender implements Runnable { data.notifyAll(); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("thread was interrupted", e); Thread.currentThread().interrupt(); } catch (IllegalMonitorStateException e) { - e.printStackTrace(); + log.error("illegal monitor state exception occurred", e); illegalMonitorStateExceptionOccurred = true; } } diff --git a/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/illegalmonitorstate/IllegalMonitorStateExceptionUnitTest.java b/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/illegalmonitorstate/IllegalMonitorStateExceptionUnitTest.java index 800cdc4a7b..a729facdbd 100644 --- a/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/illegalmonitorstate/IllegalMonitorStateExceptionUnitTest.java +++ b/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/illegalmonitorstate/IllegalMonitorStateExceptionUnitTest.java @@ -30,7 +30,7 @@ public class IllegalMonitorStateExceptionUnitTest { void whenSyncSenderAndUnSyncReceiverAreUsed_thenIllegalMonitorExceptionShouldNotBeThrown() throws InterruptedException { Data data = new Data(); - UnSynchronizedReceiver receiver = new UnSynchronizedReceiver(data); + UnsynchronizedReceiver receiver = new UnsynchronizedReceiver(data); Thread receiverThread = new Thread(receiver, "receiver-thread"); receiverThread.start(); @@ -55,7 +55,7 @@ public class IllegalMonitorStateExceptionUnitTest { Thread receiverThread = new Thread(receiver, "receiver-thread"); receiverThread.start(); - UnSynchronizedSender sender = new UnSynchronizedSender(data); + UnsynchronizedSender sender = new UnsynchronizedSender(data); Thread senderThread = new Thread(sender, "sender-thread"); senderThread.start();