DATACMNS-818 - Renamed Tuple to Pair.

Got rid off manual implementation code in favor of Lombok annotations.

Author: odrotbohm

src/main/java/org/springframework/data/util/Pair.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015-2016 the original author or 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 org.springframework.data.util;
+
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+/**
+ * A tuple of things.
+ * 
+ * @author Tobias Trelle
+ * @author Oliver Gierke
+ * @param <T> Type of the first thing.
+ * @param <S> Type of the second thing.
+ * @since 1.12
+ */
+@ToString
+@EqualsAndHashCode
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public final class Pair<S, T> {
+
+	private final @NonNull S first;
+	private final @NonNull T second;
+
+	/**
+	 * Creates a new {@link Pair} for the given elements.
+	 * 
+	 * @param first must not be {@literal null}.
+	 * @param second must not be {@literal null}.
+	 * @return
+	 */
+	public static <S, T> Pair<S, T> of(S first, T second) {
+		return new Pair<S, T>(first, second);
+	}
+
+	/**
+	 * Returns the first element of the {@link Pair}.
+	 * 
+	 * @return
+	 */
+	public S getFirst() {
+		return first;
+	}
+
+	/**
+	 * Returns the second element of the {@link Pair}.
+	 * 
+	 * @return
+	 */
+	public T getSecond() {
+		return second;
+	}
+}

src/main/java/org/springframework/data/util/Tuple.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,38 +21,38 @@
 import org.junit.Test;
 
 /**
- * Unit tests for {@link Tuple}.
+ * Unit tests for {@link Pair}.
  * 
  * @author Oliver Gierke
  */
-public class TupleUnitTests {
+public class PairUnitTests {
 
 	/**
 	 * @see DATACMNS-790
 	 */
 	@Test
 	public void setsUpSimpleInstance() {
 
-		Tuple<Integer, Integer> tuple = Tuple.of(1, 2);
+		Pair<Integer, Integer> pair = Pair.of(1, 2);
 
-		assertThat(tuple.getFirst(), is(1));
-		assertThat(tuple.getSecond(), is(2));
+		assertThat(pair.getFirst(), is(1));
+		assertThat(pair.getSecond(), is(2));
 	}
 
 	/**
 	 * @see DATACMNS-790
 	 */
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullFirstElement() {
-		Tuple.of(null, 1);
+		Pair.of(null, 1);
 	}
 
 	/**
 	 * @see DATACMNS-790
 	 */
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullSecondElement() {
-		Tuple.of(1, null);
+		Pair.of(1, null);
 	}
 
 	/**
@@ -61,8 +61,8 @@ public void rejectsNullSecondElement() {
 	@Test
 	public void hasCorrectEquals() {
 
-		Tuple<Integer, Integer> first = Tuple.of(1, 2);
-		Tuple<Integer, Integer> second = Tuple.of(1, 2);
+		Pair<Integer, Integer> first = Pair.of(1, 2);
+		Pair<Integer, Integer> second = Pair.of(1, 2);
 
 		assertThat(first, is(first));
 		assertThat(first, is(second));
@@ -75,9 +75,9 @@ public void hasCorrectEquals() {
 	@Test
 	public void hasCorrectHashCode() {
 
-		Tuple<Integer, Integer> first = Tuple.of(1, 2);
-		Tuple<Integer, Integer> second = Tuple.of(1, 2);
-		Tuple<Integer, Integer> third = Tuple.of(2, 2);
+		Pair<Integer, Integer> first = Pair.of(1, 2);
+		Pair<Integer, Integer> second = Pair.of(1, 2);
+		Pair<Integer, Integer> third = Pair.of(2, 2);
 
 		assertThat(first.hashCode(), is(second.hashCode()));
 		assertThat(first.hashCode(), is(not(third.hashCode())));