Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Early removal of 5.x-deprecated code

Browse Source 
Closes gh-27686
This commit is contained in:
Juergen Hoeller
2021-11-18 09:18:06 +01:00
parent 17cdd97c37
commit 4750a9430c
132 changed files with 89 additions and 9216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 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.
@@ -18,7 +18,6 @@ package org.springframework.context.annotation.configuration;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowire;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -46,15 +45,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class BeanAnnotationAttributePropagationTests {
@Test
public void autowireMetadataIsPropagated() {
@Configuration class Config {
@Bean(autowire=Autowire.BY_TYPE) Object foo() { return null; }
}
assertThat(beanDef(Config.class).getAutowireMode()).as("autowire mode was not propagated").isEqualTo(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
}
@Test
public void autowireCandidateMetadataIsPropagated() {
@Configuration class Config {

122
spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
View File

@@ -1,122 +0,0 @@
/*
* Copyright 2002-2021 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.context.support;
import java.lang.management.ManagementFactory;
import java.util.Set;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
/**
* Tests for {@link LiveBeansView}
*
* @author Stephane Nicoll
* @author Sam Brannen
*/
@SuppressWarnings("deprecation")
class LiveBeansViewTests {
private final MockEnvironment environment = new MockEnvironment();
@Test
void registerIgnoredIfPropertyIsNotSet(TestInfo testInfo) throws MalformedObjectNameException {
ConfigurableApplicationContext context = createApplicationContext("app");
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
LiveBeansView.registerApplicationContext(context);
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
LiveBeansView.unregisterApplicationContext(context);
}
@Test
void registerUnregisterSingleContext(TestInfo testInfo) throws MalformedObjectNameException {
this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME,
testInfo.getTestMethod().get().getName());
ConfigurableApplicationContext context = createApplicationContext("app");
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
LiveBeansView.registerApplicationContext(context);
assertSingleLiveBeansViewMbean(testInfo, "app");
LiveBeansView.unregisterApplicationContext(context);
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
}
@Test
void registerUnregisterSeveralContexts(TestInfo testInfo) throws MalformedObjectNameException {
this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME,
testInfo.getTestMethod().get().getName());
ConfigurableApplicationContext context = createApplicationContext("app");
ConfigurableApplicationContext childContext = createApplicationContext("child");
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
LiveBeansView.registerApplicationContext(context);
assertSingleLiveBeansViewMbean(testInfo, "app");
LiveBeansView.registerApplicationContext(childContext);
// Only one MBean
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(1);
LiveBeansView.unregisterApplicationContext(childContext);
assertSingleLiveBeansViewMbean(testInfo, "app"); // Root context removes it
LiveBeansView.unregisterApplicationContext(context);
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
}
@Test
void registerUnregisterSeveralContextsDifferentOrder(TestInfo testInfo) throws MalformedObjectNameException {
this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME,
testInfo.getTestMethod().get().getName());
ConfigurableApplicationContext context = createApplicationContext("app");
ConfigurableApplicationContext childContext = createApplicationContext("child");
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
LiveBeansView.registerApplicationContext(context);
assertSingleLiveBeansViewMbean(testInfo, "app");
LiveBeansView.registerApplicationContext(childContext);
assertSingleLiveBeansViewMbean(testInfo, "app"); // Only one MBean
LiveBeansView.unregisterApplicationContext(context);
LiveBeansView.unregisterApplicationContext(childContext);
assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
}
private ConfigurableApplicationContext createApplicationContext(String applicationName) {
ConfigurableApplicationContext context = mock(ConfigurableApplicationContext.class);
given(context.getEnvironment()).willReturn(this.environment);
given(context.getApplicationName()).willReturn(applicationName);
return context;
}
private void assertSingleLiveBeansViewMbean(TestInfo testInfo, String applicationName) throws MalformedObjectNameException {
Set<ObjectName> objectNames = searchLiveBeansViewMeans(testInfo);
assertThat(objectNames.size()).isEqualTo(1);
assertThat(objectNames.iterator().next().getCanonicalName()).as("Wrong MBean name").isEqualTo(
String.format("%s:application=%s", testInfo.getTestMethod().get().getName(), applicationName));
}
private Set<ObjectName> searchLiveBeansViewMeans(TestInfo testInfo) throws MalformedObjectNameException {
String objectName = String.format("%s:*,%s=*", testInfo.getTestMethod().get().getName(),
LiveBeansView.MBEAN_APPLICATION_KEY);
return ManagementFactory.getPlatformMBeanServer().queryNames(new ObjectName(objectName), null);
}
}