From 1e3640e0eebf40d9c574f5f5f1c740b7a993fb60 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Thu, 6 Feb 2014 18:13:54 +0100
Subject: [PATCH] =?UTF-8?q?DATACMNS-436=20-=20Order.equals(=E2=80=A6)=20/?=
 =?UTF-8?q?=20hashCode()=20/=20toString()=20now=20consider=20ignore=20case?=
 =?UTF-8?q?=20flag.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extended equals(…), hashCode() and toString() methods t consider the ignore case flag held in an Order instance.
---
 .../java/org/springframework/data/domain/Sort.java  |  8 ++++++--
 .../springframework/data/domain/SortUnitTests.java  | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/domain/Sort.java b/src/main/java/org/springframework/data/domain/Sort.java
index 6ca016e7b..c4bfa2687 100644
--- a/src/main/java/org/springframework/data/domain/Sort.java
+++ b/src/main/java/org/springframework/data/domain/Sort.java
@@ -375,6 +375,7 @@ public class Sort implements Iterable<org.springframework.data.domain.Sort.Order
 
 			result = 31 * result + direction.hashCode();
 			result = 31 * result + property.hashCode();
+			result = 31 * result + (ignoreCase ? 1 : 0);
 
 			return result;
 		}
@@ -396,7 +397,8 @@ public class Sort implements Iterable<org.springframework.data.domain.Sort.Order
 
 			Order that = (Order) obj;
 
-			return this.direction.equals(that.direction) && this.property.equals(that.property);
+			return this.direction.equals(that.direction) && this.property.equals(that.property)
+					&& this.ignoreCase == that.ignoreCase;
 		}
 
 		/*
@@ -405,7 +407,9 @@ public class Sort implements Iterable<org.springframework.data.domain.Sort.Order
 		 */
 		@Override
 		public String toString() {
-			return String.format("%s: %s", property, direction);
+
+			String result = String.format("%s: %s", property, direction);
+			return ignoreCase ? result.concat(", ignoring case") : result;
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/data/domain/SortUnitTests.java b/src/test/java/org/springframework/data/domain/SortUnitTests.java
index 03fc879ae..20e173c9b 100644
--- a/src/test/java/org/springframework/data/domain/SortUnitTests.java
+++ b/src/test/java/org/springframework/data/domain/SortUnitTests.java
@@ -117,4 +117,17 @@ public class SortUnitTests {
 	public void orderDoesNotIgnoreCaseByDefault() {
 		assertThat(new Order(Direction.ASC, "foo").isIgnoreCase(), is(false));
 	}
+
+	/**
+	 * @see DATACMNS-436
+	 */
+	@Test
+	public void ordersWithDifferentIgnoreCaseDoNotEqual() {
+
+		Order foo = new Order("foo");
+		Order fooIgnoreCase = new Order("foo").ignoreCase();
+
+		assertThat(foo, is(not(fooIgnoreCase)));
+		assertThat(foo.hashCode(), is(not(fooIgnoreCase.hashCode())));
+	}
 }