Browse Source

consolidated context.annotation.support -> context.annotation

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@842 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Chris Beams 17 years ago
parent
commit
d96ebc4385
  1. 4
      org.springframework.context/src/main/java/org/springframework/context/annotation/AbstractConfigurationClassProcessor.java
  2. 2
      org.springframework.context/src/main/java/org/springframework/context/annotation/AddAnnotationAdapter.java
  3. 2
      org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationAdapter.java
  4. 1
      org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
  5. 2
      org.springframework.context/src/main/java/org/springframework/context/annotation/AsmUtils.java
  6. 6
      org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java
  7. 5
      org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethodInterceptor.java
  8. 4
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
  9. 6
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethodVisitor.java
  10. 4
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
  11. 6
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassVisitor.java
  12. 6
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationEnhancer.java
  13. 3
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModel.java
  14. 6
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModelBeanDefinitionReader.java
  15. 7
      org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationParser.java
  16. 5
      org.springframework.context/src/main/java/org/springframework/context/annotation/ImportAnnotationVisitor.java
  17. 3
      org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStack.java
  18. 3
      org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStackHolder.java
  19. 2
      org.springframework.context/src/main/java/org/springframework/context/annotation/ModelClass.java
  20. 15
      org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotation.java
  21. 4
      org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationArrayVisitor.java
  22. 2
      org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationInvocationHandler.java
  23. 4
      org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationVisitor.java
  24. 25
      org.springframework.context/src/main/java/org/springframework/context/annotation/support/package-info.java
  25. 4
      org.springframework.context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
  26. 4
      org.springframework.context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
  27. 7
      org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodTests.java
  28. 6
      org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationModelTests.java
  29. 3
      org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationPostProcessorTests.java
  30. 4
      org.springframework.context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
  31. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
  32. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
  33. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
  34. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
  35. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
  36. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
  37. 2
      org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java

4
org.springframework.context/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/AbstractConfigurationClassProcessor.java

@ -14,14 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.FailFastProblemReporter; import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/** /**

2
org.springframework.context/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java → org.springframework.context/src/main/java/org/springframework/context/annotation/AddAnnotationAdapter.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import net.sf.cglib.asm.Constants; import net.sf.cglib.asm.Constants;

2
org.springframework.context/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java → org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationAdapter.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import org.springframework.asm.AnnotationVisitor; import org.springframework.asm.AnnotationVisitor;

1
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java

@ -25,7 +25,6 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
/** /**

2
org.springframework.context/src/main/java/org/springframework/context/annotation/support/AsmUtils.java → org.springframework.context/src/main/java/org/springframework/context/annotation/AsmUtils.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.util.ClassUtils.*; import static org.springframework.util.ClassUtils.*;

6
org.springframework.context/src/main/java/org/springframework/context/annotation/support/BeanMethod.java → org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.context.annotation.StandardScopes.*; import static org.springframework.context.annotation.StandardScopes.*;
@ -27,10 +27,6 @@ import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.parsing.Location; import org.springframework.beans.factory.parsing.Location;
import org.springframework.beans.factory.parsing.Problem; import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.util.Assert; import org.springframework.util.Assert;

5
org.springframework.context/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethodInterceptor.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
@ -27,9 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;

4
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
@ -24,8 +24,6 @@ import java.util.Set;
import org.springframework.beans.factory.parsing.Problem; import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.Assert; import org.springframework.util.Assert;

6
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethodVisitor.java

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.util.ClassUtils.*; import static org.springframework.util.ClassUtils.*;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
@ -28,8 +28,6 @@ import org.springframework.asm.Label;
import org.springframework.asm.MethodAdapter; import org.springframework.asm.MethodAdapter;
import org.springframework.asm.MethodVisitor; import org.springframework.asm.MethodVisitor;
import org.springframework.asm.Opcodes; import org.springframework.asm.Opcodes;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/** /**

4
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
@ -28,8 +28,6 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.ClassMetadata; import org.springframework.core.type.ClassMetadata;

6
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassVisitor.java

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.util.ClassUtils.*; import static org.springframework.util.ClassUtils.*;
import java.util.HashMap; import java.util.HashMap;
@ -32,8 +32,6 @@ import org.springframework.asm.Opcodes;
import org.springframework.beans.factory.parsing.Location; import org.springframework.beans.factory.parsing.Location;
import org.springframework.beans.factory.parsing.Problem; import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;

6
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationEnhancer.java

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -35,8 +35,6 @@ import org.springframework.asm.ClassAdapter;
import org.springframework.asm.ClassReader; import org.springframework.asm.ClassReader;
import org.springframework.asm.ClassWriter; import org.springframework.asm.ClassWriter;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.util.Assert; import org.springframework.util.Assert;

3
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModel.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
@ -22,7 +22,6 @@ import java.util.LinkedHashSet;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Configuration;
/** /**

6
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModelBeanDefinitionReader.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.util.StringUtils.*; import static org.springframework.util.StringUtils.*;
@ -36,10 +36,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry; import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.util.Assert; import org.springframework.util.Assert;

7
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationParser.java

@ -14,14 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import org.springframework.asm.ClassReader; import org.springframework.asm.ClassReader;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -39,7 +38,7 @@ import org.springframework.util.ClassUtils;
* @see ConfigurationModel * @see ConfigurationModel
* @see ConfigurationModelBeanDefinitionReader * @see ConfigurationModelBeanDefinitionReader
*/ */
public class ConfigurationParser { class ConfigurationParser {
/** /**
* Model to be populated during calls to {@link #parse(Object, String)} * Model to be populated during calls to {@link #parse(Object, String)}

5
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ImportAnnotationVisitor.java

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.util.ClassUtils.*; import static org.springframework.util.ClassUtils.*;
import java.util.ArrayList; import java.util.ArrayList;
@ -26,7 +26,6 @@ import org.springframework.asm.AnnotationVisitor;
import org.springframework.asm.ClassReader; import org.springframework.asm.ClassReader;
import org.springframework.asm.Type; import org.springframework.asm.Type;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Import;
import org.springframework.util.Assert; import org.springframework.util.Assert;

3
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportStack.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStack.java

@ -14,14 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.Stack; import java.util.Stack;
import org.springframework.context.annotation.Import;
import org.springframework.util.Assert; import org.springframework.util.Assert;

3
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStackHolder.java

@ -14,9 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import org.springframework.context.annotation.Import;
/** /**

2
org.springframework.context/src/main/java/org/springframework/context/annotation/support/ModelClass.java → org.springframework.context/src/main/java/org/springframework/context/annotation/ModelClass.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.springframework.util.ClassUtils.*; import static org.springframework.util.ClassUtils.*;

15
org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java → org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotation.java

@ -14,9 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import org.springframework.context.annotation.Configuration;
/** /**
* Interface used when dynamically creating mutable instances of annotations associated * Interface used when dynamically creating mutable instances of annotations associated
@ -29,22 +28,12 @@ import org.springframework.context.annotation.Configuration;
* model representations of all annotations and attributes. It is better to simply attach * model representations of all annotations and attributes. It is better to simply attach
* annotation instances and read them as needed. * annotation instances and read them as needed.
* *
* <p>Note: the visibility of this interface would be reduced to package-private save for an
* obscure restriction of JDK dynamic proxies.
* {@link AsmUtils#createMutableAnnotation} creates a proxy based on
* two interfaces: this one, and whatever annotation is currently being parsed. The
* restriction is that both interfaces may not be package-private if they are in separate
* packages. In order to avoid unnecessarily restricting the visibility options for
* user-defined annotations, this interface becomes public. Developers should take caution
* not to use this annotation outside this package.
*
* @author Chris Beams * @author Chris Beams
* @since 3.0
* @see MutableAnnotationVisitor * @see MutableAnnotationVisitor
* @see MutableAnnotationInvocationHandler * @see MutableAnnotationInvocationHandler
* @see AsmUtils#createMutableAnnotation * @see AsmUtils#createMutableAnnotation
*/ */
public interface MutableAnnotation { interface MutableAnnotation {
void setAttributeValue(String attribName, Object attribValue); void setAttributeValue(String attribName, Object attribValue);

4
org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationArrayVisitor.java

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Array; import java.lang.reflect.Array;

2
org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java → org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationInvocationHandler.java

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.springframework.core.annotation.AnnotationUtils.*; import static org.springframework.core.annotation.AnnotationUtils.*;

4
org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java → org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationVisitor.java

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*; import static org.springframework.context.annotation.AsmUtils.*;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Field; import java.lang.reflect.Field;

25
org.springframework.context/src/main/java/org/springframework/context/annotation/support/package-info.java

@ -1,25 +0,0 @@
/*
* Copyright 2002-2009 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.
*/
/**
* Supporting infrastructure for
* {@link org.springframework.context.annotation.Configuration} class processing.
*
* @author Chris Beams
* @see ConfigurationClassPostProcessor
* @see ConfigurationParser
*/
package org.springframework.context.annotation.support;

4
org.springframework.context/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java

@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ConfigurationParser;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.support.ConfigurationParser;
import test.beans.TestBean; import test.beans.TestBean;

4
org.springframework.context/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import org.springframework.beans.factory.parsing.FailFastProblemReporter; import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.context.annotation.ConfigurationParser;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.support.ConfigurationParser;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

7
org.springframework.context/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodTests.java

@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.context.annotation.ScopedProxyMode.*; import static org.springframework.context.annotation.ScopedProxyMode.*;
import static org.springframework.context.annotation.StandardScopes.*; import static org.springframework.context.annotation.StandardScopes.*;
import static org.springframework.context.annotation.support.AsmUtils.*;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
@ -29,6 +29,9 @@ import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.beans.factory.parsing.Location; import org.springframework.beans.factory.parsing.Location;
import org.springframework.beans.factory.parsing.ProblemReporter; import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.BeanMethod;
import org.springframework.context.annotation.ConfigurationClass;
import org.springframework.context.annotation.ModelClass;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

6
org.springframework.context/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationModelTests.java

@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static java.lang.String.*; import static java.lang.String.*;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.context.annotation.support.ConfigurationClass; import org.springframework.context.annotation.ConfigurationClass;
import org.springframework.context.annotation.support.ConfigurationModel; import org.springframework.context.annotation.ConfigurationModel;
/** /**

3
org.springframework.context/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationPostProcessorTests.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -27,6 +27,7 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

4
org.springframework.context/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.context.annotation.support; package org.springframework.context.annotation;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*; import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
@ -23,7 +23,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor; import org.springframework.context.annotation.ConfigurationClassPostProcessor;
/** /**

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java

@ -24,7 +24,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor; import org.springframework.context.annotation.ConfigurationClassPostProcessor;
/** /**

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java

@ -10,7 +10,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor; import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java

@ -13,9 +13,9 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.StandardScopes; import org.springframework.context.annotation.StandardScopes;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import test.beans.ITestBean; import test.beans.ITestBean;
import test.beans.TestBean; import test.beans.TestBean;

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java

@ -24,8 +24,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import test.beans.ITestBean; import test.beans.ITestBean;
import test.beans.TestBean; import test.beans.TestBean;

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java

@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor; import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import test.beans.TestBean; import test.beans.TestBean;

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java

@ -31,10 +31,10 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.context.annotation.StandardScopes; import org.springframework.context.annotation.StandardScopes;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import test.beans.ITestBean; import test.beans.ITestBean;

2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java

@ -21,6 +21,6 @@
* @author Chris Beams * @author Chris Beams
* @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Configuration
* @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Bean
* @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor * @see org.springframework.context.annotation.ConfigurationClassPostProcessor
*/ */
package org.springframework.context.annotation.configuration; package org.springframework.context.annotation.configuration;
Loading…
Cancel
Save