Merge pull request #19189 from dreis2211

* gh-19189: Remove code that is deprecated since 2.1.x Closes gh-19189
spring-projects · Nov 29, 2019 · 346ee3e · 346ee3e
2 parents b6fb251 + c6c03e8
commit 346ee3e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 68 deletions.
diff --git a/...framework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java b/...framework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java
@@ -36,18 +36,6 @@
 @Order(Ordered.LOWEST_PRECEDENCE)
 public class MongoClientDependsOnBeanFactoryPostProcessor extends AbstractDependsOnBeanFactoryPostProcessor {
 
-	/**
-	 * Creates a new {@code MongoClientDependsOnBeanFactoryPostProcessor} that will set up
-	 * dependencies upon beans with the given names.
-	 * @param dependsOn names of the beans to depend upon
-	 * @deprecated since 2.1.7 in favor of
-	 * {@link #MongoClientDependsOnBeanFactoryPostProcessor(Class...)}
-	 */
-	@Deprecated
-	public MongoClientDependsOnBeanFactoryPostProcessor(String... dependsOn) {
-		super(MongoClient.class, MongoClientFactoryBean.class, dependsOn);
-	}
-
 	/**
 	 * Creates a new {@code MongoClientDependsOnBeanFactoryPostProcessor} that will set up
 	 * dependencies upon beans with the given types.

diff --git a/...autoconfigure/data/mongo/ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.java b/...autoconfigure/data/mongo/ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.java
@@ -37,18 +37,6 @@
 public class ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor
 		extends AbstractDependsOnBeanFactoryPostProcessor {
 
-	/**
-	 * Creates a new {@code ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor}
-	 * that will set up dependencies upon beans with the given names.
-	 * @param dependsOn names of the beans to depend upon
-	 * @deprecated since 2.1.7 in favor of
-	 * {@link #ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor(Class...)}
-	 */
-	@Deprecated
-	public ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor(String... dependsOn) {
-		super(MongoClient.class, ReactiveMongoClientFactoryBean.class, dependsOn);
-	}
-
 	/**
 	 * Creates a new {@code ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor}
 	 * that will set up dependencies upon beans with the given types.

diff --git a/...org/springframework/boot/autoconfigure/security/servlet/JerseyRequestMatcherProvider.java b/...org/springframework/boot/autoconfigure/security/servlet/JerseyRequestMatcherProvider.java