Browse Source

Polish tests and Javadoc for SPR-8824

Issue: SPR-8824
pull/7/head
Chris Beams 13 years ago
parent
commit
c03a950706
  1. 2
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
  2. 15
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests-context.xml
  3. 18
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java

2
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java

@ -123,7 +123,7 @@ class ConfigurationClassEnhancer { @@ -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}.
* <p>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 {

15
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests-context.xml

@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:neo4j="http://www.springframework.org/schema/data/neo4j"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j-2.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
<bean id="a" class="org.springframework.context.annotation.ConfigurationClassPostProcessor"/>
<bean id="b" class="org.springframework.context.annotation.ConfigurationClassPostProcessor"/>
<bean id="c" class="org.springframework.context.annotation.DuplicateConfigurationClassPostProcessorTests$Config"/>
</beans>

18
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/DuplicateConfigurationClassPostProcessorTests.java

@ -1,3 +1,19 @@ @@ -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; @@ -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));

Loading…
Cancel
Save