Simplify ParentBased equals/hashcode and add coverage. (open-telemetry#2823)

Anuraag Agrawal · web-flow · commit ebaceb74a11d · 2021-02-17T08:41:21.000+09:00
diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/samplers/ParentBasedSampler.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/samplers/ParentBasedSampler.java
@@ -12,7 +12,6 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.trace.data.LinkData;
 import java.util.List;
-import java.util.Objects;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
@@ -104,28 +103,20 @@ public boolean equals(Object o) {
 
     ParentBasedSampler that = (ParentBasedSampler) o;
 
-    if (!Objects.equals(root, that.root)) {
-      return false;
-    }
-    if (!Objects.equals(remoteParentSampled, that.remoteParentSampled)) {
-      return false;
-    }
-    if (!Objects.equals(remoteParentNotSampled, that.remoteParentNotSampled)) {
-      return false;
-    }
-    if (!Objects.equals(localParentSampled, that.localParentSampled)) {
-      return false;
-    }
-    return Objects.equals(localParentNotSampled, that.localParentNotSampled);
+    return root.equals(that.root)
+        && remoteParentSampled.equals(that.remoteParentSampled)
+        && remoteParentNotSampled.equals(that.remoteParentNotSampled)
+        && localParentSampled.equals(that.localParentSampled)
+        && localParentNotSampled.equals(that.localParentNotSampled);
   }
 
   @Override
   public int hashCode() {
-    int result = root != null ? root.hashCode() : 0;
-    result = 31 * result + (remoteParentSampled != null ? remoteParentSampled.hashCode() : 0);
-    result = 31 * result + (remoteParentNotSampled != null ? remoteParentNotSampled.hashCode() : 0);
-    result = 31 * result + (localParentSampled != null ? localParentSampled.hashCode() : 0);
-    result = 31 * result + (localParentNotSampled != null ? localParentNotSampled.hashCode() : 0);
+    int result = root.hashCode();
+    result = 31 * result + remoteParentSampled.hashCode();
+    result = 31 * result + remoteParentNotSampled.hashCode();
+    result = 31 * result + localParentSampled.hashCode();
+    result = 31 * result + localParentNotSampled.hashCode();
     return result;
   }
 }
diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/AlwaysOffSamplerTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/AlwaysOffSamplerTest.java
@@ -69,4 +69,9 @@ void parentSampled() {
   void getDescription() {
     assertThat(Sampler.alwaysOff().getDescription()).isEqualTo("AlwaysOffSampler");
   }
+
+  @Test
+  void string() {
+    assertThat(Sampler.alwaysOff().toString()).isEqualTo("AlwaysOffSampler");
+  }
 }
diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/AlwaysOnSamplerTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/AlwaysOnSamplerTest.java
@@ -69,4 +69,9 @@ void parentNotSampled() {
   void getDescription() {
     assertThat(Sampler.alwaysOn().getDescription()).isEqualTo("AlwaysOnSampler");
   }
+
+  @Test
+  void string() {
+    assertThat(Sampler.alwaysOn().toString()).isEqualTo("AlwaysOnSampler");
+  }
 }
diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/ParentBasedSamplerTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/ParentBasedSamplerTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.trace;
+package io.opentelemetry.sdk.trace.samplers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -14,9 +14,9 @@
 import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceState;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.sdk.trace.samplers.Sampler;
-import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
+import io.opentelemetry.sdk.trace.IdGenerator;
 import java.util.Collections;
+import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;
 
 class ParentBasedSamplerTest {
@@ -407,4 +407,9 @@ void getDescription() {
                 + "remoteParentNotSampled:AlwaysOffSampler,localParentSampled:AlwaysOnSampler,"
                 + "localParentNotSampled:AlwaysOffSampler}");
   }
+
+  @Test
+  void equals() {
+    EqualsVerifier.forClass(ParentBasedSampler.class).verify();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,9 @@ void parentSampled() {`
`69`	`69`	`void getDescription() {`
`70`	`70`	`assertThat(Sampler.alwaysOff().getDescription()).isEqualTo("AlwaysOffSampler");`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ @Test`
	`74`	`+ void string() {`
	`75`	`+ assertThat(Sampler.alwaysOff().toString()).isEqualTo("AlwaysOffSampler");`
	`76`	`+ }`
`72`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,9 @@ void parentNotSampled() {`
`69`	`69`	`void getDescription() {`
`70`	`70`	`assertThat(Sampler.alwaysOn().getDescription()).isEqualTo("AlwaysOnSampler");`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ @Test`
	`74`	`+ void string() {`
	`75`	`+ assertThat(Sampler.alwaysOn().toString()).isEqualTo("AlwaysOnSampler");`
	`76`	`+ }`
`72`	`77`	`}`