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

Polish "Replace AotApplicationContextInitializer with interface"

Browse Source 
Closes gh-29157
This commit is contained in:
Stephane Nicoll
2022-09-30 07:46:00 +02:00
parent f2568f2dda
commit e4940149d9
4 changed files with 7 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-context/src/test/java/org/springframework/context/aot/AotApplicationContextInitializerTests.java
View File

@@ -36,7 +36,7 @@ class AotApplicationContextInitializerTests {
void initializeInvokesApplicationContextInitializer() {
GenericApplicationContext context = new GenericApplicationContext();
AotApplicationContextInitializer.forInitializerClasses(
TestApplicationContextInitializer.class.getName())
TestApplicationContextInitializer.class.getName())
.initialize(context);
assertThat(context.getBeanDefinitionNames()).containsExactly("test");
}
@@ -45,8 +45,8 @@ class AotApplicationContextInitializerTests {
void initializeInvokesApplicationContextInitializersInOrder() {
GenericApplicationContext context = new GenericApplicationContext();
AotApplicationContextInitializer.forInitializerClasses(
AnotherApplicationContextInitializer.class.getName(),
TestApplicationContextInitializer.class.getName())
AnotherApplicationContextInitializer.class.getName(),
TestApplicationContextInitializer.class.getName())
.initialize(context);
assertThat(context.getBeanDefinitionNames()).containsExactly("another", "test");
}
@@ -93,6 +93,7 @@ class AotApplicationContextInitializerTests {
static class ConfigurableApplicationContextInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
@SuppressWarnings("unused")
public ConfigurableApplicationContextInitializer(ClassLoader classLoader) {
}

103
spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotInitializerTests.java
View File

@@ -1,103 +0,0 @@
/*
* Copyright 2002-2022 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.aot;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.support.GenericApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
/**
* Tests for {@link ApplicationContextAotInitializer}.
*
* @author Stephane Nicoll
*/
@Deprecated
class ApplicationContextAotInitializerTests {
private final ApplicationContextAotInitializer initializer = new ApplicationContextAotInitializer();
@Test
void initializeInvokeApplicationContextInitializer() {
GenericApplicationContext context = new GenericApplicationContext();
initializer.initialize(context, TestApplicationContextInitializer.class.getName());
assertThat(context.getBeanDefinitionNames()).containsExactly("test");
}
@Test
void initializeInvokeApplicationContextInitializersInOrder() {
GenericApplicationContext context = new GenericApplicationContext();
initializer.initialize(context, AnotherApplicationContextInitializer.class.getName(),
TestApplicationContextInitializer.class.getName());
assertThat(context.getBeanDefinitionNames()).containsExactly("another", "test");
}
@Test
void initializeFailWithNonApplicationContextInitializer() {
GenericApplicationContext context = new GenericApplicationContext();
assertThatIllegalArgumentException()
.isThrownBy(() -> initializer.initialize(context, "java.lang.String"))
.withMessageContaining("not assignable")
.withMessageContaining("ApplicationContextInitializer")
.withMessageContaining("java.lang.String");
}
@Test
void initializeFailWithApplicationContextInitializerAndNonDefaultConstructor() {
GenericApplicationContext context = new GenericApplicationContext();
assertThatIllegalArgumentException()
.isThrownBy(() -> initializer.initialize(context,
ConfigurableApplicationContextInitializer.class.getName()))
.withMessageContaining("Failed to instantiate ApplicationContextInitializer: ")
.withMessageContaining(ConfigurableApplicationContextInitializer.class.getName());
}
static class TestApplicationContextInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
@Override
public void initialize(GenericApplicationContext applicationContext) {
applicationContext.registerBeanDefinition("test", new RootBeanDefinition());
}
}
static class AnotherApplicationContextInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
@Override
public void initialize(GenericApplicationContext applicationContext) {
applicationContext.registerBeanDefinition("another", new RootBeanDefinition());
}
}
static class ConfigurableApplicationContextInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
public ConfigurableApplicationContextInitializer(ClassLoader classLoader) {
}
@Override
public void initialize(GenericApplicationContext applicationContext) {
}
}
}