DATACMNS-1496 - Removed deprecations at least introduced in Lovelace.

Author: odrotbohm

src/main/java/org/springframework/data/authentication/UserCredentials.java

@@ -560,19 +560,7 @@ enum StringMatcher {
 	/**
 	 * Allows to transform the property value before it is used in the query.
 	 */
-	interface PropertyValueTransformer extends Function<Optional<Object>, Optional<Object>> {
-
-		/**
-		 * For backwards compatibility of clients used to invoke Spring's Converter interface.
-		 *
-		 * @param source
-		 * @return
-		 */
-		@Deprecated
-		default Object convert(Object source) {
-			return apply(Optional.ofNullable(source)).orElse(null);
-		}
-	}
+	interface PropertyValueTransformer extends Function<Optional<Object>, Optional<Object>> {}
 
 	/**
 	 * @author Christoph Strobl
@@ -699,18 +687,6 @@ public PropertyValueTransformer getPropertyValueTransformer() {
 			return valueTransformer == null ? NoOpPropertyValueTransformer.INSTANCE : valueTransformer;
 		}
 
-		/**
-		 * Transforms a given source using the {@link PropertyValueTransformer}.
-		 *
-		 * @param source
-		 * @return
-		 * @deprecated since 2.0, use {@link #transformValue(Optional)} instead.
-		 */
-		@Deprecated
-		public Object transformValue(Object source) {
-			return transformValue(Optional.ofNullable(source)).orElse(null);
-		}
-
 		/**
 		 * Transforms a given source using the {@link PropertyValueTransformer}.
 		 *

src/main/java/org/springframework/data/authentication/package-info.java

@@ -30,43 +30,14 @@ public class PageRequest extends AbstractPageRequest {
 
 	private final Sort sort;
 
-	/**
-	 * Creates a new {@link PageRequest}. Pages are zero indexed, thus providing 0 for {@code page} will return the first
-	 * page.
-	 *
-	 * @param page zero-based page index.
-	 * @param size the size of the page to be returned.
-	 * @deprecated use {@link #of(int, int)} instead.
-	 */
-	@Deprecated
-	public PageRequest(int page, int size) {
-		this(page, size, Sort.unsorted());
-	}
-
-	/**
-	 * Creates a new {@link PageRequest} with sort parameters applied.
-	 *
-	 * @param page zero-based page index.
-	 * @param size the size of the page to be returned.
-	 * @param direction the direction of the {@link Sort} to be specified, can be {@literal null}.
-	 * @param properties the properties to sort by, must not be {@literal null} or empty.
-	 * @deprecated use {@link #of(int, int, Direction, String...)} instead.
-	 */
-	@Deprecated
-	public PageRequest(int page, int size, Direction direction, String... properties) {
-		this(page, size, Sort.by(direction, properties));
-	}
-
 	/**
 	 * Creates a new {@link PageRequest} with sort parameters applied.
 	 *
 	 * @param page zero-based page index.
 	 * @param size the size of the page to be returned.
-	 * @param sort can be {@literal null}.
-	 * @deprecated since 2.0, use {@link #of(int, int, Sort)} instead.
+	 * @param sort must not be {@literal null}, use {@link Sort#unsorted()} instead.
 	 */
-	@Deprecated
-	public PageRequest(int page, int size, Sort sort) {
+	protected PageRequest(int page, int size, Sort sort) {
 
 		super(page, size);
 
@@ -89,7 +60,7 @@ public static PageRequest of(int page, int size) {
 	 *
 	 * @param page zero-based page index.
 	 * @param size the size of the page to be returned.
-	 * @param sort must not be {@literal null}.
+	 * @param sort must not be {@literal null}, use {@link Sort#unsorted()} instead.
 	 * @since 2.0
 	 */
 	public static PageRequest of(int page, int size, Sort sort) {
@@ -121,6 +92,7 @@ public Sort getSort() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.domain.Pageable#next()
 	 */
+	@Override
 	public Pageable next() {
 		return new PageRequest(getPageNumber() + 1, getPageSize(), getSort());
 	}
@@ -129,6 +101,7 @@ public Pageable next() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.domain.AbstractPageRequest#previous()
 	 */
+	@Override
 	public PageRequest previous() {
 		return getPageNumber() == 0 ? this : new PageRequest(getPageNumber() - 1, getPageSize(), getSort());
 	}
@@ -137,6 +110,7 @@ public PageRequest previous() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.domain.Pageable#first()
 	 */
+	@Override
 	public Pageable first() {
 		return new PageRequest(0, getPageSize(), getSort());
 	}

src/main/java/org/springframework/data/domain/ExampleMatcher.java

@@ -47,41 +47,6 @@ public class Range<T extends Comparable<T>> {
 	 */
 	private final @NonNull Bound<T> upperBound;
 
-	/**
-	 * Creates a new {@link Range} with the given lower and upper bound. Treats the given values as inclusive bounds. Use
-	 * {@link #Range(Comparable, Comparable, boolean, boolean)} to configure different bound behavior.
-	 *
-	 * @see Range#of(Bound, Bound)
-	 * @param lowerBound can be {@literal null} in case upperBound is not {@literal null}.
-	 * @param upperBound can be {@literal null} in case lowerBound is not {@literal null}.
-	 * @deprecated since 2.0 in favor of {@link Range#of(Bound, Bound)}.
-	 */
-	@Deprecated
-	public Range(T lowerBound, T upperBound) {
-		this(lowerBound, upperBound, true, true);
-	}
-
-	/**
-	 * Creates a new {@link Range} with the given lower and upper bound as well as the given inclusive/exclusive
-	 * semantics.
-	 *
-	 * @param lowerBound can be {@literal null}.
-	 * @param upperBound can be {@literal null}.
-	 * @param lowerInclusive
-	 * @param upperInclusive
-	 * @deprecated since 2.0. Use {@link Range#of(Bound, Bound)} and {@link Bound} factory methods:
-	 *             {@link Bound#inclusive(Comparable)}, {@link Bound#exclusive(Comparable)}/{@link Bound#unbounded()}.
-	 */
-	@Deprecated
-	public Range(T lowerBound, T upperBound, boolean lowerInclusive, boolean upperInclusive) {
-
-		this.lowerBound = lowerBound == null ? Bound.unbounded()
-				: lowerInclusive ? Bound.inclusive(lowerBound) : Bound.exclusive(lowerBound);
-
-		this.upperBound = upperBound == null ? Bound.unbounded()
-				: upperInclusive ? Bound.inclusive(upperBound) : Bound.exclusive(upperBound);
-	}
-
 	/**
 	 * Returns an unbounded {@link Range}.
 	 *
@@ -117,24 +82,6 @@ public static <T extends Comparable<T>> Range<T> of(Bound<T> lowerBound, Bound<T
 		return new Range<>(lowerBound, upperBound);
 	}
 
-	/**
-	 * @return
-	 * @deprecated since 2.0, use {@link #getLowerBound()} and {@link Bound#isInclusive()}.
-	 */
-	@Deprecated
-	public boolean isLowerInclusive() {
-		return lowerBound.isInclusive();
-	}
-
-	/**
-	 * @return
-	 * @deprecated since 2.0, use {@link #getUpperBound()} and {@link Bound#isInclusive()}.
-	 */
-	@Deprecated
-	public boolean isUpperInclusive() {
-		return upperBound.isInclusive();
-	}
-
 	/**
 	 * Returns whether the {@link Range} contains the given value.
 	 *