From ba21e9bdb6c33af0c637fe8ffb7c99d544987a6e Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 6 Mar 2009 07:18:42 +0000 Subject: [PATCH] + Moved @Bean into base package, next to @Configuration + Removed .ext package + Further reduced visibility of types wherever possible + Eliminated package cycles git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@733 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../org/springframework/config/java/{ext => }/Bean.java | 4 +--- .../java/org/springframework/config/java/BeanMethod.java | 1 - .../config/java/{ext => }/BeanRegistrar.java | 8 +------- .../org/springframework/config/java/Configuration.java | 1 - .../springframework/config/java/ConfigurationClass.java | 1 - .../springframework/config/java/ConfigurationModel.java | 1 - .../java/org/springframework/config/java/Validatable.java | 2 +- .../java/org/springframework/config/java/Validator.java | 5 +---- .../java/internal/enhancement/BeanMethodInterceptor.java | 6 +++--- .../java/internal/enhancement/ConfigurationEnhancer.java | 2 +- .../internal/parsing/ConfigurationClassMethodVisitor.java | 2 +- .../java/support/AbstractConfigurationClassProcessor.java | 2 +- .../java/support/ConfigurationClassPostProcessor.java | 2 +- .../support/ConfigurationModelBeanDefinitionReader.java | 4 ++-- .../java/support/ConfigurationPostProcessorTests.java | 2 +- .../test/java/test/basic/AutowiredConfigurationTests.java | 2 +- .../src/test/java/test/basic/BasicTests.java | 2 +- 17 files changed, 16 insertions(+), 31 deletions(-) rename org.springframework.config.java/src/main/java/org/springframework/config/java/{ext => }/Bean.java (96%) rename org.springframework.config.java/src/main/java/org/springframework/config/java/{ext => }/BeanRegistrar.java (95%) diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/Bean.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/Bean.java similarity index 96% rename from org.springframework.config.java/src/main/java/org/springframework/config/java/ext/Bean.java rename to org.springframework.config.java/src/main/java/org/springframework/config/java/Bean.java index 720d49afbed..5189481da95 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/Bean.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/Bean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.config.java.ext; +package org.springframework.config.java; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -25,8 +25,6 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.config.java.Configuration; -import org.springframework.config.java.StandardScopes; /** diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/BeanMethod.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/BeanMethod.java index c2c24bbdf3d..983597ff8bc 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/BeanMethod.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/BeanMethod.java @@ -22,7 +22,6 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import org.springframework.config.java.ext.Bean; import org.springframework.util.Assert; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanRegistrar.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/BeanRegistrar.java similarity index 95% rename from org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanRegistrar.java rename to org.springframework.config.java/src/main/java/org/springframework/config/java/BeanRegistrar.java index b7e824ef105..30cb188f8e1 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanRegistrar.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/BeanRegistrar.java @@ -1,4 +1,4 @@ -package org.springframework.config.java.ext; +package org.springframework.config.java; import static java.lang.String.*; import static org.springframework.util.StringUtils.*; @@ -13,12 +13,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.config.java.BeanDefinitionRegistrar; -import org.springframework.config.java.BeanMethod; -import org.springframework.config.java.Configuration; -import org.springframework.config.java.ConfigurationClass; -import org.springframework.config.java.MalformedConfigurationException; -import org.springframework.config.java.UsageError; import org.springframework.core.annotation.AnnotationUtils; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java index 84d01b7adf4..1ea137739c4 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/Configuration.java @@ -24,7 +24,6 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Required; -import org.springframework.config.java.ext.Bean; import org.springframework.stereotype.Component; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationClass.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationClass.java index 32bc0bff51a..c5a1e1b5115 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationClass.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationClass.java @@ -24,7 +24,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.springframework.config.java.ext.Bean; import org.springframework.util.Assert; import sun.security.x509.Extension; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationModel.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationModel.java index ef93341eb19..cd59c970943 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationModel.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/ConfigurationModel.java @@ -20,7 +20,6 @@ import static java.lang.String.*; import java.util.ArrayList; import java.util.List; -import org.springframework.config.java.ext.Bean; /** diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/Validatable.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/Validatable.java index a6546774f32..8eecc4076de 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/Validatable.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/Validatable.java @@ -10,7 +10,7 @@ import java.util.List; * * @author Chris Beams */ -public interface Validatable { +interface Validatable { /** * Validates this object, adding any errors to the supplied list of errors. diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/Validator.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/Validator.java index 09b577056d7..e0b6b5f5952 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/Validator.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/Validator.java @@ -3,10 +3,7 @@ package org.springframework.config.java; import java.util.List; -/** Marker interface */ -// TODO: SJC-242 document -// TODO: SJC-242 rename -public interface Validator { +interface Validator { boolean supports(Object object); void validate(Object object, List errors); diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java index 0fce6cb2d4b..46b8bb483f1 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java @@ -22,8 +22,8 @@ import java.lang.reflect.Method; import net.sf.cglib.proxy.MethodProxy; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.config.java.ext.Bean; -import org.springframework.config.java.ext.BeanRegistrar; +import org.springframework.config.java.Bean; +import org.springframework.config.java.BeanRegistrar; /** @@ -35,7 +35,7 @@ import org.springframework.config.java.ext.BeanRegistrar; * * @author Chris Beams */ -public class BeanMethodInterceptor extends AbstractMethodInterceptor { +class BeanMethodInterceptor extends AbstractMethodInterceptor { /** * Enhances a {@link Bean @Bean} method to check the supplied BeanFactory for the diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java index 769e384da9d..b2221d47022 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java @@ -41,8 +41,8 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.config.java.BeanDefinitionRegistrar; import org.springframework.config.java.BeanMethod; +import org.springframework.config.java.BeanRegistrar; import org.springframework.config.java.Configuration; -import org.springframework.config.java.ext.BeanRegistrar; /** diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/parsing/ConfigurationClassMethodVisitor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/parsing/ConfigurationClassMethodVisitor.java index 93e9c52778e..f4f1455be8a 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/parsing/ConfigurationClassMethodVisitor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/parsing/ConfigurationClassMethodVisitor.java @@ -28,11 +28,11 @@ import org.objectweb.asm.ClassAdapter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodAdapter; import org.objectweb.asm.Opcodes; +import org.springframework.config.java.Bean; import org.springframework.config.java.BeanMethod; import org.springframework.config.java.Configuration; import org.springframework.config.java.ConfigurationClass; import org.springframework.config.java.ModelClass; -import org.springframework.config.java.ext.Bean; /** diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java index a6dd7fde638..9d18b8cd266 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/AbstractConfigurationClassProcessor.java @@ -17,10 +17,10 @@ package org.springframework.config.java.support; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.config.java.Bean; import org.springframework.config.java.Configuration; import org.springframework.config.java.ConfigurationModel; import org.springframework.config.java.MalformedConfigurationException; -import org.springframework.config.java.ext.Bean; import org.springframework.config.java.internal.parsing.ConfigurationParser; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java index 7c598cb712f..267562fcdac 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationClassPostProcessor.java @@ -28,11 +28,11 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.config.java.Bean; import org.springframework.config.java.Configuration; import org.springframework.config.java.ConfigurationModel; import org.springframework.config.java.MalformedConfigurationException; import org.springframework.config.java.UsageError; -import org.springframework.config.java.ext.Bean; import org.springframework.config.java.internal.enhancement.ConfigurationEnhancer; import org.springframework.config.java.internal.parsing.ConfigurationParser; import org.springframework.core.Ordered; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java index 0fa13559513..0fe4e339475 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationModelBeanDefinitionReader.java @@ -26,12 +26,12 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry; +import org.springframework.config.java.Bean; import org.springframework.config.java.BeanMethod; +import org.springframework.config.java.BeanRegistrar; import org.springframework.config.java.Configuration; import org.springframework.config.java.ConfigurationClass; import org.springframework.config.java.ConfigurationModel; -import org.springframework.config.java.ext.Bean; -import org.springframework.config.java.ext.BeanRegistrar; import org.springframework.config.java.plugin.Extension; import org.springframework.core.io.Resource; diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java b/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java index 309efdad079..b9ff55d7f07 100644 --- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java +++ b/org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java @@ -24,8 +24,8 @@ import java.util.Vector; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.config.java.Bean; import org.springframework.config.java.Configuration; -import org.springframework.config.java.ext.Bean; import org.springframework.util.ClassUtils; diff --git a/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java b/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java index c608c2b361c..012615384f0 100644 --- a/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java +++ b/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java @@ -6,8 +6,8 @@ import static org.junit.Assert.*; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.config.java.Bean; import org.springframework.config.java.Configuration; -import org.springframework.config.java.ext.Bean; import org.springframework.context.support.ClassPathXmlApplicationContext; import test.beans.Colour; diff --git a/org.springframework.config.java/src/test/java/test/basic/BasicTests.java b/org.springframework.config.java/src/test/java/test/basic/BasicTests.java index 32f6890c076..479f05230c8 100644 --- a/org.springframework.config.java/src/test/java/test/basic/BasicTests.java +++ b/org.springframework.config.java/src/test/java/test/basic/BasicTests.java @@ -9,10 +9,10 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.config.java.Bean; import org.springframework.config.java.Configuration; import org.springframework.config.java.MalformedConfigurationException; import org.springframework.config.java.StandardScopes; -import org.springframework.config.java.ext.Bean; import org.springframework.config.java.support.ConfigurationClassPostProcessor; import test.beans.ITestBean;