From d726312341cc3886d033e5302081b51b1f51f772 Mon Sep 17 00:00:00 2001 From: Emmanuel Bigeon Date: Sun, 7 Nov 2021 11:45:29 +0100 Subject: [PATCH] [fix] Use string concatenation in delegated function for logging Signed-off-by: Emmanuel Bigeon --- gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java | 4 ++-- gclc/src/main/java/net/bigeon/gclc/i18n/Messages.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java b/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java index 22b4ef1..aaf03a0 100644 --- a/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java +++ b/gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java @@ -191,7 +191,7 @@ public final class ConsoleApplication implements ICommandProvider { args = GCLCConstants.splitCommand(cmd); } catch (final CommandParsingException e) { out.println("Command line cannot be parsed"); //$NON-NLS-1$ - LOGGER.log(Level.FINE, "Invalid user command " + cmd, e); //$NON-NLS-1$ + LOGGER.log(Level.FINE, e, () -> "Invalid user command " + cmd); //$NON-NLS-1$ return; } if (!args.isEmpty()) { @@ -199,7 +199,7 @@ public final class ConsoleApplication implements ICommandProvider { executeSub(out, in, args.get(0), Arrays.copyOfRange(args.toArray(new String[0]), 1, args.size())); } catch (final CommandRunException e) { - LOGGER.log(Level.FINE, "Command failed: " + cmd, e); //$NON-NLS-1$ + LOGGER.log(Level.FINE, e, () -> "Command failed: " + cmd); //$NON-NLS-1$ out.println(Messages.getString("ConsoleApplication.cmd.failed", cmd)); //$NON-NLS-1$ out.println(e.getLocalizedMessage()); if (e.getType() == CommandRunExceptionType.USAGE) { diff --git a/gclc/src/main/java/net/bigeon/gclc/i18n/Messages.java b/gclc/src/main/java/net/bigeon/gclc/i18n/Messages.java index 090da7f..4f73f4d 100644 --- a/gclc/src/main/java/net/bigeon/gclc/i18n/Messages.java +++ b/gclc/src/main/java/net/bigeon/gclc/i18n/Messages.java @@ -105,8 +105,8 @@ public final class Messages { try { return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args); } catch (final MissingResourceException e) { - LOGGER.log(Level.WARNING, - "Unrecognized internationalization message key: " + key, e); //$NON-NLS-1$ + LOGGER.log(Level.WARNING, e, + () -> "Unrecognized internationalization message key: " + key); //$NON-NLS-1$ return '!' + key + '!'; } }