diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java index 1abe21203252..5b0288ff8c07 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/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/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.java index fa236dca4855..0b0be21434f9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/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/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/JerseyRequestMatcherProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/JerseyRequestMatcherProvider.java deleted file mode 100644 index c25210b6cc00..000000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/JerseyRequestMatcherProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.boot.autoconfigure.security.servlet; - -import org.springframework.boot.autoconfigure.web.servlet.JerseyApplicationPath; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import org.springframework.security.web.util.matcher.RequestMatcher; - -/** - * {@link RequestMatcherProvider} that provides an {@link AntPathRequestMatcher} that can - * be used for Jersey applications. - * - * @author Madhura Bhave - * @since 2.0.7 - * @deprecated since 2.1.8 in favor of {@link AntPathRequestMatcher} - */ -@Deprecated -public class JerseyRequestMatcherProvider implements RequestMatcherProvider { - - private final JerseyApplicationPath jerseyApplicationPath; - - public JerseyRequestMatcherProvider(JerseyApplicationPath jerseyApplicationPath) { - this.jerseyApplicationPath = jerseyApplicationPath; - } - - @Override - public RequestMatcher getRequestMatcher(String pattern) { - return new AntPathRequestMatcher(this.jerseyApplicationPath.getRelativePath(pattern)); - } - -}