From ba7e2d6d1a7e2bd2ba8f8f960159bad92f58bafa Mon Sep 17 00:00:00 2001 From: Manuel Sebastian Blanco Date: Sun, 17 Dec 2023 22:57:46 +0100 Subject: [PATCH 1/2] Refactored log capture and formatting code in org.openqa.selenium.testing and org.openqa.selenium.grid.log packages. --- java/src/org/openqa/selenium/grid/log/TerseFormatter.java | 4 ++-- java/test/org/openqa/selenium/testing/CaptureLoggingRule.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/src/org/openqa/selenium/grid/log/TerseFormatter.java b/java/src/org/openqa/selenium/grid/log/TerseFormatter.java index 3cf94917b7d3f..86d1cec2683cd 100644 --- a/java/src/org/openqa/selenium/grid/log/TerseFormatter.java +++ b/java/src/org/openqa/selenium/grid/log/TerseFormatter.java @@ -41,7 +41,7 @@ public class TerseFormatter extends Formatter { * Line separator string. This is the value of the line.separator property at the moment that the * TerseFormatter was created. */ - private final String lineSeparator = System.getProperty("line.separator"); + private final String lineSeparator = System.lineSeparator(); /* * DGF - These have to be compile time constants to be used with switch @@ -78,7 +78,7 @@ public synchronized String format(final LogRecord record) { buffer.append(' '); buffer.append(levelNumberToCommonsLevelName(record.getLevel())); String[] parts = record.getSourceClassName().split("\\."); - buffer.append(" [" + parts[parts.length - 1] + "." + record.getSourceMethodName() + "]"); + buffer.append(" [").append(parts[parts.length - 1]).append(".").append(record.getSourceMethodName()).append("]"); buffer.append(SUFFIX); buffer.append(formatMessage(record)).append(lineSeparator); if (record.getThrown() != null) { diff --git a/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java b/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java index 1ecc33e49a572..5e84b55cfd7d8 100644 --- a/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java +++ b/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java @@ -135,7 +135,7 @@ public String format(LogRecord record) { .append("]"); } buffer.append(" - "); - buffer.append(formatMessage(record)).append(System.getProperty("line.separator")); + buffer.append(formatMessage(record)).append(System.lineSeparator()); if (record.getThrown() != null) { final StringWriter trace = new StringWriter(); record.getThrown().printStackTrace(new PrintWriter(trace)); From 2e6ff6a03e14dc5b6acc0ced7c1a889b5926e700 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 18 Dec 2023 10:11:57 +0000 Subject: [PATCH 2/2] Format files --- java/src/org/openqa/selenium/grid/log/TerseFormatter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/grid/log/TerseFormatter.java b/java/src/org/openqa/selenium/grid/log/TerseFormatter.java index 86d1cec2683cd..b672c650f687d 100644 --- a/java/src/org/openqa/selenium/grid/log/TerseFormatter.java +++ b/java/src/org/openqa/selenium/grid/log/TerseFormatter.java @@ -78,7 +78,12 @@ public synchronized String format(final LogRecord record) { buffer.append(' '); buffer.append(levelNumberToCommonsLevelName(record.getLevel())); String[] parts = record.getSourceClassName().split("\\."); - buffer.append(" [").append(parts[parts.length - 1]).append(".").append(record.getSourceMethodName()).append("]"); + buffer + .append(" [") + .append(parts[parts.length - 1]) + .append(".") + .append(record.getSourceMethodName()) + .append("]"); buffer.append(SUFFIX); buffer.append(formatMessage(record)).append(lineSeparator); if (record.getThrown() != null) {