diff --git a/pom.xml b/pom.xml index 849cb35379..6266a0f48e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-jpa-parent - 3.1.0-SNAPSHOT + 3.1.0-remove-ignore-case-SNAPSHOT pom Spring Data JPA Parent @@ -37,7 +37,7 @@ 4.5 8.0.31 42.5.0 - 3.1.0-SNAPSHOT + 3.1.0-order-constructor-SNAPSHOT 0.10.3 org.hibernate diff --git a/spring-data-envers/pom.xml b/spring-data-envers/pom.xml index db915d7c3b..6054171d8a 100755 --- a/spring-data-envers/pom.xml +++ b/spring-data-envers/pom.xml @@ -5,12 +5,12 @@ org.springframework.data spring-data-envers - 3.1.0-SNAPSHOT + 3.1.0-remove-ignore-case-SNAPSHOT org.springframework.data spring-data-jpa-parent - 3.1.0-SNAPSHOT + 3.1.0-remove-ignore-case-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa-distribution/pom.xml b/spring-data-jpa-distribution/pom.xml index a5cb2f09b5..491672e9c5 100644 --- a/spring-data-jpa-distribution/pom.xml +++ b/spring-data-jpa-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-jpa-parent - 3.1.0-SNAPSHOT + 3.1.0-remove-ignore-case-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml index ea9125d029..2ae1c02d5e 100644 --- a/spring-data-jpa/pom.xml +++ b/spring-data-jpa/pom.xml @@ -6,7 +6,7 @@ org.springframework.data spring-data-jpa - 3.1.0-SNAPSHOT + 3.1.0-remove-ignore-case-SNAPSHOT Spring Data JPA Spring Data module for JPA repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-jpa-parent - 3.1.0-SNAPSHOT + 3.1.0-remove-ignore-case-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java index e8f8b57b86..b569215150 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java @@ -353,8 +353,7 @@ public String toString() { /** * Custom {@link Order} that keeps a flag to indicate unsafe property handling, i.e. the String provided is not - * necessarily a property but can be an arbitrary expression piped into the query execution. We also keep an - * additional {@code ignoreCase} flag around as the constructor of the superclass is private currently. + * necessarily a property but can be an arbitrary expression piped into the query execution. * * @author Christoph Strobl * @author Oliver Gierke @@ -364,7 +363,6 @@ public static class JpaOrder extends Order { private static final long serialVersionUID = 1L; private final boolean unsafe; - private final boolean ignoreCase; /** * Creates a new {@link JpaOrder} instance. if order is {@literal null} then order defaults to @@ -392,8 +390,7 @@ private JpaOrder(@Nullable Direction direction, String property, NullHandling nu private JpaOrder(@Nullable Direction direction, String property, NullHandling nullHandling, boolean ignoreCase, boolean unsafe) { - super(direction, property, nullHandling); - this.ignoreCase = ignoreCase; + super(direction, property, ignoreCase, nullHandling); this.unsafe = unsafe; } @@ -432,11 +429,6 @@ public JpaOrder ignoreCase() { return new JpaOrder(getDirection(), getProperty(), getNullHandling(), true, this.unsafe); } - @Override - public boolean isIgnoreCase() { - return super.isIgnoreCase() || ignoreCase; - } - /** * @return true if {@link JpaOrder} created {@link #withUnsafe(String...)}. */