You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/11/21 21:33:32 UTC
[logging-log4j2] 03/04: Objects.hash().
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 58130d4610d1315b2390f3ffc999f8dbd9b98806
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 14:55:23 2020 -0500
Objects.hash().
---
.../org/apache/logging/log4j/spi/MutableThreadContextStack.java | 6 ++----
.../org/apache/logging/log4j/core/appender/TlsSyslogFrame.java | 5 +----
.../org/apache/logging/log4j/core/impl/ExtendedClassInfo.java | 7 +------
.../apache/logging/log4j/core/impl/ExtendedStackTraceElement.java | 6 +-----
.../java/org/apache/logging/log4j/core/layout/PatternMatch.java | 6 +-----
.../org/apache/logging/log4j/core/net/ssl/SslConfiguration.java | 8 +-------
.../java/org/apache/logging/log4j/core/util/KeyValuePair.java | 6 +-----
.../org/apache/logging/log4j/core/jackson/LevelMixInTest.java | 5 +----
.../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 5 +----
.../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 5 +----
10 files changed, 11 insertions(+), 48 deletions(-)
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 03c77da..f00fcb0 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;
@@ -211,10 +212,7 @@ public class MutableThreadContextStack implements ThreadContextStack, StringBuil
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((this.list == null) ? 0 : this.list.hashCode());
- return result;
+ return Objects.hash(list);
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
index 9b508d8..8200345 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
@@ -47,10 +47,7 @@ public class TlsSyslogFrame {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((message == null) ? 0 : message.hashCode());
- return result;
+ return Objects.hash(message);
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
index 086dbbd..759b12e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
@@ -87,12 +87,7 @@ public final class ExtendedClassInfo implements Serializable {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (this.exact ? 1231 : 1237);
- result = prime * result + ((this.location == null) ? 0 : this.location.hashCode());
- result = prime * result + ((this.version == null) ? 0 : this.version.hashCode());
- return result;
+ return Objects.hash(exact, location, version);
}
public void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
index 255278d..d298dbb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
@@ -115,11 +115,7 @@ public final class ExtendedStackTraceElement implements Serializable {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((this.extraClassInfo == null) ? 0 : this.extraClassInfo.hashCode());
- result = prime * result + ((this.stackTraceElement == null) ? 0 : this.stackTraceElement.hashCode());
- return result;
+ return Objects.hash(extraClassInfo, stackTraceElement);
}
public boolean isNativeMethod() {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
index c7f3b68..4f200a1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
@@ -105,11 +105,7 @@ public final class PatternMatch {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- result = prime * result + ((pattern == null) ? 0 : pattern.hashCode());
- return result;
+ return Objects.hash(key, pattern);
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index 1b10a37..fa23b89 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -260,13 +260,7 @@ public class SslConfiguration {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((keyStoreConfig == null) ? 0 : keyStoreConfig.hashCode());
- result = prime * result + ((protocol == null) ? 0 : protocol.hashCode());
- result = prime * result + ((sslContext == null) ? 0 : sslContext.hashCode());
- result = prime * result + ((trustStoreConfig == null) ? 0 : trustStoreConfig.hashCode());
- return result;
+ return Objects.hash(keyStoreConfig, protocol, sslContext, trustStoreConfig);
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
index 93795da..3c3b11b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
@@ -98,11 +98,7 @@ public final class KeyValuePair {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- result = prime * result + ((value == null) ? 0 : value.hashCode());
- return result;
+ return Objects.hash(key, value);
}
@Override
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java
index 53471b6..4483038 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java
@@ -61,10 +61,7 @@ public abstract class LevelMixInTest {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((this.level == null) ? 0 : this.level.hashCode());
- return result;
+ return Objects.hash(level);
}
}
private ObjectMapper log4jObjectMapper;
diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
index a6e46c5..f154905 100644
--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
+++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
@@ -101,10 +101,7 @@ public class Log4jMarker implements Marker {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((marker == null) ? 0 : marker.hashCode());
- return result;
+ return Objects.hash(marker);
}
@Override
diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
index c0cb4a0..e7610d3 100644
--- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
+++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
@@ -101,10 +101,7 @@ class Log4jMarker implements Marker {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((marker == null) ? 0 : marker.hashCode());
- return result;
+ return Objects.hash(marker);
}
@Override