- * When placed on a {@code @Bean} method, the endpoint defaults to the return type of the - * factory method: - * - *
- * @Configuration
- * public class MyConfiguration {
- *
- * @ConditionalOnEnableEndpoint
- * @Bean
- * public MyEndpoint myEndpoint() {
- * ...
- * }
- *
- * }
- * - * It is also possible to use the same mechanism for extensions: - * - *
- * @Configuration
- * public class MyConfiguration {
- *
- * @ConditionalOnEnableEndpoint
- * @Bean
- * public MyEndpointWebExtension myEndpointWebExtension() {
- * ...
- * }
- *
- * }
- * - * In the sample above, {@code MyEndpointWebExtension} will be created if the endpoint is - * enabled as defined by the rules above. {@code MyEndpointWebExtension} must be a regular - * extension that refers to an endpoint, something like: - * - *
- * @EndpointWebExtension(endpoint = MyEndpoint.class)
- * public class MyEndpointWebExtension {
- *
- * }
- * - * Alternatively, the target endpoint can be manually specified for components that should - * only be created when a given endpoint is enabled: - * - *
- * @Configuration
- * public class MyConfiguration {
- *
- * @ConditionalOnEnableEndpoint(endpoint = MyEndpoint.class)
- * @Bean
- * public MyComponent myComponent() {
- * ...
- * }
- *
- * }
- *
- * @author Stephane Nicoll
- * @since 2.0.0
- * @see Endpoint
- * @deprecated as of 2.2.0 in favor of
- * {@link ConditionalOnAvailableEndpoint @ConditionalOnAvailableEndpoint}
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.TYPE })
-@Documented
-@Conditional(OnEnabledEndpointCondition.class)
-@Deprecated
-public @interface ConditionalOnEnabledEndpoint {
-
- /**
- * The endpoint type that should be checked. Inferred when the return type of the
- * {@code @Bean} method is either an {@link Endpoint @Endpoint} or an
- * {@link EndpointExtension @EndpointExtension}.
- * @return the endpoint type to check
- * @since 2.0.6
- */
- Class endpoint() default Void.class;
-
-}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnEnabledEndpointCondition.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnEnabledEndpointCondition.java
deleted file mode 100644
index 2babd17f14..0000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnEnabledEndpointCondition.java
+++ /dev/null
@@ -1,40 +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.actuate.autoconfigure.endpoint.condition;
-
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-/**
- * A condition that checks if an endpoint is enabled.
- *
- * @author Stephane Nicoll
- * @author Andy Wilkinson
- * @author Phillip Webb
- * @see ConditionalOnEnabledEndpoint
- * @deprecated as of 2.2.0 in favor of {@link OnAvailableEndpointCondition}
- */
-@Deprecated
-class OnEnabledEndpointCondition extends AbstractEndpointCondition {
-
- @Override
- public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
- return getEnablementOutcome(context, metadata, ConditionalOnEnabledEndpoint.class);
- }
-
-}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java
deleted file mode 100644
index 98a66fcc5a..0000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java
+++ /dev/null
@@ -1,277 +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.actuate.autoconfigure.endpoint.condition;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.actuate.endpoint.EndpointFilter;
-import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.EndpointExtension;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link ConditionalOnEnabledEndpoint @ConditionalOnEnabledEndpoint}.
- *
- * @author Stephane Nicoll
- * @author Andy Wilkinson
- */
-@Deprecated
-@SuppressWarnings("deprecation")
-class ConditionalOnEnabledEndpointTests {
-
- private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
-
- @Test
- void outcomeWhenEndpointEnabledPropertyIsTrueShouldMatch() {
- this.contextRunner.withPropertyValues("management.endpoint.foo.enabled=true")
- .withUserConfiguration(FooEndpointEnabledByDefaultFalseConfiguration.class)
- .run((context) -> assertThat(context).hasBean("foo"));
- }
-
- @Test
- void outcomeWhenEndpointEnabledPropertyIsFalseShouldNotMatch() {
- this.contextRunner.withPropertyValues("management.endpoint.foo.enabled=false")
- .withUserConfiguration(FooEndpointEnabledByDefaultTrueConfiguration.class)
- .run((context) -> assertThat(context).doesNotHaveBean("foo"));
- }
-
- @Test
- void outcomeWhenNoEndpointPropertyAndUserDefinedDefaultIsTrueShouldMatch() {
- this.contextRunner.withPropertyValues("management.endpoints.enabled-by-default=true")
- .withUserConfiguration(FooEndpointEnabledByDefaultFalseConfiguration.class)
- .run((context) -> assertThat(context).hasBean("foo"));
- }
-
- @Test
- void outcomeWhenNoEndpointPropertyAndUserDefinedDefaultIsFalseShouldNotMatch() {
- this.contextRunner.withPropertyValues("management.endpoints.enabled-by-default=false")
- .withUserConfiguration(FooEndpointEnabledByDefaultTrueConfiguration.class)
- .run((context) -> assertThat(context).doesNotHaveBean("foo"));
- }
-
- @Test
- void outcomeWhenNoPropertiesAndAnnotationIsEnabledByDefaultShouldMatch() {
- this.contextRunner.withUserConfiguration(FooEndpointEnabledByDefaultTrueConfiguration.class)
- .run((context) -> assertThat(context).hasBean("foo"));
- }
-
- @Test
- void outcomeWhenNoPropertiesAndAnnotationIsNotEnabledByDefaultShouldNotMatch() {
- this.contextRunner.withUserConfiguration(FooEndpointEnabledByDefaultFalseConfiguration.class)
- .run((context) -> assertThat(context).doesNotHaveBean("foo"));
- }
-
- @Test
- void outcomeWhenNoPropertiesAndExtensionAnnotationIsEnabledByDefaultShouldMatch() {
- this.contextRunner.withUserConfiguration(FooEndpointAndExtensionEnabledByDefaultTrueConfiguration.class)
- .run((context) -> assertThat(context).hasBean("foo").hasBean("fooExt"));
- }
-
- @Test
- void outcomeWhenNoPropertiesAndExtensionAnnotationIsNotEnabledByDefaultShouldNotMatch() {
- this.contextRunner.withUserConfiguration(FooEndpointAndExtensionEnabledByDefaultFalseConfiguration.class)
- .run((context) -> assertThat(context).doesNotHaveBean("foo").doesNotHaveBean("fooExt"));
- }
-
- @Test
- void outcomeWithReferenceWhenNoPropertiesShouldMatch() {
- this.contextRunner
- .withUserConfiguration(FooEndpointEnabledByDefaultTrue.class,
- ComponentEnabledIfEndpointIsEnabledConfiguration.class)
- .run((context) -> assertThat(context).hasBean("fooComponent"));
- }
-
- @Test
- void outcomeWithReferenceWhenEndpointEnabledPropertyIsTrueShouldMatch() {
- this.contextRunner.withPropertyValues("management.endpoint.foo.enabled=true")
- .withUserConfiguration(FooEndpointEnabledByDefaultTrue.class,
- ComponentEnabledIfEndpointIsEnabledConfiguration.class)
- .run((context) -> assertThat(context).hasBean("fooComponent"));
- }
-
- @Test
- void outcomeWithReferenceWhenEndpointEnabledPropertyIsFalseShouldNotMatch() {
- this.contextRunner.withPropertyValues("management.endpoint.foo.enabled=false")
- .withUserConfiguration(FooEndpointEnabledByDefaultTrue.class,
- ComponentEnabledIfEndpointIsEnabledConfiguration.class)
- .run((context) -> assertThat(context).doesNotHaveBean("fooComponent"));
- }
-
- @Test
- void outcomeWithNoReferenceShouldFail() {
- this.contextRunner.withUserConfiguration(ComponentWithNoEndpointReferenceConfiguration.class).run((context) -> {
- assertThat(context).hasFailed();
- assertThat(context.getStartupFailure().getCause().getMessage())
- .contains("No endpoint is specified and the return type of the @Bean method "
- + "is neither an @Endpoint, nor an @EndpointExtension");
- });
- }
-
- @Test
- void outcomeWhenEndpointEnabledPropertyIsTrueAndMixedCaseShouldMatch() {
- this.contextRunner.withPropertyValues("management.endpoint.foo-bar.enabled=true")
- .withUserConfiguration(FooBarEndpointEnabledByDefaultFalseConfiguration.class)
- .run((context) -> assertThat(context).hasBean("fooBar"));
- }
-
- @Test
- void outcomeWhenEndpointEnabledPropertyIsFalseOnClassShouldNotMatch() {
- this.contextRunner.withPropertyValues("management.endpoint.foo.enabled=false")
- .withUserConfiguration(FooEndpointEnabledByDefaultTrueOnConfigurationConfiguration.class)
- .run((context) -> assertThat(context).doesNotHaveBean("foo"));
- }
-
- @Endpoint(id = "foo", enableByDefault = true)
- static class FooEndpointEnabledByDefaultTrue {
-
- }
-
- @Endpoint(id = "foo", enableByDefault = false)
- static class FooEndpointEnabledByDefaultFalse {
-
- }
-
- @Endpoint(id = "fooBar", enableByDefault = false)
- static class FooBarEndpointEnabledByDefaultFalse {
-
- }
-
- @EndpointExtension(endpoint = FooEndpointEnabledByDefaultTrue.class, filter = TestFilter.class)
- static class FooEndpointExtensionEnabledByDefaultTrue {
-
- }
-
- @EndpointExtension(endpoint = FooEndpointEnabledByDefaultFalse.class, filter = TestFilter.class)
- static class FooEndpointExtensionEnabledByDefaultFalse {
-
- }
-
- static class TestFilter implements EndpointFilter- * For any values specified by {@link #setConfigLocation(String)} or - * {@link #setConfigLocations(String[])}, attempt first to load each location as a - * class, registering a {@code BeanDefinition} if class loading is successful, and if - * class loading fails (i.e. a {@code ClassNotFoundException} is raised), assume the - * value is a package and attempt to scan it for annotated classes. - *
- * Enables the default set of annotation configuration post processors, such that - * {@code @Autowired}, {@code @Required}, and associated annotations can be used. - *
- * Configuration class bean definitions are registered with generated bean definition - * names unless the {@code value} attribute is provided to the stereotype annotation. - * @param beanFactory the bean factory to load bean definitions into - * @see #register(Class...) - * @see #scan(String...) - * @see #setConfigLocation(String) - * @see #setConfigLocations(String[]) - * @see AnnotatedBeanDefinitionReader - * @see ClassPathBeanDefinitionScanner - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext} - */ - @Deprecated - protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) { - throw new UnsupportedOperationException(); - } - - /** - * Build an {@link AnnotatedBeanDefinitionReader} for the given bean factory. - *
- * This should be pre-configured with the {@code Environment} (if desired) but not - * with a {@code BeanNameGenerator} or {@code ScopeMetadataResolver} yet. - * @param beanFactory the bean factory to load bean definitions into - * @return the annotated bean definition reader - * @see #getEnvironment() - * @see #getBeanNameGenerator() - * @see #getScopeMetadataResolver() - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext} - */ - @Deprecated - protected AnnotatedBeanDefinitionReader getAnnotatedBeanDefinitionReader(DefaultListableBeanFactory beanFactory) { - throw new UnsupportedOperationException(); - } - - /** - * Build a {@link ClassPathBeanDefinitionScanner} for the given bean factory. - *
- * This should be pre-configured with the {@code Environment} (if desired) but not - * with a {@code BeanNameGenerator} or {@code ScopeMetadataResolver} yet. - * @param beanFactory the bean factory to load bean definitions into - * @return the class path bean definition scanner - * @see #getEnvironment() - * @see #getBeanNameGenerator() - * @see #getScopeMetadataResolver() - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext} - */ - @Deprecated - protected ClassPathBeanDefinitionScanner getClassPathBeanDefinitionScanner(DefaultListableBeanFactory beanFactory) { - throw new UnsupportedOperationException(); - } - - /** - * Set the config locations for this application context in init-param style, i.e. - * with distinct locations separated by commas, semicolons or whitespace. - *
- * If not set, the implementation may use a default as appropriate. - * @param location the config location - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. Use - * {@link ImportResource @ImportResource} instead. - */ - @Deprecated - public void setConfigLocation(String location) { - throw new UnsupportedOperationException(); - } - - /** - * Set the config locations for this application context. - *
- * If not set, the implementation may use a default as appropriate. - * @param locations the config locations - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. Use - * {@link ImportResource @ImportResource} instead. - */ - @Deprecated - public void setConfigLocations(@Nullable String... locations) { - throw new UnsupportedOperationException(); - } - - /** - * Return an array of resource locations, referring to the XML bean definition files - * that this context should be built with. Can also include location patterns, which - * will get resolved via a ResourcePatternResolver. - *
- * The default implementation returns {@code null}. Subclasses can override this to - * provide a set of resource locations to load bean definitions from. - * @return an array of resource locations, or {@code null} if none - * @see #getResources - * @see #getResourcePatternResolver - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. - */ - @Deprecated - protected String[] getConfigLocations() { - throw new UnsupportedOperationException(); - } - - /** - * Return the default config locations to use, for the case where no explicit config - * locations have been specified. - *
- * The default implementation returns {@code null}, requiring explicit config - * locations. - * @return an array of default config locations, if any - * @see #setConfigLocations - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. - */ - @Deprecated - protected String[] getDefaultConfigLocations() { - throw new UnsupportedOperationException(); - } - - /** - * Resolve the given path, replacing placeholders with corresponding environment - * property values if necessary. Applied to config locations. - * @param path the original file path - * @return the resolved file path - * @see org.springframework.core.env.Environment#resolveRequiredPlaceholders(String) - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. - */ - @Deprecated - protected String resolvePath(String path) { - throw new UnsupportedOperationException(); - } - - /** - * Determine whether this context currently holds a bean factory, i.e. has been - * refreshed at least once and not been closed yet. - * @return {@code true} if the context holds a bean factory - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. - */ - @Deprecated - protected final boolean hasBeanFactory() { - return true; - } - - /** - * Create an internal bean factory for this context. Called for each - * {@link #refresh()} attempt. - *
- * The default implementation creates a - * {@link org.springframework.beans.factory.support.DefaultListableBeanFactory} with - * the {@linkplain #getInternalParentBeanFactory() internal bean factory} of this - * context's parent as parent bean factory. Can be overridden in subclasses, for - * example to customize DefaultListableBeanFactory's settings. - * @return the bean factory for this context - * @see org.springframework.beans.factory.support.DefaultListableBeanFactory#setAllowBeanDefinitionOverriding - * @see org.springframework.beans.factory.support.DefaultListableBeanFactory#setAllowEagerClassLoading - * @see org.springframework.beans.factory.support.DefaultListableBeanFactory#setAllowCircularReferences - * @see org.springframework.beans.factory.support.DefaultListableBeanFactory#setAllowRawInjectionDespiteWrapping - * @deprecated since 2.2.0 since this class no longer extends - * {@code AbstractRefreshableConfigApplicationContext}. - */ - @Deprecated - protected DefaultListableBeanFactory createBeanFactory() { - throw new UnsupportedOperationException(); - } - - /** - * Customize the internal bean factory used by this context. Called for each - * {@link #refresh()} attempt. - *
- * The default implementation applies this context's
- * {@linkplain #setAllowBeanDefinitionOverriding "allowBeanDefinitionOverriding"} and
- * {@linkplain #setAllowCircularReferences "allowCircularReferences"} settings, if
- * specified. Can be overridden in subclasses to customize any of
- * {@link DefaultListableBeanFactory}'s settings.
- * @param beanFactory the newly created bean factory for this context
- * @see DefaultListableBeanFactory#setAllowBeanDefinitionOverriding
- * @see DefaultListableBeanFactory#setAllowCircularReferences
- * @see DefaultListableBeanFactory#setAllowRawInjectionDespiteWrapping
- * @see DefaultListableBeanFactory#setAllowEagerClassLoading
- * @deprecated since 2.2.0 since this class no longer extends
- * {@code AbstractRefreshableConfigApplicationContext}.
- */
- @Deprecated
- protected void customizeBeanFactory(DefaultListableBeanFactory beanFactory) {
- throw new UnsupportedOperationException();
- }
-
}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java
index 9e6611e10a..172a8d9ab1 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -111,19 +111,6 @@ public class ReactiveWebServerApplicationContext extends GenericReactiveWebAppli
return getBeanFactory().getBean(factoryBeanName, ReactiveWebServerFactory.class);
}
- /**
- * Return the {@link ReactiveWebServerFactory} that should be used to create the
- * reactive web server. By default this method searches for a suitable bean in the
- * context itself.
- * @return a {@link ReactiveWebServerFactory} (never {@code null})
- * @deprecated since 2.2.0 in favor of {@link #getWebServerFactoryBeanName()} and
- * {@link #getWebServerFactory(String)}
- */
- @Deprecated
- protected ReactiveWebServerFactory getWebServerFactory() {
- return getWebServerFactory(getWebServerFactoryBeanName());
- }
-
@Override
protected void finishRefresh() {
super.finishRefresh();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
index 266b06ab41..54da50ac43 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -99,7 +99,6 @@ import static org.mockito.Mockito.verify;
/**
* Tests for {@link ConfigurationProperties @ConfigurationProperties}-annotated beans.
* Covers {@link EnableConfigurationProperties @EnableConfigurationProperties},
- * {@link ConfigurationPropertiesBindingPostProcessorRegistrar},
* {@link ConfigurationPropertiesBindingPostProcessor} and
* {@link ConfigurationPropertiesBinder}.
*
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java
index 4a128f6a87..21c8b6298b 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -150,29 +150,6 @@ class BindResultTests {
assertThat(result.orElseGet(this.supplier)).isEqualTo("bar");
}
- @Test
- @Deprecated
- @SuppressWarnings("deprecation")
- void orElseCreateWhenTypeIsNullShouldThrowException() {
- BindResult