This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch recycler-api-3.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cefdb05c6d8967a17b3146d3d0b31e93c5b62f53 Author: Volkan Yazıcı <[email protected]> AuthorDate: Wed Mar 29 15:12:28 2023 +0200 Fix minor issues --- .../log4j/core/GarbageCollectionHelper.java | 4 ++-- .../JsonTemplateLayoutConcurrentEncodeTest.java | 23 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java index afb38179f5..9917af6de6 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java @@ -16,8 +16,6 @@ */ package org.apache.logging.log4j.core; -import com.google.common.io.ByteStreams; - import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; @@ -25,6 +23,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import com.google.common.io.ByteStreams; + import static org.junit.Assert.assertTrue; public final class GarbageCollectionHelper implements Closeable, Runnable { diff --git a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java index 5a52785465..17cdd2ec1e 100644 --- a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java +++ b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java @@ -16,6 +16,16 @@ */ package org.apache.logging.log4j.layout.template.json; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; @@ -25,22 +35,11 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory; import org.apache.logging.log4j.core.layout.ByteBufferDestination; import org.apache.logging.log4j.core.layout.StringBuilderEncoder; -import org.apache.logging.log4j.util.Strings; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import static org.apache.logging.log4j.layout.template.json.TestHelpers.asMap; import static org.apache.logging.log4j.layout.template.json.TestHelpers.writeJson; import static org.assertj.core.api.Assertions.assertThat; @@ -177,7 +176,7 @@ class JsonTemplateLayoutConcurrentEncodeTest { // Determine the message to be logged. final String messageLetter = String.valueOf((char) ('A' + threadIndex)); - final String message = Strings.repeat(messageLetter, messageLength); + final String message = messageLetter.repeat(messageLength); // Create the worker thread. final String threadName = String.format("Worker-%d", threadIndex);
