From e294fb5ef44cd4d413d63f3e45b2caa45afa29ff Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Mon, 5 Sep 2016 14:46:51 +0200
Subject: [PATCH] =?UTF-8?q?DATACMNS-908=20-=20Introduced=20Order.withPrope?=
 =?UTF-8?q?rty(=E2=80=A6).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The introduced method allows creating new Order instances for a different property ensuring all other aspects (ignore case, null handling) are retained.
---
 .../org/springframework/data/domain/Sort.java | 19 +++++++++++++++----
 .../data/domain/SortUnitTests.java            | 15 +++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/data/domain/Sort.java b/src/main/java/org/springframework/data/domain/Sort.java
index dcb6cbb45..8da3ab9b9 100644
--- a/src/main/java/org/springframework/data/domain/Sort.java
+++ b/src/main/java/org/springframework/data/domain/Sort.java
@@ -393,13 +393,24 @@ public class Sort implements Iterable<org.springframework.data.domain.Sort.Order
 		}
 
 		/**
-		 * Returns a new {@link Order} with the given {@link Order}.
+		 * Returns a new {@link Order} with the given {@link Direction}.
 		 * 
-		 * @param order
+		 * @param direction
 		 * @return
 		 */
-		public Order with(Direction order) {
-			return new Order(order, this.property, nullHandling);
+		public Order with(Direction direction) {
+			return new Order(direction, this.property, this.ignoreCase, this.nullHandling);
+		}
+
+		/**
+		 * Returns a new {@link Order}
+		 * 
+		 * @param property must not be {@literal null} or empty.
+		 * @return
+		 * @since 1.13
+		 */
+		public Order withProperty(String property) {
+			return new Order(this.direction, property, this.ignoreCase, this.nullHandling);
 		}
 
 		/**
diff --git a/src/test/java/org/springframework/data/domain/SortUnitTests.java b/src/test/java/org/springframework/data/domain/SortUnitTests.java
index 18e638300..b44a48699 100644
--- a/src/test/java/org/springframework/data/domain/SortUnitTests.java
+++ b/src/test/java/org/springframework/data/domain/SortUnitTests.java
@@ -164,4 +164,19 @@ public class SortUnitTests {
 	public void orderWithDefaultNullHandlingHint() {
 		assertThat(new Order("foo").getNullHandling(), is(NATIVE));
 	}
+
+	/**
+	 * @see DATACMNS-908
+	 */
+	@Test
+	public void createsNewOrderForDifferentProperty() {
+
+		Order source = new Order(Direction.DESC, "foo").nullsFirst().ignoreCase();
+		Order result = source.withProperty("bar");
+
+		assertThat(result.getProperty(), is("bar"));
+		assertThat(result.getDirection(), is(source.getDirection()));
+		assertThat(result.getNullHandling(), is(source.getNullHandling()));
+		assertThat(result.isIgnoreCase(), is(source.isIgnoreCase()));
+	}
 }