From 301317533edf246c7d0ebfcbef3d0d2d6df5105f Mon Sep 17 00:00:00 2001 From: kongleong86 Date: Sat, 2 Dec 2023 12:25:00 +0000 Subject: [PATCH] refactoring #1012: Format specifiers should be used instead of string concatenation. (#2715) * refactoring #1012: Format specifiers should be used instead of string concatenation. * refactoring #1012: Format specifiers should be used instead of string concatenation. * refactoring #1012: Remove isInfoEnabled check --- .../main/java/com/iluwatar/commander/Commander.java | 4 ++-- extension-objects/src/main/java/App.java | 2 +- .../src/main/java/com/iluwatar/gameloop/GameLoop.java | 10 +++++----- .../java/com/iluwatar/specialcase/InvalidUser.java | 2 +- .../java/com/iluwatar/specialcase/MaintenanceLock.java | 2 +- .../main/java/com/iluwatar/specialcase/OutOfStock.java | 6 +++--- .../main/java/com/iluwatar/specialcase/ReceiptDto.java | 4 ++-- .../java/com/iluwatar/subclasssandbox/Superpower.java | 6 +++--- .../main/java/com/iluwatar/updatemethod/Statue.java | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/commander/src/main/java/com/iluwatar/commander/Commander.java b/commander/src/main/java/com/iluwatar/commander/Commander.java index 5505e5686..6b6c90a03 100644 --- a/commander/src/main/java/com/iluwatar/commander/Commander.java +++ b/commander/src/main/java/com/iluwatar/commander/Commander.java @@ -477,8 +477,8 @@ public class Commander { && System.currentTimeMillis() - o.createdTime < messageTime) { var qt = new QueueTask(order, TaskType.MESSAGING, 1); updateQueue(qt); - LOG.warn("Order " + order.id + ": Error in sending Payment Error message, " - + "trying to queue task and add to employee handle.."); + LOG.warn("Order {}: Error in sending Payment Error message, trying to queue task and add to employee handle..", + order.id); employeeHandleIssue(o); } } diff --git a/extension-objects/src/main/java/App.java b/extension-objects/src/main/java/App.java index 8efb60511..dd67b2e1e 100644 --- a/extension-objects/src/main/java/App.java +++ b/extension-objects/src/main/java/App.java @@ -62,7 +62,7 @@ public class App { final var logger = LoggerFactory.getLogger(App.class); var name = unit.getName(); - Function func = (e) -> () -> logger.info(name + " without " + e); + Function func = e -> () -> logger.info("{} without {}", name, e); var extension = "SoldierExtension"; Optional.ofNullable(unit.getUnitExtension(extension)) diff --git a/game-loop/src/main/java/com/iluwatar/gameloop/GameLoop.java b/game-loop/src/main/java/com/iluwatar/gameloop/GameLoop.java index 81d541c9d..6ad8c2c52 100644 --- a/game-loop/src/main/java/com/iluwatar/gameloop/GameLoop.java +++ b/game-loop/src/main/java/com/iluwatar/gameloop/GameLoop.java @@ -39,12 +39,10 @@ public abstract class GameLoop { protected final GameController controller; - private Thread gameThread; - /** * Initialize game status to be stopped. */ - public GameLoop() { + protected GameLoop() { controller = new GameController(); status = GameStatus.STOPPED; } @@ -54,7 +52,7 @@ public abstract class GameLoop { */ public void run() { status = GameStatus.RUNNING; - gameThread = new Thread(this::processGameLoop); + Thread gameThread = new Thread(this::processGameLoop); gameThread.start(); } @@ -85,6 +83,8 @@ public abstract class GameLoop { Thread.sleep(lag); } catch (InterruptedException e) { logger.error(e.getMessage()); + /* Clean up whatever needs to be handled before interrupting */ + Thread.currentThread().interrupt(); } } @@ -94,7 +94,7 @@ public abstract class GameLoop { */ protected void render() { var position = controller.getBulletPosition(); - logger.info("Current bullet position: " + position); + logger.info("Current bullet position: {}", position); } /** diff --git a/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java b/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java index 681b9077c..861d69e8c 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java @@ -42,6 +42,6 @@ public class InvalidUser implements ReceiptViewModel { @Override public void show() { - LOGGER.info("Invalid user: " + userName); + LOGGER.info(String.format("Invalid user: %s", userName)); } } diff --git a/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java b/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java index 3abef8b13..341dbee85 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java @@ -55,6 +55,6 @@ public class MaintenanceLock { public void setLock(boolean lock) { this.lock = lock; - LOGGER.info("Maintenance lock is set to: ", lock); + LOGGER.info("Maintenance lock is set to: {}", lock); } } diff --git a/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java b/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java index 9a04a63f5..5bfa09186 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java @@ -34,8 +34,8 @@ public class OutOfStock implements ReceiptViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(OutOfStock.class); - private String userName; - private String itemName; + private final String userName; + private final String itemName; public OutOfStock(String userName, String itemName) { this.userName = userName; @@ -44,6 +44,6 @@ public class OutOfStock implements ReceiptViewModel { @Override public void show() { - LOGGER.info("Out of stock: " + itemName + " for user = " + userName + " to buy"); + LOGGER.info(String.format("Out of stock: %s for user = %s to buy", itemName, userName)); } } diff --git a/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java b/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java index b3e9db303..c619ee87d 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java @@ -34,7 +34,7 @@ public class ReceiptDto implements ReceiptViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(ReceiptDto.class); - private Double price; + private final Double price; public ReceiptDto(Double price) { this.price = price; @@ -46,6 +46,6 @@ public class ReceiptDto implements ReceiptViewModel { @Override public void show() { - LOGGER.info("Receipt: " + price + " paid"); + LOGGER.info(String.format("Receipt: %s paid", price)); } } diff --git a/subclass-sandbox/src/main/java/com/iluwatar/subclasssandbox/Superpower.java b/subclass-sandbox/src/main/java/com/iluwatar/subclasssandbox/Superpower.java index 4e520f397..3c4f42aba 100644 --- a/subclass-sandbox/src/main/java/com/iluwatar/subclasssandbox/Superpower.java +++ b/subclass-sandbox/src/main/java/com/iluwatar/subclasssandbox/Superpower.java @@ -47,7 +47,7 @@ public abstract class Superpower { * @param z Z coordinate. */ protected void move(double x, double y, double z) { - logger.info("Move to ( " + x + ", " + y + ", " + z + " )"); + logger.info("Move to ( {}, {}, {} )", x, y, z); } /** @@ -56,7 +56,7 @@ public abstract class Superpower { * @param volume Value of volume. */ protected void playSound(String soundName, int volume) { - logger.info("Play " + soundName + " with volume " + volume); + logger.info("Play {} with volume {}", soundName, volume); } /** @@ -65,6 +65,6 @@ public abstract class Superpower { * @param count Count of particles to be spawned. */ protected void spawnParticles(String particleType, int count) { - logger.info("Spawn " + count + " particle with type " + particleType); + logger.info("Spawn {} particle with type {}", count, particleType); } } diff --git a/update-method/src/main/java/com/iluwatar/updatemethod/Statue.java b/update-method/src/main/java/com/iluwatar/updatemethod/Statue.java index 7126727d4..7212a7a1b 100644 --- a/update-method/src/main/java/com/iluwatar/updatemethod/Statue.java +++ b/update-method/src/main/java/com/iluwatar/updatemethod/Statue.java @@ -65,6 +65,6 @@ public class Statue extends Entity { } private void shootLightning() { - logger.info("Statue " + id + " shoots lightning!"); + logger.info("Statue {} shoots lightning!", id); } }