diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsIndexer.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java similarity index 98% rename from spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsIndexer.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java index 6a7e1e0ddca..210fbe30d9f 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsIndexer.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsMetadata.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsMetadata.java similarity index 91% rename from spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsMetadata.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsMetadata.java index 4c7361cd0fb..8becf0f64a3 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsMetadata.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/IndexedStereotypesProvider.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/IndexedStereotypesProvider.java similarity index 97% rename from spring-context-indexer/src/main/java/org/springframework/context/index/IndexedStereotypesProvider.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/IndexedStereotypesProvider.java index 96d064083c4..92712ba07d4 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/IndexedStereotypesProvider.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/IndexedStereotypesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.HashSet; import java.util.LinkedHashSet; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/ItemMetadata.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/ItemMetadata.java similarity index 92% rename from spring-context-indexer/src/main/java/org/springframework/context/index/ItemMetadata.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/ItemMetadata.java index fdf7cbf11ef..494e63a2a76 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/ItemMetadata.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/ItemMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.HashSet; import java.util.Set; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataCollector.java similarity index 98% rename from spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataCollector.java index 9072a12f40c..a4e69af1f8f 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataCollector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.ArrayList; import java.util.HashSet; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataStore.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java similarity index 95% rename from spring-context-indexer/src/main/java/org/springframework/context/index/MetadataStore.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java index 4600ef9c64d..872f7a27660 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataStore.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.io.IOException; import java.io.InputStream; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/PackageInfoStereotypesProvider.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/PackageInfoStereotypesProvider.java similarity index 91% rename from spring-context-indexer/src/main/java/org/springframework/context/index/PackageInfoStereotypesProvider.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/PackageInfoStereotypesProvider.java index d56e0ac3af1..62a789e3f36 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/PackageInfoStereotypesProvider.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/PackageInfoStereotypesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.HashSet; import java.util.Set; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/PropertiesMarshaller.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/PropertiesMarshaller.java similarity index 93% rename from spring-context-indexer/src/main/java/org/springframework/context/index/PropertiesMarshaller.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/PropertiesMarshaller.java index 7505963cd5f..701eccc01e8 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/PropertiesMarshaller.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/PropertiesMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.io.IOException; import java.io.InputStream; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/StandardStereotypesProvider.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java similarity index 93% rename from spring-context-indexer/src/main/java/org/springframework/context/index/StandardStereotypesProvider.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java index b00119d1402..e7480cce6de 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/StandardStereotypesProvider.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.LinkedHashSet; import java.util.Set; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/StereotypesProvider.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StereotypesProvider.java similarity index 91% rename from spring-context-indexer/src/main/java/org/springframework/context/index/StereotypesProvider.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/StereotypesProvider.java index 41375fca6d6..a79568bdd39 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/StereotypesProvider.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StereotypesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.Set; import javax.lang.model.element.Element; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/TypeHelper.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java similarity index 98% rename from spring-context-indexer/src/main/java/org/springframework/context/index/TypeHelper.java rename to spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java index e4af2fc167a..8026d86a07a 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/TypeHelper.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.ArrayList; import java.util.List; diff --git a/spring-context-indexer/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/spring-context-indexer/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 99504ebd318..f928b8d0c7b 100644 --- a/spring-context-indexer/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/spring-context-indexer/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1 +1 @@ -org.springframework.context.index.CandidateComponentsIndexer \ No newline at end of file +org.springframework.context.index.processor.CandidateComponentsIndexer \ No newline at end of file diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/CandidateComponentsIndexerTests.java b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java similarity index 98% rename from spring-context-indexer/src/test/java/org/springframework/context/index/CandidateComponentsIndexerTests.java rename to spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java index cac34ee00b5..2d45a60710f 100644 --- a/spring-context-indexer/src/test/java/org/springframework/context/index/CandidateComponentsIndexerTests.java +++ b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.io.File; import java.io.FileInputStream; @@ -61,7 +61,7 @@ import org.springframework.util.ClassUtils; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.springframework.context.index.Metadata.*; +import static org.springframework.context.index.processor.Metadata.*; /** * Tests for {@link CandidateComponentsIndexer}. diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/Metadata.java b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/Metadata.java similarity index 96% rename from spring-context-indexer/src/test/java/org/springframework/context/index/Metadata.java rename to spring-context-indexer/src/test/java/org/springframework/context/index/processor/Metadata.java index ba6d5919e3c..719740066cb 100644 --- a/spring-context-indexer/src/test/java/org/springframework/context/index/Metadata.java +++ b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/Metadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.util.Arrays; import java.util.List; diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/PropertiesMarshallerTests.java b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/PropertiesMarshallerTests.java similarity index 90% rename from spring-context-indexer/src/test/java/org/springframework/context/index/PropertiesMarshallerTests.java rename to spring-context-indexer/src/test/java/org/springframework/context/index/processor/PropertiesMarshallerTests.java index 80826ec015b..6fc2222644e 100644 --- a/spring-context-indexer/src/test/java/org/springframework/context/index/PropertiesMarshallerTests.java +++ b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/PropertiesMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.index; +package org.springframework.context.index.processor; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,7 +26,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.springframework.context.index.Metadata.*; +import static org.springframework.context.index.processor.Metadata.*; /** * Tests for {@link PropertiesMarshaller}.