fix: potential NPE for WriteParameters#hashCode (#483)

influxdata · Dec 13, 2022 · 00f4f81 · 00f4f81
1 parent 9b07e6e
commit 00f4f81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Bug Fixes
 1. [#470](https://github.com/influxdata/influxdb-client-java/pull/470): Move auto-configuration registration to `AutoConfiguration.imports` [spring]
+1. [#483](https://github.com/influxdata/influxdb-client-java/pull/483): Fix of potential NPE for `WriteParameters#hashCode`
 
 ### Dependencies
 

diff --git a/client/src/main/java/com/influxdb/client/write/WriteParameters.java b/client/src/main/java/com/influxdb/client/write/WriteParameters.java
@@ -223,9 +223,9 @@ public boolean equals(final Object o) {
  @Override
  @SuppressWarnings("MagicNumber")
  public int hashCode() {
- int result = bucket.hashCode();
- result = 31 * result + org.hashCode();
- result = 31 * result + precision.hashCode();
+ int result = bucket != null ? bucket.hashCode() : 0;
+ result = 31 * result + (org != null ? org.hashCode() : 0);
+ result = 31 * result + (precision != null ? precision.hashCode() : 0);
  result = 31 * result + (consistency != null ? consistency.hashCode() : 0);
  return result;
  }

diff --git a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
@@ -109,4 +109,12 @@ void v1Constructor() {
  Assertions.assertThat(parameters.precisionSafe(options)).isEqualTo(WritePrecision.NS);
  Assertions.assertThat(parameters.consistencySafe(options)).isEqualTo(WriteConsistency.ONE);
  }
+
+ @Test
+ void npe() {
+ WriteParameters parameters = new WriteParameters(null, null, null, null);
+
+ Assertions.assertThat(parameters.hashCode()).isNotNull();
+ Assertions.assertThat(parameters).isEqualTo(parameters);
+ }
 }