consolidated context.annotation.support -> context.annotation

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
  * limitations under the License.
  */
-package org.springframework.context.annotation.support;
+package org.springframework.context.annotation;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ConfigurationParser;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.support.ConfigurationParser;
 
 import test.beans.TestBean;
 

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
  * 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.context.annotation.ConfigurationParser;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.support.ConfigurationParser;
 import org.springframework.util.ClassUtils;
 
 

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
  * limitations under the License.
  */
-package org.springframework.context.annotation.support;
+package org.springframework.context.annotation;
 
 import static org.hamcrest.CoreMatchers.*;
 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.StandardScopes.*;
-import static org.springframework.context.annotation.support.AsmUtils.*;
 
 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.ProblemReporter;
 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.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;

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
  * limitations under the License.
  */
-package org.springframework.context.annotation.support;
+package org.springframework.context.annotation;
 
 import static java.lang.String.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.context.annotation.support.ConfigurationClass;
-import org.springframework.context.annotation.support.ConfigurationModel;
+import org.springframework.context.annotation.ConfigurationClass;
+import org.springframework.context.annotation.ConfigurationModel;
 
 
 /**

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
  * limitations under the License.
  */
-package org.springframework.context.annotation.support;
+package org.springframework.context.annotation;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 import org.springframework.util.ClassUtils;
 
 

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
  * limitations under the License.
  */
-package org.springframework.context.annotation.support;
+package org.springframework.context.annotation;
 
 import static org.junit.Assert.*;
 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.support.DefaultListableBeanFactory;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 
 
 /**

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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 
 
 /**

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.context.annotation.Bean;
 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.core.io.ClassPathResource;
 

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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.StandardScopes;
-import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;

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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;

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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 
 import test.beans.TestBean;
 

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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.context.annotation.StandardScopes;
-import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.context.support.GenericApplicationContext;
 
 import test.beans.ITestBean;

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

@@ -21,6 +21,6 @@
  * @author Chris Beams
  * @see org.springframework.context.annotation.Configuration
  * @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;