Remove 3.x deprecations.

Removed all deprecations that have accumulated in the 3.x timeline so far.

Author: odrotbohm

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ControllerUtils.java

@@ -15,11 +15,8 @@
  */
 package org.springframework.data.rest.webmvc;
 
-import java.util.Collections;
 import java.util.Optional;
 
-import org.springframework.hateoas.CollectionModel;
-import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.RepresentationModel;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -32,13 +29,6 @@
  */
 public class ControllerUtils {
 
-	/**
-	 * Use {@link CollectionModel#empty()} instead.
-	 *
-	 * @deprecated since 3.3
-	 */
-	@Deprecated public static final Iterable<EntityModel<?>> EMPTY_RESOURCE_LIST = Collections.emptyList();
-
 	public static <R extends RepresentationModel<?>> ResponseEntity<RepresentationModel<?>> toResponseEntity(
 			HttpStatus status, HttpHeaders headers, Optional<R> resource) {
 

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RestMediaTypes.java

@@ -26,24 +26,11 @@
  */
 public class RestMediaTypes {
 
-
 	public static final MediaType HAL_JSON = MediaTypes.HAL_JSON;
 
 	public static final MediaType JSON_PATCH_JSON = MediaType.valueOf("application/json-patch+json");
 	public static final MediaType MERGE_PATCH_JSON = MediaType.valueOf("application/merge-patch+json");
 
-	/**
-	 * @deprecated Migrate to {@link MediaTypes#ALPS_JSON_VALUE}.
-	 */
-	@Deprecated
-	public static final String ALPS_JSON_VALUE = "application/alps+json";
-
-	/**
-	 * @deprecated Migrate to {@link MediaTypes#ALPS_JSON}.
-	 */
-	@Deprecated
-	public static final MediaType ALPS_JSON = MediaType.parseMediaType(MediaTypes.ALPS_JSON_VALUE);
-
 	public static final String SCHEMA_JSON_VALUE = "application/schema+json";
 	public static final MediaType SCHEMA_JSON = MediaType.valueOf(SCHEMA_JSON_VALUE);
 

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java

@@ -41,8 +41,7 @@
  * @author Oliver Gierke
  * @soundtrack Benny Greb - Stabila (Moving Parts)
  */
-class DelegatingHandlerMapping
-		implements org.springframework.data.rest.webmvc.support.DelegatingHandlerMapping, Ordered {
+class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable<HandlerMapping>, Ordered {
 
 	private final List<HandlerMapping> delegates;
 	private final @Nullable PathPatternParser parser;

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java

@@ -189,10 +189,8 @@ private static void copyRemainingProperties(MappedProperties properties, Object
 	 * @param target
 	 * @param mapper
 	 * @return
-	 * @deprecated
 	 */
-	@Deprecated
-	public <T> T merge(ObjectNode source, T target, ObjectMapper mapper) {
+	<T> T merge(ObjectNode source, T target, ObjectMapper mapper) {
 
 		try {
 			return doMerge(source, target, mapper);

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/Patch.java

@@ -47,17 +47,6 @@ public int size() {
 		return operations.size();
 	}
 
-	/**
-	 * Returns all underlying {@link PatchOperation}s.
-	 *
-	 * @return
-	 * @deprecated since 3.2, prefer streaming via {@link #stream()}.
-	 */
-	@Deprecated
-	public List<PatchOperation> getOperations() {
-		return operations;
-	}
-
 	/**
 	 * Applies the Patch to a given Object graph. Makes a copy of the given object so that it will remain unchanged after
 	 * application of the patch and in case any errors occur while performing the patch.