fix: Wrong name for mapping both L/R types in pair

Col-E · Sep 9, 2022 · 4293d57 · 4293d57
1 parent 83f6848
commit 4293d57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>software.coley</groupId>
     <artifactId>extra-collections</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/src/main/java/software/coley/collections/tuple/Pair.java b/src/main/java/software/coley/collections/tuple/Pair.java
@@ -92,7 +92,7 @@ public <RM> Pair<L, RM> mapRight(Function<R, RM> mapper) {
 	 *
 	 * @return Pair with mapped values.
 	 */
-	public <LM, RM> Pair<LM, RM> mapRight(Function<L, LM> leftMapper, Function<R, RM> rightMapper) {
+	public <LM, RM> Pair<LM, RM> mapBoth(Function<L, LM> leftMapper, Function<R, RM> rightMapper) {
 		return new Pair<>(leftMapper.apply(left), rightMapper.apply(right));
 	}
 
@@ -102,7 +102,7 @@ public <LM, RM> Pair<LM, RM> mapRight(Function<L, LM> leftMapper, Function<R, RM
 	 *
 	 * @return {@code true} if the {@link Map#get(Object)} of the {@link #getLeft()} is {@link #getRight()}.
 	 */
-	public boolean mapContains(Map<L, R> map) {
+	public boolean mapContainsKeyValue(Map<L, R> map) {
 		if (map.containsKey(left))
 			return Objects.equals(map.get(left), right);
 		return false;
@@ -147,7 +147,9 @@ public boolean equals(Object o) {
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(left, right);
+		int result = left != null ? left.hashCode() : 0;
+		result = 31 * result + (right != null ? right.hashCode() : 0);
+		return result;
 	}
 
 	@Override