diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java index 75f805bcee..3216a9c5c5 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java @@ -123,7 +123,7 @@ class ConfigurationClassEnhancer { * {@code @Configuration} classes must de-register static CGLIB callbacks on * destruction, which is handled by the (private) {@code DisposableBeanMethodInterceptor}. *

Note that this interface is intended for framework-internal use only, however - * must remain public in order to allow access to subclasses generated from other + * must remain public in order to allow access to subclasses generated from other * packages (i.e. user code). */ public interface EnhancedConfiguration extends DisposableBean { diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests-context.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests-context.xml deleted file mode 100644 index f683b5e178..0000000000 --- a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests-context.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java index a1e6bbf7d0..a34b9fa611 100644 --- a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2011 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 + * + * http://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.annotation.configuration; import org.junit.Test; @@ -19,7 +35,7 @@ import org.springframework.context.support.GenericApplicationContext; public class DuplicateConfigurationClassPostProcessorTests { @Test - public void test() { + public void repro() { GenericApplicationContext ctx = new GenericApplicationContext(); ctx.registerBeanDefinition("a", new RootBeanDefinition(ConfigurationClassPostProcessor.class)); ctx.registerBeanDefinition("b", new RootBeanDefinition(ConfigurationClassPostProcessor.class));