Merge pull request kubernetes-client#3495 from nulls/feature/quantity_hash_code

k8s-ci-robot · web-flow · commit 5f596020b86a · 2024-06-24T08:18:04.000-07:00
Override hashCode in Quantity
diff --git a/kubernetes/src/main/java/io/kubernetes/client/custom/Quantity.java b/kubernetes/src/main/java/io/kubernetes/client/custom/Quantity.java
@@ -85,10 +85,14 @@ public boolean equals(Object o) {
     }
 
     Quantity otherQuantity = (Quantity) o;
-
     return ObjectUtils.compare(this.number, otherQuantity.number) == 0;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(number);
+  }
+
   public static class QuantityAdapter extends TypeAdapter<Quantity> {
     @Override
     public void write(JsonWriter jsonWriter, Quantity quantity) throws IOException {
diff --git a/kubernetes/src/test/java/io/kubernetes/client/custom/QuantityTest.java b/kubernetes/src/test/java/io/kubernetes/client/custom/QuantityTest.java
@@ -0,0 +1,33 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.custom;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class QuantityTest {
+
+  @Test
+  void containsInSet() {
+    final List<String> values = List.of("0.5Gi", "0.5G", "1Gi", "1G", "500Mi", "500M", "500m", "0.5", "1");
+    final Set<Quantity> set1 = values.stream().map(Quantity::fromString).collect(Collectors.toSet());
+    final Set<Quantity> set2 = values.stream().map(Quantity::fromString).collect(Collectors.toSet());
+
+    assertEquals(set1, set2, "Sets of equal elements are not equal");
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,14 @@ public boolean equals(Object o) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`Quantity otherQuantity = (Quantity) o;`
`88`		`-`
`89`	`88`	`return ObjectUtils.compare(this.number, otherQuantity.number) == 0;`
`90`	`89`	`}`
`91`	`90`
	`91`	`+ @Override`
	`92`	`+ public int hashCode() {`
	`93`	`+ return Objects.hash(number);`
	`94`	`+ }`
	`95`	`+`
`92`	`96`	`public static class QuantityAdapter extends TypeAdapter<Quantity> {`
`93`	`97`	`@Override`
`94`	`98`	`public void write(JsonWriter jsonWriter, Quantity quantity) throws IOException {`