From 7f039bf1f6c2c877d26732675cd4bb94efba7e3f Mon Sep 17 00:00:00 2001 From: Lentezz Date: Sun, 8 Jun 2025 18:55:52 +0300 Subject: [PATCH 1/2] Bux fix --- logs/app.log | 40 ++++++++++++++++++++++ src/main/java/core/basesyntax/Counter.java | 12 ++++--- 2 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 logs/app.log diff --git a/logs/app.log b/logs/app.log new file mode 100644 index 00000000..a1bee408 --- /dev/null +++ b/logs/app.log @@ -0,0 +1,40 @@ +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 6, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 9, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 8, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 2, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 16, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 18, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 5, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 16, counter value 16 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 18, counter value 15 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 2, counter value 17 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 19, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 11, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 5, counter value 14 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 7, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 6, counter value 18 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 15, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 14, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 12, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 3, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 11, counter value 12 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 10, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 15, counter value 10 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 20, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 12, counter value 8 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 1, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 3, counter value 6 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 13, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 17, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 4, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 13, counter value 4 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 17, counter value 3 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 10, counter value 7 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 4, counter value 2 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 1, counter value 5 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 14, counter value 9 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 7, counter value 11 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 19, counter value 13 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 8, counter value 19 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 20, counter value 1 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 9, counter value 0 diff --git a/src/main/java/core/basesyntax/Counter.java b/src/main/java/core/basesyntax/Counter.java index 4af46bd4..450c2c11 100644 --- a/src/main/java/core/basesyntax/Counter.java +++ b/src/main/java/core/basesyntax/Counter.java @@ -3,20 +3,22 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.concurrent.atomic.AtomicInteger; + public class Counter { private static final Logger logger = LogManager.getLogger(Counter.class); private static final String MESSAGE = "%20s, Thread # %2s, counter value %2d"; - private int value; + private AtomicInteger value; public Counter(int value) { - this.value = value; + this.value = new AtomicInteger(value); } public void decreaseValue() { logger.info(String.format(MESSAGE, - "Before decrementing", Thread.currentThread().getName(), value)); - value--; + "Before decrementing", Thread.currentThread().getName(), value.get())); + value.decrementAndGet(); logger.info(String.format(MESSAGE, - "After decrementing", Thread.currentThread().getName(), value)); + "After decrementing", Thread.currentThread().getName(), value.get())); } } From d2bc26a04efcba36ab41f0b0042582c8aacc4455 Mon Sep 17 00:00:00 2001 From: Lentezz Date: Sun, 8 Jun 2025 18:58:33 +0300 Subject: [PATCH 2/2] Code style fix --- logs/app.log | 68 +++++++++++----------- src/main/java/core/basesyntax/Counter.java | 3 +- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/logs/app.log b/logs/app.log index a1bee408..7c9faa98 100644 --- a/logs/app.log +++ b/logs/app.log @@ -1,40 +1,40 @@ -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 6, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 9, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 8, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 2, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 16, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 18, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 17, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 20, counter value 20 INFO core.basesyntax.Counter:18 Before decrementing, Thread # 5, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 16, counter value 16 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 18, counter value 15 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 2, counter value 17 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 19, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 11, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 5, counter value 14 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 7, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 6, counter value 18 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 15, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 14, counter value 20 INFO core.basesyntax.Counter:18 Before decrementing, Thread # 12, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 3, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 11, counter value 12 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 8, counter value 20 INFO core.basesyntax.Counter:18 Before decrementing, Thread # 10, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 15, counter value 10 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 20, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 12, counter value 8 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 1, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 3, counter value 6 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 8, counter value 18 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 12, counter value 17 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 3, counter value 20 INFO core.basesyntax.Counter:18 Before decrementing, Thread # 13, counter value 20 -INFO core.basesyntax.Counter:18 Before decrementing, Thread # 17, counter value 20 INFO core.basesyntax.Counter:18 Before decrementing, Thread # 4, counter value 20 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 13, counter value 4 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 17, counter value 3 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 10, counter value 7 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 4, counter value 2 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 1, counter value 5 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 11, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 13, counter value 13 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 4, counter value 12 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 3, counter value 13 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 1, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 11, counter value 11 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 14, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 6, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 15, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 1, counter value 10 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 9, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 6, counter value 8 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 16, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 19, counter value 20 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 18, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 9, counter value 7 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 2, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 19, counter value 5 +INFO core.basesyntax.Counter:18 Before decrementing, Thread # 7, counter value 20 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 2, counter value 3 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 18, counter value 4 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 7, counter value 2 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 16, counter value 6 INFO core.basesyntax.Counter:21 After decrementing, Thread # 14, counter value 9 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 7, counter value 11 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 19, counter value 13 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 8, counter value 19 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 20, counter value 1 -INFO core.basesyntax.Counter:21 After decrementing, Thread # 9, counter value 0 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 20, counter value 15 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 10, counter value 16 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 17, counter value 19 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 15, counter value 1 +INFO core.basesyntax.Counter:21 After decrementing, Thread # 5, counter value 0 diff --git a/src/main/java/core/basesyntax/Counter.java b/src/main/java/core/basesyntax/Counter.java index 450c2c11..6476a13b 100644 --- a/src/main/java/core/basesyntax/Counter.java +++ b/src/main/java/core/basesyntax/Counter.java @@ -1,10 +1,9 @@ package core.basesyntax; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.concurrent.atomic.AtomicInteger; - public class Counter { private static final Logger logger = LogManager.getLogger(Counter.class); private static final String MESSAGE = "%20s, Thread # %2s, counter value %2d";