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/22 00:32:36 UTC
[logging-log4j2] branch release-2.x updated: Use Objects.hashCode()
when there is only one item to 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
The following commit(s) were added to refs/heads/release-2.x by this push:
new 6f1fdfe Use Objects.hashCode() when there is only one item to hash.
6f1fdfe is described below
commit 6f1fdfe32355dd96c647b8a15138c4fd0e35bc58
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 19:32:31 2020 -0500
Use Objects.hashCode() when there is only one item to hash.
---
.../java/org/apache/logging/log4j/spi/MutableThreadContextStack.java | 2 +-
.../java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java | 2 +-
.../src/main/java/org/apache/logging/log4j/core/util/Source.java | 2 +-
.../java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java | 2 +-
.../apache/logging/log4j/layout/template/json/util/MapAccessor.java | 2 +-
.../log4j/layout/template/json/util/StringParameterParser.java | 4 ++--
.../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 2 +-
.../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 2 +-
8 files changed, 9 insertions(+), 9 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 2937ae4..4232fa2 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
@@ -212,7 +212,7 @@ public class MutableThreadContextStack implements ThreadContextStack, StringBuil
@Override
public int hashCode() {
- return Objects.hash(list);
+ return 31 + Objects.hashCode(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 8200345..994a989 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,7 +47,7 @@ public class TlsSyslogFrame {
@Override
public int hashCode() {
- return Objects.hash(message);
+ return 31 + Objects.hashCode(message);
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
index 8b4dba3..7e5c786 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
@@ -118,6 +118,6 @@ public class Source {
@Override
public int hashCode() {
- return Objects.hash(location);
+ return 31 + Objects.hashCode(location);
}
}
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 4483038..02aa998 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,7 +61,7 @@ public abstract class LevelMixInTest {
@Override
public int hashCode() {
- return Objects.hash(level);
+ return 31 + Objects.hashCode(level);
}
}
private ObjectMapper log4jObjectMapper;
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
index 39cae10..3893f50 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
@@ -132,7 +132,7 @@ public class MapAccessor {
@Override
public int hashCode() {
- return Objects.hash(map);
+ return 31 + Objects.hashCode(map);
}
@Override
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
index be58534..2db794e 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
@@ -89,7 +89,7 @@ public final class StringParameterParser {
@Override
public int hashCode() {
- return Objects.hash(string);
+ return 31 + Objects.hashCode(string);
}
@Override
@@ -125,7 +125,7 @@ public final class StringParameterParser {
@Override
public int hashCode() {
- return Objects.hash(doubleQuotedString);
+ return 31 + Objects.hashCode(doubleQuotedString);
}
@Override
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 f154905..db54b5c 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,7 +101,7 @@ public class Log4jMarker implements Marker {
@Override
public int hashCode() {
- return Objects.hash(marker);
+ return 31 + Objects.hashCode(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 e7610d3..fb21659 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,7 +101,7 @@ class Log4jMarker implements Marker {
@Override
public int hashCode() {
- return Objects.hash(marker);
+ return 31 + Objects.hashCode(marker);
}
@Override
Re: [logging-log4j2] branch release-2.x updated: Use Objects.hashCode() when there is only one item to hash.
Posted by Carter Kozak <ck...@ckozak.net>.
Thanks for the update :-)
On Sat, Nov 21, 2020, at 19:32, ggregory@apache.org wrote:
> 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
>
>
> The following commit(s) were added to refs/heads/release-2.x by this push:
> new 6f1fdfe Use Objects.hashCode() when there is only one item to hash.
> 6f1fdfe is described below
>
> commit 6f1fdfe32355dd96c647b8a15138c4fd0e35bc58
> Author: Gary Gregory <ga...@gmail.com>
> AuthorDate: Sat Nov 21 19:32:31 2020 -0500
>
> Use Objects.hashCode() when there is only one item to hash.
> ---
> .../java/org/apache/logging/log4j/spi/MutableThreadContextStack.java | 2 +-
> .../java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java | 2 +-
> .../src/main/java/org/apache/logging/log4j/core/util/Source.java | 2 +-
> .../java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java | 2 +-
> .../apache/logging/log4j/layout/template/json/util/MapAccessor.java | 2 +-
> .../log4j/layout/template/json/util/StringParameterParser.java | 4 ++--
> .../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 2 +-
> .../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 2 +-
> 8 files changed, 9 insertions(+), 9 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 2937ae4..4232fa2 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
> @@ -212,7 +212,7 @@ public class MutableThreadContextStack implements ThreadContextStack, StringBuil
>
> @Override
> public int hashCode() {
> - return Objects.hash(list);
> + return 31 + Objects.hashCode(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 8200345..994a989 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,7 +47,7 @@ public class TlsSyslogFrame {
>
> @Override
> public int hashCode() {
> - return Objects.hash(message);
> + return 31 + Objects.hashCode(message);
> }
>
> @Override
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
> index 8b4dba3..7e5c786 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
> @@ -118,6 +118,6 @@ public class Source {
>
> @Override
> public int hashCode() {
> - return Objects.hash(location);
> + return 31 + Objects.hashCode(location);
> }
> }
> 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 4483038..02aa998 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,7 +61,7 @@ public abstract class LevelMixInTest {
>
> @Override
> public int hashCode() {
> - return Objects.hash(level);
> + return 31 + Objects.hashCode(level);
> }
> }
> private ObjectMapper log4jObjectMapper;
> diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
> index 39cae10..3893f50 100644
> --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
> +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java
> @@ -132,7 +132,7 @@ public class MapAccessor {
>
> @Override
> public int hashCode() {
> - return Objects.hash(map);
> + return 31 + Objects.hashCode(map);
> }
>
> @Override
> diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
> index be58534..2db794e 100644
> --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
> +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
> @@ -89,7 +89,7 @@ public final class StringParameterParser {
>
> @Override
> public int hashCode() {
> - return Objects.hash(string);
> + return 31 + Objects.hashCode(string);
> }
>
> @Override
> @@ -125,7 +125,7 @@ public final class StringParameterParser {
>
> @Override
> public int hashCode() {
> - return Objects.hash(doubleQuotedString);
> + return 31 + Objects.hashCode(doubleQuotedString);
> }
>
> @Override
> 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 f154905..db54b5c 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,7 +101,7 @@ public class Log4jMarker implements Marker {
>
> @Override
> public int hashCode() {
> - return Objects.hash(marker);
> + return 31 + Objects.hashCode(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 e7610d3..fb21659 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,7 +101,7 @@ class Log4jMarker implements Marker {
>
> @Override
> public int hashCode() {
> - return Objects.hash(marker);
> + return 31 + Objects.hashCode(marker);
> }
>
> @Override
>
>
-ck