This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 3401968 Minor improvements. (#497)
3401968 is described below
commit 3401968127d88c6e74cd388384cbecfed91fd8aa
Author: Arturo Bernal <[email protected]>
AuthorDate: Tue Jun 1 21:08:25 2021 +0200
Minor improvements. (#497)
* Remove Unused import
* Unnecessary interface modifier
* Replace array whit empty parameter
* Inline variable
* Simplify "if else"
---
log4j-api/src/main/java/org/apache/logging/log4j/Level.java | 2 +-
.../src/main/java/org/apache/logging/log4j/LogBuilder.java | 2 +-
.../logging/log4j/message/BasicThreadInformation.java | 6 +-----
.../org/apache/logging/log4j/message/FormattedMessage.java | 6 +-----
.../apache/logging/log4j/message/ParameterizedMessage.java | 6 +-----
.../apache/logging/log4j/message/StructuredDataMessage.java | 6 +-----
.../org/apache/logging/log4j/message/ThreadDumpMessage.java | 2 +-
.../log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 10 ++--------
.../apache/logging/log4j/spi/DefaultThreadContextMap.java | 10 ++--------
.../apache/logging/log4j/spi/DefaultThreadContextStack.java | 2 +-
.../log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 10 ++--------
.../org/apache/logging/log4j/spi/LoggerContextFactory.java | 1 -
.../apache/logging/log4j/spi/MutableThreadContextStack.java | 13 +++----------
.../main/java/org/apache/logging/log4j/util/LoaderUtil.java | 8 +-------
.../java/org/apache/logging/log4j/util/ProviderUtil.java | 1 -
.../java/org/apache/logging/log4j/util/StackLocator.java | 3 ---
.../src/main/java/org/apache/logging/log4j/util/Timer.java | 6 +-----
.../apache/logging/log4j/util/SortedArrayStringMapTest.java | 3 +--
.../org/apache/logging/log4j/util/StackLocatorUtilTest.java | 2 --
.../apache/logging/log4j/util/Unbox2ConfigurableTest.java | 2 --
20 files changed, 20 insertions(+), 81 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
index 58507d0..9355494 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
@@ -299,7 +299,7 @@ public final class Level implements Comparable<Level>,
Serializable {
*/
public static Level[] values() {
final Collection<Level> values = Level.LEVELS.values();
- return values.toArray(new Level[values.size()]);
+ return values.toArray(new Level[0]);
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
index e5aa572..dca25fe 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.util.Supplier;
*/
public interface LogBuilder {
- public static final LogBuilder NOOP = new LogBuilder() {};
+ LogBuilder NOOP = new LogBuilder() {};
/**
* Includes a Marker in the log event. Interface default method does
nothing.
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
index 623ab89..9f2ed3d 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
@@ -64,11 +64,7 @@ class BasicThreadInformation implements ThreadInformation {
if (id != that.id) {
return false;
}
- if (name != null ? !name.equals(that.name) : that.name != null) {
- return false;
- }
-
- return true;
+ return name != null ? name.equals(that.name) : that.name == null;
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
index a13fd99..cbeb7d9 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
@@ -149,11 +149,7 @@ public class FormattedMessage implements Message {
if (messagePattern != null ?
!messagePattern.equals(that.messagePattern) : that.messagePattern != null) {
return false;
}
- if (!Arrays.equals(stringArgs, that.stringArgs)) {
- return false;
- }
-
- return true;
+ return Arrays.equals(stringArgs, that.stringArgs);
}
/**
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
index 3289667..9ab84a4 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
@@ -240,12 +240,8 @@ public class ParameterizedMessage implements Message,
StringBuilderFormattable {
if (messagePattern != null ?
!messagePattern.equals(that.messagePattern) : that.messagePattern != null) {
return false;
}
- if (!Arrays.equals(this.argArray, that.argArray)) {
- return false;
- }
+ return Arrays.equals(this.argArray, that.argArray);
//if (throwable != null ? !throwable.equals(that.throwable) :
that.throwable != null) return false;
-
- return true;
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
index 2980ab5..a2ba89a 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
@@ -432,11 +432,7 @@ public class StructuredDataMessage extends
MapMessage<StructuredDataMessage, Str
if (id != null ? !id.equals(that.id) : that.id != null) {
return false;
}
- if (message != null ? !message.equals(that.message) : that.message !=
null) {
- return false;
- }
-
- return true;
+ return message != null ? message.equals(that.message) : that.message
== null;
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
index d736e00..3c6166c 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
@@ -172,7 +172,7 @@ public class ThreadDumpMessage implements Message,
StringBuilderFormattable {
* Implementations of this class are loaded via the standard java Service
Provider interface.
* </p>
*/
- public static interface ThreadInfoFactory {
+ public interface ThreadInfoFactory {
Map<ThreadInformation, StackTraceElement[]> createThreadInfo();
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
index 97fb7b9..43ab1d4 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.spi;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.SortedArrayStringMap;
@@ -266,13 +267,6 @@ class CopyOnWriteSortedArrayThreadContextMap implements
ReadOnlyThreadContextMap
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.getImmutableMapOrNull();
final Map<String, String> otherMap = other.getImmutableMapOrNull();
- if (map == null) {
- if (otherMap != null) {
- return false;
- }
- } else if (!map.equals(otherMap)) {
- return false;
- }
- return true;
+ return Objects.equals(map, otherMap);
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index 4d05937..c3feac0 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.spi;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.util.BiConsumer;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
@@ -237,13 +238,6 @@ public class DefaultThreadContextMap implements
ThreadContextMap, ReadOnlyString
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.localMap.get();
final Map<String, String> otherMap = other.getImmutableMapOrNull();
- if (map == null) {
- if (otherMap != null) {
- return false;
- }
- } else if (!map.equals(otherMap)) {
- return false;
- }
- return true;
+ return Objects.equals(map, otherMap);
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
index 7a07a89..e577264 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
@@ -261,7 +261,7 @@ public class DefaultThreadContextStack implements
ThreadContextStack, StringBuil
if (result == null) {
return new String[0];
}
- return result.toArray(new Object[result.size()]);
+ return result.toArray(new Object[0]);
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
index 186e2a8..bd77559 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.spi;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.StringMap;
@@ -258,13 +259,6 @@ class GarbageFreeSortedArrayThreadContextMap implements
ReadOnlyThreadContextMap
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.getImmutableMapOrNull();
final Map<String, String> otherMap = other.getImmutableMapOrNull();
- if (map == null) {
- if (otherMap != null) {
- return false;
- }
- } else if (!map.equals(otherMap)) {
- return false;
- }
- return true;
+ return Objects.equals(map, otherMap);
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
index 61a30cc..ad29c57 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.spi;
import java.net.URI;
-import java.util.concurrent.TimeUnit;
/**
* Implemented by factories that create {@link LoggerContext} objects.
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
index be111e3..ab18cc5 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import org.apache.logging.log4j.ThreadContext.ContextStack;
import org.apache.logging.log4j.util.StringBuilderFormattable;
@@ -69,8 +70,7 @@ public class MutableThreadContextStack implements
ThreadContextStack, StringBuil
return null;
}
final int last = list.size() - 1;
- final String result = list.remove(last);
- return result;
+ return list.remove(last);
}
@Override
@@ -230,14 +230,7 @@ public class MutableThreadContextStack implements
ThreadContextStack, StringBuil
}
final ThreadContextStack other = (ThreadContextStack) obj;
final List<String> otherAsList = other.asList();
- if (this.list == null) {
- if (otherAsList != null) {
- return false;
- }
- } else if (!this.list.equals(otherAsList)) {
- return false;
- }
- return true;
+ return Objects.equals(list, otherAsList);
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 3f9dd5b..f98bd39 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -23,9 +23,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.LinkedHashSet;
-import java.util.Map;
import java.util.Objects;
/**
@@ -433,11 +431,7 @@ public final class LoaderUtil {
if (classLoader != null ? !classLoader.equals(that.classLoader) :
that.classLoader != null) {
return false;
}
- if (url != null ? !url.equals(that.url) : that.url != null) {
- return false;
- }
-
- return true;
+ return url != null ? url.equals(that.url) : that.url == null;
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index 2534b21..0a01886 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.util;
import java.io.IOException;
import java.net.URL;
import java.util.Collection;
-import java.util.Enumeration;
import java.util.HashSet;
import java.util.Properties;
import java.util.ServiceLoader;
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
index 15b981a..ac6819b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
@@ -17,11 +17,8 @@
package org.apache.logging.log4j.util;
import java.util.List;
-import java.util.Optional;
import java.util.Stack;
-import java.util.function.Function;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* <em>Consider this class private.</em> Determines the caller's class.
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
index 4052706..f3c4969 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
@@ -263,11 +263,7 @@ public class Timer implements Serializable,
StringBuilderFormattable
if (name != null ? !name.equals(timer.name) : timer.name != null) {
return false;
}
- if (status != null ? !status.equals(timer.status) : timer.status !=
null) {
- return false;
- }
-
- return true;
+ return status != null ? status.equals(timer.status) : timer.status ==
null;
}
@Override
diff --git
a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
index 98040a0..cf5c852 100644
---
a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
+++
b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
@@ -171,8 +171,7 @@ public class SortedArrayStringMapTest {
private SortedArrayStringMap deserialize(final byte[] binary) throws
IOException, ClassNotFoundException {
final ByteArrayInputStream inArr = new ByteArrayInputStream(binary);
try (final ObjectInputStream in = new
FilteredObjectInputStream(inArr)) {
- final SortedArrayStringMap result = (SortedArrayStringMap)
in.readObject();
- return result;
+ return (SortedArrayStringMap) in.readObject();
}
}
diff --git
a/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
b/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
index 08b4dfa..5edec12 100644
---
a/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
+++
b/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
@@ -23,9 +23,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.ParentRunner;
-import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
-import static org.junit.Assume.assumeThat;
@RunWith(BlockJUnit4ClassRunner.class)
public class StackLocatorUtilTest {
diff --git
a/log4j-api/src/test/java/org/apache/logging/log4j/util/Unbox2ConfigurableTest.java
b/log4j-api/src/test/java/org/apache/logging/log4j/util/Unbox2ConfigurableTest.java
index cf4376f..dc4130e 100644
---
a/log4j-api/src/test/java/org/apache/logging/log4j/util/Unbox2ConfigurableTest.java
+++
b/log4j-api/src/test/java/org/apache/logging/log4j/util/Unbox2ConfigurableTest.java
@@ -21,8 +21,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.parallel.Isolated;
-import org.junit.jupiter.api.parallel.ResourceLock;
-import org.junit.jupiter.api.parallel.Resources;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
