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

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