From 23c1abe3f27ef327eefaf3911aa15cb630a927a7 Mon Sep 17 00:00:00 2001 From: jsgrah-spring Date: Mon, 10 Apr 2023 13:35:40 +0200 Subject: [PATCH] JAVA-18116 Review log statements for projects - Week 7 - 2023 (#13583) JAVA-18116 Review log statements for projects - Week 7 - 2023 (#13583) --------- Co-authored-by: jogra --- .../concurrent/countdownlatch/Worker.java | 7 ++++++- .../concurrent/phaser/LongRunningAction.java | 15 ++++++++++----- .../concurrent/phaser/PhaserUnitTest.java | 15 ++++++++++----- .../src/test/resources/logback-test.xml | 19 +++++++++++++++++++ libraries-apache-commons-io/pom.xml | 5 +++++ .../commons/io/CommonsIOUnitTest.java | 9 ++++++--- .../src/test/resources/logback-test.xml | 12 ++++++++++++ .../model/HighEndComputerBuilder.java | 5 ++++- .../model/StandardComputerBuilder.java | 7 +++++-- .../src/test/resources/logback-test.xml | 12 ++++++++++++ .../service/TaxiFareCalculatorService.java | 6 +++++- .../VertxWithRxJavaIntegrationTest.java | 10 +++++----- 12 files changed, 99 insertions(+), 23 deletions(-) create mode 100644 core-java-modules/core-java-concurrency-advanced/src/test/resources/logback-test.xml create mode 100644 libraries-apache-commons-io/src/test/resources/logback-test.xml create mode 100644 patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java index 389e25719b..d23f1faa69 100644 --- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java +++ b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java @@ -1,9 +1,14 @@ package com.baeldung.concurrent.countdownlatch; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.List; import java.util.concurrent.CountDownLatch; public class Worker implements Runnable { + + private static Logger log = LoggerFactory.getLogger(Worker.class); private final List outputScraper; private final CountDownLatch countDownLatch; @@ -15,7 +20,7 @@ public class Worker implements Runnable { @Override public void run() { // Do some work - System.out.println("Doing some logic"); + log.debug("Doing some logic"); outputScraper.add("Counted down"); countDownLatch.countDown(); } diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java index c022c02085..44f84ad77c 100644 --- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java +++ b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java @@ -1,8 +1,13 @@ package com.baeldung.concurrent.phaser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.concurrent.Phaser; class LongRunningAction implements Runnable { + + private static Logger log = LoggerFactory.getLogger(LongRunningAction.class); private String threadName; private Phaser ph; @@ -14,18 +19,18 @@ class LongRunningAction implements Runnable { @Override public void run() { - System.out.println("This is phase " + ph.getPhase()); - System.out.println("Thread " + threadName + " before long running action"); + log.info("This is phase {}", ph.getPhase()); + log.info("Thread {} before long running action", threadName); try { Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); } - - System.out.println("Thread " + threadName + " action completed and waiting for others"); + + log.debug("Thread {} action completed and waiting for others", threadName); ph.arriveAndAwaitAdvance(); - System.out.println("Thread " + threadName + " proceeding in phase " + ph.getPhase()); + log.debug("Thread {} proceeding in phase {}", threadName, ph.getPhase()); ph.arriveAndDeregister(); } diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java index 88c18b5149..384a1837c1 100644 --- a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java +++ b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java @@ -4,6 +4,9 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Phaser; @@ -13,6 +16,8 @@ import static junit.framework.TestCase.assertEquals; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PhaserUnitTest { + private static Logger log = LoggerFactory.getLogger(PhaserUnitTest.class); + @Test public void givenPhaser_whenCoordinateWorksBetweenThreads_thenShouldCoordinateBetweenMultiplePhases() { //given @@ -26,19 +31,19 @@ public class PhaserUnitTest { executorService.submit(new LongRunningAction("thread-3", ph)); //then - System.out.println("Thread " + Thread.currentThread().getName() + " waiting for others"); + log.debug("Thread {} waiting for others", Thread.currentThread().getName()); ph.arriveAndAwaitAdvance(); - System.out.println("Thread " + Thread.currentThread().getName() + " proceeding in phase " + ph.getPhase()); + log.debug("Thread {} proceeding in phase {}", Thread.currentThread().getName(), ph.getPhase()); assertEquals(1, ph.getPhase()); //and executorService.submit(new LongRunningAction("thread-4", ph)); executorService.submit(new LongRunningAction("thread-5", ph)); - - System.out.println("Thread " + Thread.currentThread().getName() + " waiting for others"); + + log.debug("Thread {} waiting for others", Thread.currentThread().getName()); ph.arriveAndAwaitAdvance(); - System.out.println("Thread " + Thread.currentThread().getName() + " proceeding in phase " + ph.getPhase()); + log.debug("Thread {} proceeding in phase {}", Thread.currentThread().getName(), ph.getPhase()); assertEquals(2, ph.getPhase()); diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/resources/logback-test.xml b/core-java-modules/core-java-concurrency-advanced/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..56af2d397e --- /dev/null +++ b/core-java-modules/core-java-concurrency-advanced/src/test/resources/logback-test.xml @@ -0,0 +1,19 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries-apache-commons-io/pom.xml b/libraries-apache-commons-io/pom.xml index 7cac50a8e2..ca5cc4574d 100644 --- a/libraries-apache-commons-io/pom.xml +++ b/libraries-apache-commons-io/pom.xml @@ -23,6 +23,11 @@ commons-io ${commons-io.version} + + org.projectlombok + lombok + ${lombok.version} + diff --git a/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java b/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java index 7481e5a1a3..ce98e8026e 100644 --- a/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java +++ b/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java @@ -22,6 +22,9 @@ import java.io.FilterOutputStream; import java.io.IOException; import java.nio.charset.Charset; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class CommonsIOUnitTest { @Test @@ -47,9 +50,9 @@ public class CommonsIOUnitTest { String extension = FilenameUtils.getExtension(path); String baseName = FilenameUtils.getBaseName(path); - System.out.println("full path" + fullPath); - System.out.println("Extension" + extension); - System.out.println("Base name" + baseName); + log.debug("full path: " + fullPath); + log.debug("Extension: " + extension); + log.debug("Base name: " + baseName); } @Test diff --git a/libraries-apache-commons-io/src/test/resources/logback-test.xml b/libraries-apache-commons-io/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..499cc828a2 --- /dev/null +++ b/libraries-apache-commons-io/src/test/resources/logback-test.xml @@ -0,0 +1,12 @@ + + + + + %d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n + + + + + + + \ No newline at end of file diff --git a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java index 2ee6f93f9b..e06f1291a6 100644 --- a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java +++ b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java @@ -1,5 +1,8 @@ package com.baeldung.templatemethod.model; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class HighEndComputerBuilder extends ComputerBuilder { @Override @@ -11,7 +14,7 @@ public class HighEndComputerBuilder extends ComputerBuilder { public void setupMotherboard() { motherboardSetupStatus.add("Screwing the high-end motherboard to the case."); motherboardSetupStatus.add("Pluging in the power supply connectors."); - motherboardSetupStatus.forEach(step -> System.out.println(step)); + motherboardSetupStatus.forEach(step -> log.debug(step)); } @Override diff --git a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java index da2c2e9b2d..f5b953c830 100644 --- a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java +++ b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java @@ -1,5 +1,8 @@ package com.baeldung.templatemethod.model; - + +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class StandardComputerBuilder extends ComputerBuilder { @Override @@ -11,7 +14,7 @@ public class StandardComputerBuilder extends ComputerBuilder { public void setupMotherboard() { motherboardSetupStatus.add("Screwing the standard motherboard to the case."); motherboardSetupStatus.add("Pluging in the power supply connectors."); - motherboardSetupStatus.forEach(step -> System.out.println(step)); + motherboardSetupStatus.forEach(step -> log.debug(step)); } @Override diff --git a/patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml b/patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..499cc828a2 --- /dev/null +++ b/patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml @@ -0,0 +1,12 @@ + + + + + %d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n + + + + + + + \ No newline at end of file diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java index c2c5b399df..8f6f49c29b 100644 --- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java +++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java @@ -2,6 +2,8 @@ package com.baeldung.spring.drools.service; import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,6 +13,8 @@ import com.baeldung.spring.drools.model.TaxiRide; @Service public class TaxiFareCalculatorService { + private static final Logger LOGGER = LoggerFactory.getLogger(TaxiFareCalculatorService.class); + @Autowired private KieContainer kContainer; @@ -20,7 +24,7 @@ public class TaxiFareCalculatorService { kieSession.insert(taxiRide); kieSession.fireAllRules(); kieSession.dispose(); - System.out.println("!! RIDE FARE !! " + rideFare.getTotalFare()); + LOGGER.debug("!! RIDE FARE !! " + rideFare.getTotalFare()); return rideFare.getTotalFare(); } } diff --git a/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java b/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java index a2ddbe5007..d5d58438e2 100644 --- a/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java +++ b/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java @@ -45,18 +45,18 @@ public class VertxWithRxJavaIntegrationTest { // read the file that contains one city name per line fileSystem .rxReadFile("cities.txt").toFlowable() - .doOnNext(buffer -> log.info("File buffer ---\n{}\n---", buffer)) + .doOnNext(buffer -> log.debug("File buffer ---\n{}\n---", buffer)) .flatMap(buffer -> Flowable.fromArray(buffer.toString().split("\\r?\\n"))) - .doOnNext(city -> log.info("City from file: '{}'", city)) + .doOnNext(city -> log.debug("City from file: '{}'", city)) .filter(city -> !city.startsWith("#")) - .doOnNext(city -> log.info("City that survived filtering: '{}'", city)) + .doOnNext(city -> log.debug("City that survived filtering: '{}'", city)) .flatMap(city -> searchByCityName(httpClient, city)) .flatMap(HttpClientResponse::toFlowable) - .doOnNext(buffer -> log.info("JSON of city detail: '{}'", buffer)) + .doOnNext(buffer -> log.debug("JSON of city detail: '{}'", buffer)) .map(extractingWoeid()) .flatMap(cityId -> getDataByPlaceId(httpClient, cityId)) .flatMap(toBufferFlowable()) - .doOnNext(buffer -> log.info("JSON of place detail: '{}'", buffer)) + .doOnNext(buffer -> log.debug("JSON of place detail: '{}'", buffer)) .map(Buffer::toJsonObject) .map(toCityAndDayLength()) .subscribe(System.out::println, Throwable::printStackTrace);