GH-114 - Rename ….modulith.model to ….modulith.core.

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;
 
 /**

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;

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;
 

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;

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;
 

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}.

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;
 

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;

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;
 

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;

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;

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;
 
 /**

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 {
 

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;

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;

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;

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;

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.*;
 

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 {

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;

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;
 

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.

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;

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.*;
 

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;

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;

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}.

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

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;

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;

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;

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}.

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;

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}.

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;

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;
 

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;

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;

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
  */

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.

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;

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;

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;

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;

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;

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
  */

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;
 

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;

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

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;