From 5c3488690715ce50cb6366ee147b188cfdf6757f Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 12 Jan 2023 16:23:14 +0100 Subject: [PATCH] =?UTF-8?q?GH-114=20-=20Rename=20=E2=80=A6.modulith.model?= =?UTF-8?q?=20to=20=E2=80=A6.modulith.core.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actuator/ApplicationModulesEndpoint.java | 8 ++++---- .../AnnotationModulithMetadata.java | 2 +- .../{model => core}/ApplicationModule.java | 14 +++++++------- .../ApplicationModuleDependencies.java | 2 +- .../ApplicationModuleDependency.java | 2 +- .../ApplicationModuleDetectionStrategies.java | 4 ++-- .../ApplicationModuleDetectionStrategy.java | 2 +- .../ApplicationModuleInformation.java | 2 +- .../{model => core}/ApplicationModules.java | 4 ++-- .../ArchitecturallyEvidentType.java | 10 +++++----- .../modulith/{model => core}/Classes.java | 2 +- .../DefaultModulithMetadata.java | 4 ++-- .../{model => core}/DependencyDepth.java | 2 +- .../{model => core}/DependencyType.java | 6 +++--- .../modulith/{model => core}/EventType.java | 2 +- .../{model => core}/FormatableType.java | 2 +- .../{model => core}/JavaAccessSource.java | 2 +- .../modulith/{model => core}/JavaPackage.java | 2 +- .../{model => core}/ModulithMetadata.java | 4 ++-- .../{model => core}/NamedInterface.java | 2 +- .../{model => core}/NamedInterfaces.java | 4 ++-- .../modulith/{model => core}/Source.java | 2 +- .../modulith/{model => core}/SpringBean.java | 2 +- .../modulith/{model => core}/Types.java | 2 +- .../modulith/{model => core}/Violations.java | 2 +- .../modulith/{model => core}/package-info.java | 2 +- .../AnnotationModulithMetadataUnitTest.java | 3 ++- .../ArchitecturallyEvidentTypeUnitTest.java | 8 ++++---- .../ModuleDependencyUnitTest.java | 6 ++++-- .../ModuleDetectionStrategyUnitTest.java | 6 +++++- .../{model => core}/ModuleUnitTest.java | 7 ++++++- .../ModulithMetadataUnitTest.java | 3 ++- .../modulith/{model => core}/TestUtils.java | 4 +++- .../{model => core}/ViolationsUnitTests.java | 3 ++- .../modulith/docs/Asciidoctor.java | 18 +++++++++--------- .../modulith/docs/ConfigurationProperties.java | 2 +- .../modulith/docs/Documenter.java | 12 ++++++------ .../modulith/docs/AsciidoctorUnitTests.java | 2 +- .../main/java/example/order/package-info.java | 2 +- .../src/test/java/example/ModularityTests.java | 2 +- .../java/com/acme/myproject/ModulithTest.java | 12 ++++++------ .../acme/myproject/complex/ComplexTest.java | 2 +- .../FieldInjectedIntegrationTest.java | 2 +- .../ApplicationModulesIntegrationTest.java | 8 +++++++- .../{model => core}/JavaPackageUnitTests.java | 4 +++- .../TestModuleDetectionStrategy.java | 5 ++++- .../modulith/docs/DocumenterTest.java | 4 ++-- .../modulith/docs/DocumenterUnitTests.java | 4 ++-- .../test/resources/META-INF/spring.factories | 4 ++-- .../observability/DefaultObservedModule.java | 8 ++++---- .../ModuleTracingBeanPostProcessor.java | 2 +- .../modulith/observability/ObservedModule.java | 4 ++-- .../observability/ObservedModuleType.java | 6 +++--- ...DataRestModuleTracingBeanPostProcessor.java | 4 ++-- .../ObservedModuleTypeUnitTests.java | 6 +++--- .../runtime/ApplicationModulesRuntime.java | 2 +- ...SpringModulithRuntimeAutoConfiguration.java | 6 +++--- .../runtime/autoconfigure/package-info.java | 2 +- .../modulith/runtime/package-info.java | 2 +- .../modulith/test/ApplicationModuleTest.java | 2 +- .../test/ModuleContextCustomizerFactory.java | 2 +- .../modulith/test/ModuleTestExecution.java | 6 +++--- .../modulith/test/TestApplicationModules.java | 4 ++-- .../modulith/test/package-info.java | 2 +- 64 files changed, 150 insertions(+), 123 deletions(-) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/AnnotationModulithMetadata.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModule.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModuleDependencies.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModuleDependency.java (96%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModuleDetectionStrategies.java (94%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModuleDetectionStrategy.java (97%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModuleInformation.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ApplicationModules.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ArchitecturallyEvidentType.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/Classes.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/DefaultModulithMetadata.java (97%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/DependencyDepth.java (93%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/DependencyType.java (96%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/EventType.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/FormatableType.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/JavaAccessSource.java (97%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/JavaPackage.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/ModulithMetadata.java (97%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/NamedInterface.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/NamedInterfaces.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/Source.java (95%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/SpringBean.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/Types.java (99%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/Violations.java (98%) rename spring-modulith-core/src/main/java/org/springframework/modulith/{model => core}/package-info.java (68%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/AnnotationModulithMetadataUnitTest.java (93%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/ArchitecturallyEvidentTypeUnitTest.java (95%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/ModuleDependencyUnitTest.java (91%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/ModuleDetectionStrategyUnitTest.java (85%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/ModuleUnitTest.java (88%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/ModulithMetadataUnitTest.java (96%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/TestUtils.java (93%) rename spring-modulith-core/src/test/java/org/springframework/modulith/{model => core}/ViolationsUnitTests.java (91%) rename spring-modulith-integration-test/src/test/java/org/springframework/modulith/{model => core}/ApplicationModulesIntegrationTest.java (93%) rename spring-modulith-integration-test/src/test/java/org/springframework/modulith/{model => core}/JavaPackageUnitTests.java (90%) rename spring-modulith-integration-test/src/test/java/org/springframework/modulith/{model => core}/TestModuleDetectionStrategy.java (87%) diff --git a/spring-modulith-actuator/src/main/java/org/springframework/modulith/actuator/ApplicationModulesEndpoint.java b/spring-modulith-actuator/src/main/java/org/springframework/modulith/actuator/ApplicationModulesEndpoint.java index 3db4d856..d44acdc8 100644 --- a/spring-modulith-actuator/src/main/java/org/springframework/modulith/actuator/ApplicationModulesEndpoint.java +++ b/spring-modulith-actuator/src/main/java/org/springframework/modulith/actuator/ApplicationModulesEndpoint.java @@ -30,10 +30,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModuleDependency; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.DependencyType; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModuleDependency; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.DependencyType; import org.springframework.util.Assert; /** diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/AnnotationModulithMetadata.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/AnnotationModulithMetadata.java index 5174d880..1760b055 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/AnnotationModulithMetadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.Arrays; import java.util.List; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModule.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModule.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModule.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModule.java index fc7ee02f..720fa58c 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModule.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModule.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static com.tngtech.archunit.base.DescribedPredicate.*; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*; import static java.lang.System.*; -import static org.springframework.modulith.model.Types.*; -import static org.springframework.modulith.model.Types.JavaXTypes.*; -import static org.springframework.modulith.model.Types.SpringDataTypes.*; -import static org.springframework.modulith.model.Types.SpringTypes.*; +import static org.springframework.modulith.core.Types.*; +import static org.springframework.modulith.core.Types.JavaXTypes.*; +import static org.springframework.modulith.core.Types.SpringDataTypes.*; +import static org.springframework.modulith.core.Types.SpringTypes.*; import java.util.Arrays; import java.util.Collections; @@ -34,8 +34,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.springframework.lang.Nullable; -import org.springframework.modulith.model.Types.JMoleculesTypes; -import org.springframework.modulith.model.Types.SpringTypes; +import org.springframework.modulith.core.Types.JMoleculesTypes; +import org.springframework.modulith.core.Types.SpringTypes; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDependencies.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDependencies.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDependencies.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDependencies.java index ffc3a98b..de53fdbb 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDependencies.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDependencies.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.HashSet; import java.util.List; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDependency.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDependency.java similarity index 96% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDependency.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDependency.java index 1a7633ab..b4f6e45f 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDependency.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDependency.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import com.tngtech.archunit.core.domain.JavaClass; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDetectionStrategies.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDetectionStrategies.java similarity index 94% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDetectionStrategies.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDetectionStrategies.java index bfb6aba2..0960f57e 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDetectionStrategies.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDetectionStrategies.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.Objects; import java.util.stream.Stream; import org.springframework.modulith.ApplicationModule; -import org.springframework.modulith.model.Types.JMoleculesTypes; +import org.springframework.modulith.core.Types.JMoleculesTypes; /** * Default implementations of {@link ApplicationModuleDetectionStrategy}. diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDetectionStrategy.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDetectionStrategy.java similarity index 97% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDetectionStrategy.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDetectionStrategy.java index c883ed06..37be26d6 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleDetectionStrategy.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleDetectionStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.stream.Stream; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleInformation.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleInformation.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleInformation.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleInformation.java index 53e93586..6175d85e 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleInformation.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModuleInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.Arrays; import java.util.Collections; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModules.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModules.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModules.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModules.java index 07d2251b..6034a2f8 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModules.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ApplicationModules.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static com.tngtech.archunit.base.DescribedPredicate.*; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*; @@ -37,7 +37,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.lang.Nullable; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; -import org.springframework.modulith.model.Types.JMoleculesTypes; +import org.springframework.modulith.core.Types.JMoleculesTypes; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ArchitecturallyEvidentType.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ArchitecturallyEvidentType.java index 43e999df..2c1a6e1c 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ArchitecturallyEvidentType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; -import static org.springframework.modulith.model.Types.JavaXTypes.*; +import static org.springframework.modulith.core.Types.JavaXTypes.*; import java.util.ArrayList; import java.util.Collection; @@ -31,9 +31,9 @@ import java.util.stream.Stream; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.AbstractRepositoryMetadata; -import org.springframework.modulith.model.Types.JMoleculesTypes; -import org.springframework.modulith.model.Types.SpringDataTypes; -import org.springframework.modulith.model.Types.SpringTypes; +import org.springframework.modulith.core.Types.JMoleculesTypes; +import org.springframework.modulith.core.Types.SpringDataTypes; +import org.springframework.modulith.core.Types.SpringTypes; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.domain.JavaMethod; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Classes.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/Classes.java index 9f3597f8..b1cb8b66 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Classes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/DefaultModulithMetadata.java similarity index 97% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/DefaultModulithMetadata.java index 10502671..6bcaf96b 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/DefaultModulithMetadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.lang.annotation.Annotation; import java.util.Collections; @@ -25,7 +25,7 @@ import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.lang.NonNull; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; -import org.springframework.modulith.model.Types.SpringTypes; +import org.springframework.modulith.core.Types.SpringTypes; import org.springframework.util.Assert; /** diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DependencyDepth.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/DependencyDepth.java similarity index 93% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/DependencyDepth.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/DependencyDepth.java index 7bd9476f..cda7c5ab 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DependencyDepth.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/DependencyDepth.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; public enum DependencyDepth { diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DependencyType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/DependencyType.java similarity index 96% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/DependencyType.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/DependencyType.java index 514df37a..7b0e4ec4 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DependencyType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/DependencyType.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.Arrays; import java.util.Collection; import java.util.function.Predicate; import java.util.stream.Stream; -import org.springframework.modulith.model.Types.JMoleculesTypes; -import org.springframework.modulith.model.Types.SpringTypes; +import org.springframework.modulith.core.Types.JMoleculesTypes; +import org.springframework.modulith.core.Types.SpringTypes; import org.springframework.util.Assert; import com.tngtech.archunit.core.domain.Dependency; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/EventType.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/EventType.java index 314c1f6a..1171b705 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/EventType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.List; import java.util.Objects; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/FormatableType.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableType.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/FormatableType.java index d167ef33..765ca6be 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/FormatableType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/JavaAccessSource.java similarity index 97% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/JavaAccessSource.java index 5679e5c9..f425c586 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/JavaAccessSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/JavaPackage.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/JavaPackage.java index b8fa4f9f..03708dc8 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/JavaPackage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ModulithMetadata.java similarity index 97% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/ModulithMetadata.java index 6b2fdf02..00043b30 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/ModulithMetadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.List; import java.util.Optional; @@ -22,7 +22,7 @@ import java.util.stream.Stream; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; -import org.springframework.modulith.model.Types.SpringTypes; +import org.springframework.modulith.core.Types.SpringTypes; import org.springframework.util.Assert; public interface ModulithMetadata { diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java index 45677ecf..37ac57a4 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.Arrays; import java.util.Iterator; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java index 2aaa0887..f644e869 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.ArrayList; import java.util.Collections; @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.modulith.model.NamedInterface.TypeBasedNamedInterface; +import org.springframework.modulith.core.NamedInterface.TypeBasedNamedInterface; import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Source.java similarity index 95% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/Source.java index 71a975de..ec726744 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Source.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; /** * A {@link Source} of some type, bean definition etc. Essentially describes the origin of that bean, event etc. diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/SpringBean.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/SpringBean.java index fb9cb3c5..fd361ef9 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/SpringBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.List; import java.util.Objects; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Types.java similarity index 99% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/Types.java index ae88b49e..f6b18c93 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Types.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Violations.java similarity index 98% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/Violations.java index 11a7429a..92aa32db 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/Violations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java b/spring-modulith-core/src/main/java/org/springframework/modulith/core/package-info.java similarity index 68% rename from spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/core/package-info.java index 74187e07..b9eca324 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/core/package-info.java @@ -2,4 +2,4 @@ * Core, internal abstractions of Spring Modulith. */ @org.springframework.lang.NonNullApi -package org.springframework.modulith.model; +package org.springframework.modulith.core; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/AnnotationModulithMetadataUnitTest.java similarity index 93% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/AnnotationModulithMetadataUnitTest.java index 596ab250..2b9547a1 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/AnnotationModulithMetadataUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; @@ -22,6 +22,7 @@ import java.lang.annotation.RetentionPolicy; import org.junit.jupiter.api.Test; import org.springframework.modulith.Modulithic; +import org.springframework.modulith.core.AnnotationModulithMetadata; /** * Unit tests for {@link AnnotationModulithMetadata}. diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ArchitecturallyEvidentTypeUnitTest.java similarity index 95% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/ArchitecturallyEvidentTypeUnitTest.java index 51ec79ff..9c8b57c3 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ArchitecturallyEvidentTypeUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; @@ -33,8 +33,8 @@ import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.event.EventListener; import org.springframework.data.repository.CrudRepository; -import org.springframework.modulith.model.ArchitecturallyEvidentType.SpringAwareArchitecturallyEvidentType; -import org.springframework.modulith.model.ArchitecturallyEvidentType.SpringDataAwareArchitecturallyEvidentType; +import org.springframework.modulith.core.ArchitecturallyEvidentType.SpringAwareArchitecturallyEvidentType; +import org.springframework.modulith.core.ArchitecturallyEvidentType.SpringDataAwareArchitecturallyEvidentType; import org.springframework.stereotype.Repository; import com.tngtech.archunit.core.domain.JavaClass; @@ -54,7 +54,7 @@ class ArchitecturallyEvidentTypeUnitTest { ArchitecturallyEvidentType type = ArchitecturallyEvidentType.of(self, classes); - assertThat(type.getAbbreviatedFullName()).isEqualTo("o.s.m.m.ArchitecturallyEvidentTypeUnitTest"); + assertThat(type.getAbbreviatedFullName()).isEqualTo("o.s.m.c.ArchitecturallyEvidentTypeUnitTest"); } @Test diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java similarity index 91% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java index adef75da..d2b7a7a0 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; @@ -21,7 +21,9 @@ import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.modulith.model.ApplicationModule.QualifiedDependency; +import org.springframework.modulith.core.ArchitecturallyEvidentType; +import org.springframework.modulith.core.Classes; +import org.springframework.modulith.core.ApplicationModule.QualifiedDependency; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.importer.ClassFileImporter; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java similarity index 85% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java index cb8e83a0..1e16a836 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.ApplicationModuleDetectionStrategies; +import org.springframework.modulith.core.ApplicationModuleDetectionStrategy; +import org.springframework.modulith.core.Classes; +import org.springframework.modulith.core.JavaPackage; import com.tngtech.archunit.core.importer.ClassFileImporter; import com.tngtech.archunit.core.importer.ImportOption; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java similarity index 88% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java index 4c358350..65d70f7a 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; @@ -24,6 +24,11 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.Classes; +import org.springframework.modulith.core.EventType; +import org.springframework.modulith.core.JavaPackage; +import org.springframework.modulith.core.SpringBean; import com.acme.withatbean.TestEvents.JMoleculesAnnotated; import com.acme.withatbean.TestEvents.JMoleculesImplementing; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModulithMetadataUnitTest.java similarity index 96% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/ModulithMetadataUnitTest.java index 03efe96e..175cd33e 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModulithMetadataUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; +import org.springframework.modulith.core.ModulithMetadata; /** * Unit tests for {@link ModulithMetadata}. diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java similarity index 93% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java index a80a885e..0bbed474 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*; import org.jmolecules.ddd.annotation.AggregateRoot; import org.springframework.data.repository.Repository; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.Classes; import org.springframework.util.Assert; import com.tngtech.archunit.base.DescribedPredicate; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java similarity index 91% rename from spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java index 4f9b38e4..fa8e9fa9 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.Violations; /** * Unit tests for {@link Violations}. diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java index f1ab6737..34155d90 100644 --- a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java @@ -25,17 +25,17 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.springframework.lang.Nullable; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModuleDependency; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.ArchitecturallyEvidentType; +import org.springframework.modulith.core.DependencyType; +import org.springframework.modulith.core.EventType; +import org.springframework.modulith.core.FormatableType; +import org.springframework.modulith.core.Source; +import org.springframework.modulith.core.SpringBean; import org.springframework.modulith.docs.ConfigurationProperties.ModuleProperty; import org.springframework.modulith.docs.Documenter.CanvasOptions; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModuleDependency; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.ArchitecturallyEvidentType; -import org.springframework.modulith.model.DependencyType; -import org.springframework.modulith.model.EventType; -import org.springframework.modulith.model.FormatableType; -import org.springframework.modulith.model.Source; -import org.springframework.modulith.model.SpringBean; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java index 1ae9587a..fe35a084 100644 --- a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java @@ -26,8 +26,8 @@ import java.util.stream.Stream; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.lang.Nullable; +import org.springframework.modulith.core.ApplicationModule; import org.springframework.modulith.docs.ConfigurationProperties.ConfigurationProperty; -import org.springframework.modulith.model.ApplicationModule; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java index 2066bdf3..7633210c 100644 --- a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java @@ -36,12 +36,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.springframework.lang.Nullable; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModuleDependency; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.DependencyDepth; -import org.springframework.modulith.model.DependencyType; -import org.springframework.modulith.model.SpringBean; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModuleDependency; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.DependencyDepth; +import org.springframework.modulith.core.DependencyType; +import org.springframework.modulith.core.SpringBean; import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java index eb968e87..c5f879f6 100644 --- a/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java +++ b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; -import org.springframework.modulith.model.ApplicationModules; +import org.springframework.modulith.core.ApplicationModules; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.importer.ClassFileImporter; diff --git a/spring-modulith-example/src/main/java/example/order/package-info.java b/spring-modulith-example/src/main/java/example/order/package-info.java index 69be6a96..9cd4120e 100644 --- a/spring-modulith-example/src/main/java/example/order/package-info.java +++ b/spring-modulith-example/src/main/java/example/order/package-info.java @@ -1,6 +1,6 @@ /** * The logical application module order implemented as a multi-package module. Internal components located in nested - * packages are prevented from being accessed by the {@link org.springframework.modulith.model.ApplicationModules} type. + * packages are prevented from being accessed by the {@link org.springframework.modulith.core.ApplicationModules} type. * * @see example.ModularityTests */ diff --git a/spring-modulith-example/src/test/java/example/ModularityTests.java b/spring-modulith-example/src/test/java/example/ModularityTests.java index f0dc43f3..e8d261f9 100644 --- a/spring-modulith-example/src/test/java/example/ModularityTests.java +++ b/spring-modulith-example/src/test/java/example/ModularityTests.java @@ -16,8 +16,8 @@ package example; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.ApplicationModules; import org.springframework.modulith.docs.Documenter; -import org.springframework.modulith.model.ApplicationModules; /** * Tests to verify the modular structure and generate documentation for the modules. diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java index 0788a65c..9b26de81 100644 --- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java +++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java @@ -18,12 +18,12 @@ package com.acme.myproject; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModuleDependencies; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.ApplicationModules.Filters; -import org.springframework.modulith.model.DependencyType; -import org.springframework.modulith.model.Violations; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModuleDependencies; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.DependencyType; +import org.springframework.modulith.core.Violations; +import org.springframework.modulith.core.ApplicationModules.Filters; import com.acme.myproject.invalid.InvalidComponent; import com.acme.myproject.moduleB.internal.InternalComponentB; diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/complex/ComplexTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/complex/ComplexTest.java index a36534fc..88e25e00 100644 --- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/complex/ComplexTest.java +++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/complex/ComplexTest.java @@ -21,7 +21,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.modulith.model.NamedInterface; +import org.springframework.modulith.core.NamedInterface; import org.springframework.modulith.test.ModuleTestExecution; import com.acme.myproject.NonVerifyingModuleTest; diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java index beff4832..e6e0c45a 100644 --- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java +++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.modulith.model.ApplicationModules; +import org.springframework.modulith.core.ApplicationModules; import org.springframework.modulith.test.ModuleTestExecution; import com.acme.myproject.NonVerifyingModuleTest; diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ApplicationModulesIntegrationTest.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java similarity index 93% rename from spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ApplicationModulesIntegrationTest.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java index cc989503..ceeccc84 100644 --- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ApplicationModulesIntegrationTest.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; @@ -23,6 +23,12 @@ import java.util.Optional; import java.util.stream.Stream; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.DependencyType; +import org.springframework.modulith.core.NamedInterface; +import org.springframework.modulith.core.NamedInterfaces; +import org.springframework.modulith.core.Violations; import com.acme.myproject.Application; import com.acme.myproject.complex.internal.FirstTypeBasedPort; diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/JavaPackageUnitTests.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java similarity index 90% rename from spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/JavaPackageUnitTests.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java index dc6fa2f9..39fc9908 100644 --- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/JavaPackageUnitTests.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.Classes; +import org.springframework.modulith.core.JavaPackage; import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.core.importer.ClassFileImporter; diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java similarity index 87% rename from spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java index fc63c46a..177e3ec7 100644 --- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.model; +package org.springframework.modulith.core; import java.util.stream.Stream; +import org.springframework.modulith.core.ApplicationModuleDetectionStrategy; +import org.springframework.modulith.core.JavaPackage; + /** * @author Oliver Drotbohm */ diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterTest.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterTest.java index 80fbba3e..992d0461 100644 --- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterTest.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterTest.java @@ -26,9 +26,9 @@ import java.util.Comparator; import java.util.Optional; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.DependencyType; import org.springframework.modulith.docs.Documenter.DiagramOptions; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.DependencyType; import com.acme.myproject.Application; diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java index 15ae5cba..6afded17 100644 --- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java @@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.SpringBean; import org.springframework.modulith.docs.Documenter.CanvasOptions; import org.springframework.modulith.docs.Documenter.CanvasOptions.Grouping; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.SpringBean; import com.acme.myproject.Application; import com.acme.myproject.stereotypes.Stereotypes; diff --git a/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories b/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories index a387920f..cef9ec8a 100644 --- a/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories +++ b/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.modulith.model.ApplicationModuleDetectionStrategy=\ - org.springframework.modulith.model.TestModuleDetectionStrategy +org.springframework.modulith.core.ApplicationModuleDetectionStrategy=\ + org.springframework.modulith.core.TestModuleDetectionStrategy diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java index 4bedc5ae..c83f0a7c 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java @@ -21,10 +21,10 @@ import java.util.Arrays; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.ProxyMethodInvocation; import org.springframework.aop.framework.Advised; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.FormatableType; -import org.springframework.modulith.model.SpringBean; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.FormatableType; +import org.springframework.modulith.core.SpringBean; import org.springframework.util.Assert; import com.tngtech.archunit.core.domain.JavaClass; diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java index 7323d7ae..af18d481 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java @@ -28,7 +28,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.StaticMethodMatcher; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.modulith.model.ApplicationModules; +import org.springframework.modulith.core.ApplicationModules; import org.springframework.modulith.runtime.ApplicationModulesRuntime; import org.springframework.util.Assert; diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java index e31daae2..cea9e618 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java @@ -19,8 +19,8 @@ import java.lang.reflect.Method; import org.aopalliance.intercept.MethodInvocation; import org.springframework.lang.Nullable; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModules; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; import com.tngtech.archunit.core.domain.JavaClass; diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java index 8d7888bf..472c6d8c 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java @@ -23,9 +23,9 @@ import java.util.stream.Stream; import org.springframework.aop.TargetClassAware; import org.springframework.aop.framework.Advised; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.ArchitecturallyEvidentType; -import org.springframework.modulith.model.ArchitecturallyEvidentType.ReferenceMethod; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.ArchitecturallyEvidentType; +import org.springframework.modulith.core.ArchitecturallyEvidentType.ReferenceMethod; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java index 356d5fd1..39c06b6f 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java @@ -29,8 +29,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.data.rest.webmvc.BasePathAwareController; import org.springframework.data.rest.webmvc.RootResourceInformation; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModules; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; import org.springframework.modulith.runtime.ApplicationModulesRuntime; import org.springframework.util.Assert; diff --git a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ObservedModuleTypeUnitTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ObservedModuleTypeUnitTests.java index 534425d2..6ba4fa4f 100644 --- a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ObservedModuleTypeUnitTests.java +++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ObservedModuleTypeUnitTests.java @@ -21,9 +21,9 @@ import example.sample.SampleComponent; import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.ArchitecturallyEvidentType; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.ArchitecturallyEvidentType; import org.springframework.modulith.test.TestApplicationModules; import org.springframework.util.ReflectionUtils; diff --git a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/ApplicationModulesRuntime.java b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/ApplicationModulesRuntime.java index cf2bc215..448e7cf7 100644 --- a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/ApplicationModulesRuntime.java +++ b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/ApplicationModulesRuntime.java @@ -17,7 +17,7 @@ package org.springframework.modulith.runtime; import java.util.function.Supplier; -import org.springframework.modulith.model.ApplicationModules; +import org.springframework.modulith.core.ApplicationModules; import org.springframework.util.Assert; /** diff --git a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/SpringModulithRuntimeAutoConfiguration.java b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/SpringModulithRuntimeAutoConfiguration.java index 207ee91f..f7706350 100644 --- a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/SpringModulithRuntimeAutoConfiguration.java +++ b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/SpringModulithRuntimeAutoConfiguration.java @@ -32,9 +32,9 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Role; import org.springframework.modulith.ApplicationModuleInitializer; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.FormatableType; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.FormatableType; import org.springframework.modulith.runtime.ApplicationModulesRuntime; import org.springframework.modulith.runtime.ApplicationRuntime; import org.springframework.util.Assert; diff --git a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/package-info.java b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/package-info.java index a8c83482..a118e8bb 100644 --- a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/package-info.java +++ b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/autoconfigure/package-info.java @@ -1,5 +1,5 @@ /** - * Autoconfiguration the {@link org.springframework.modulith.model.ApplicationModules} runtime support. + * Autoconfiguration the {@link org.springframework.modulith.core.ApplicationModules} runtime support. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.runtime.autoconfigure; diff --git a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/package-info.java b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/package-info.java index a27f2429..aef0b465 100644 --- a/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/package-info.java +++ b/spring-modulith-runtime/src/main/java/org/springframework/modulith/runtime/package-info.java @@ -1,5 +1,5 @@ /** - * Support to run {@link org.springframework.modulith.model.ApplicationModules} at application runtime. + * Support to run {@link org.springframework.modulith.core.ApplicationModules} at application runtime. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.runtime; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ApplicationModuleTest.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ApplicationModuleTest.java index 9b42bd9c..985596e1 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ApplicationModuleTest.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ApplicationModuleTest.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTestContextBootstrapper; import org.springframework.core.annotation.AliasFor; -import org.springframework.modulith.model.DependencyDepth; +import org.springframework.modulith.core.DependencyDepth; import org.springframework.test.context.BootstrapWith; import org.springframework.test.context.TestConstructor; import org.springframework.test.context.TestConstructor.AutowireMode; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java index a5d6c5f1..1e379769 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.modulith.model.ApplicationModule; +import org.springframework.modulith.core.ApplicationModule; import org.springframework.test.context.ContextConfigurationAttributes; import org.springframework.test.context.ContextCustomizer; import org.springframework.test.context.ContextCustomizerFactory; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java index 3a9bb97f..82b0ee5e 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java @@ -28,9 +28,9 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.AnnotatedClassFinder; import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.modulith.model.ApplicationModule; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.JavaPackage; +import org.springframework.modulith.core.ApplicationModule; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.JavaPackage; import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode; import com.tngtech.archunit.thirdparty.com.google.common.base.Supplier; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/TestApplicationModules.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/TestApplicationModules.java index 3a5e774c..e6811082 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/TestApplicationModules.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/TestApplicationModules.java @@ -17,8 +17,8 @@ package org.springframework.modulith.test; import java.util.List; -import org.springframework.modulith.model.ApplicationModules; -import org.springframework.modulith.model.ModulithMetadata; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.core.ModulithMetadata; import com.tngtech.archunit.base.DescribedPredicate; import com.tngtech.archunit.core.importer.ImportOption; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/package-info.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/package-info.java index 1d0fd38f..89293ebe 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/package-info.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/package-info.java @@ -1,5 +1,5 @@ /** - * Integration test support for Spring Modulith {@link org.springframework.modulith.model.ApplicationModules}. + * Integration test support for Spring Modulith {@link org.springframework.modulith.core.ApplicationModules}. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.test;