Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1 - Update Maven artifact coordinates, package and directory structure.

Browse Source 
Original pull request: GH-7.
This commit is contained in:
Björn Kieling
2022-07-07 12:16:07 +02:00
committed by Oliver Drotbohm
parent 6c444769d7
commit 417e215993
255 changed files with 764 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
moduliths-core/src/main/java/org/moduliths/model/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.model;

2
moduliths-docs/src/main/java/org/moduliths/docs/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.docs;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events.config;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events.support;

1
moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1 +0,0 @@
org.moduliths.events.config.EventPublicationConfiguration

2
moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events.jackson;

5
moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring.factories
View File

@@ -1,5 +0,0 @@
org.moduliths.events.config.EventSerializationConfigurationExtension=\
org.moduliths.events.jackson.JacksonEventSerializationConfiguration
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.moduliths.events.jackson.JacksonEventSerializationConfiguration

1
moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1 +0,0 @@
org.moduliths.events.jackson.JacksonEventSerializationConfiguration

2
moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events.jpa;

1
moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties
View File

@@ -1 +0,0 @@
restart.include.moduliths-events:/moduliths-events-jpa-[\\w-\\.]+\.jar

6
moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring.factories
View File

@@ -1,6 +0,0 @@
org.moduliths.events.config.EventPublicationConfigurationExtension=\
org.moduliths.events.jpa.JpaEventPublicationConfiguration
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.moduliths.events.jpa.JpaEventPublicationAutoConfiguration,\
org.moduliths.events.jpa.JpaEventPublicationConfiguration

2
moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories
View File

@@ -1,2 +0,0 @@
org.moduliths.events.jpa.JpaEventPublicationAutoConfiguration
org.moduliths.events.jpa.JpaEventPublicationConfiguration

2
moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events.jpa;

1
moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring-devtools.properties
View File

@@ -1 +0,0 @@
restart.include.moduliths-events:/moduliths-events-jpa-[\\w-\\.]+\.jar

6
moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring.factories
View File

@@ -1,6 +0,0 @@
org.moduliths.events.config.EventPublicationConfigurationExtension=\
org.moduliths.events.jpa.JpaEventPublicationConfiguration
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.moduliths.events.jpa.JpaEventPublicationAutoConfiguration,\
org.moduliths.events.jpa.JpaEventPublicationConfiguration

2
moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1,2 +0,0 @@
org.moduliths.events.jpa.JpaEventPublicationAutoConfiguration
org.moduliths.events.jpa.JpaEventPublicationConfiguration

2
moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.events.starter;

1
moduliths-events/moduliths-events-starter/src/main/resources/META-INF/spring.factories
View File

@@ -1 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.moduliths.events.starter.DomainEventsAutoConfiguration

1
moduliths-integration-test/src/test/resources/META-INF/spring.factories
View File

@@ -1 +0,0 @@
org.moduliths.model.ModuleDetectionStrategy=org.moduliths.model.TestModuleDetectionStrategy

2
moduliths-moments/src/main/java/org/moduliths/moments/package-info.java
View File

@@ -1,2 +0,0 @@
@org.springframework.lang.NonNullApi
package org.moduliths.moments;

2
moduliths-moments/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.moduliths.moments.autoconfigure.MomentsAutoConfiguration

1
moduliths-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1 +0,0 @@
org.moduliths.moments.autoconfigure.MomentsAutoConfiguration

3
moduliths-observability/src/main/resources/META-INF/spring.factories
View File

@@ -1,3 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.moduliths.observability.autoconfigure.ModuleObservabilityAutoConfiguration,\
org.moduliths.observability.autoconfigure.SpringDataRestModuleObservabilityAutoConfiguration

2
moduliths-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories
View File

@@ -1,2 +0,0 @@
org.moduliths.observability.autoconfigure.ModuleObservabilityAutoConfiguration
org.moduliths.observability.autoconfigure.SpringDataRestModuleObservabilityAutoConfiguration

2
moduliths-sample/src/main/java/com/acme/myproject/complex/api/package-info.java
View File

@@ -1,2 +0,0 @@
@org.moduliths.NamedInterface("API")
package com.acme.myproject.complex.api;

2
moduliths-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java
View File

@@ -1,2 +0,0 @@
@org.moduliths.NamedInterface("SPI")
package com.acme.myproject.complex.spi;

2
moduliths-sample/src/main/java/com/acme/myproject/invalid2/package-info.java
View File

@@ -1,2 +0,0 @@
@org.moduliths.Module(allowedDependencies = "moduleB")
package com.acme.myproject.invalid2;

2
moduliths-sample/src/main/java/com/acme/myproject/moduleC/package-info.java
View File

@@ -1,2 +0,0 @@
@org.moduliths.Module(displayName = "MyModule C")
package com.acme.myproject.moduleC;

53
moduliths-starter-jpa-jakarta/pom.xml
View File

@@ -1,53 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>moduliths-starter-jpa-jakarta</artifactId>
<name>Moduliths - Starter JPA (Jakarta)</name>
<properties>
<module.name>org.moduliths.starter.jpa.jakarta</module.name>
</properties>
<dependencies>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-api</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-moments</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<!-- Events -->
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events-core</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events-jackson</artifactId>
<version>1.4.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events-jpa-jakarta</artifactId>
<version>1.4.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

53
moduliths-starter-jpa/pom.xml
View File

@@ -1,53 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>moduliths-starter-jpa</artifactId>
<name>Moduliths - Starter JPA</name>
<properties>
<module.name>org.moduliths.starter.jpa</module.name>
</properties>
<dependencies>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-api</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-moments</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<!-- Events -->
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events-core</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events-jackson</artifactId>
<version>1.4.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events-jpa</artifactId>
<version>1.4.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

33
moduliths-starter-test/pom.xml
View File

@@ -1,33 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>moduliths-starter-test</artifactId>
<name>Moduliths - Starter Test</name>
<properties>
<module.name>org.moduliths.starter.test</module.name>
</properties>
<dependencies>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-test</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-docs</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

1
moduliths-test/src/main/resources/META-INF/spring.factories
View File

@@ -1 +0,0 @@
org.springframework.test.context.ContextCustomizerFactory=org.moduliths.test.ModuleContextCustomizerFactory

40
pom.xml
View File

@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Moduliths</name>
<name>Spring Modulith</name>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -17,16 +17,16 @@
</parent>
<modules>
<module>moduliths-api</module>
<module>moduliths-core</module>
<module>moduliths-events</module>
<module>moduliths-test</module>
<module>moduliths-docs</module>
<module>moduliths-observability</module>
<module>moduliths-moments</module>
<module>moduliths-starter-jpa</module>
<module>moduliths-starter-jpa-jakarta</module>
<module>moduliths-starter-test</module>
<module>spring-modulith-api</module>
<module>spring-modulith-core</module>
<module>spring-modulith-events</module>
<module>spring-modulith-test</module>
<module>spring-modulith-docs</module>
<module>spring-modulith-observability</module>
<module>spring-modulith-moments</module>
<module>spring-modulith-starter-jpa</module>
<module>spring-modulith-starter-jpa-jakarta</module>
<module>spring-modulith-starter-test</module>
</modules>
<properties>
@@ -39,7 +39,7 @@
</properties>
<organization>
<name>Moduliths</name>
<name>Spring Modulith</name>
<url>http://moduliths.org</url>
</organization>
@@ -91,8 +91,8 @@ limitations under the License.
</activation>
<modules>
<module>moduliths-sample</module>
<module>moduliths-integration-test</module>
<module>spring-modulith-sample</module>
<module>spring-modulith-integration-test</module>
</modules>
<distributionManagement>
@@ -289,9 +289,9 @@ limitations under the License.
</build>
<scm>
<url>https://github.com/odrotbohm/moduliths</url>
<connection>scm:git:https://github.com/odrotbohm/moduliths</connection>
<developerConnection>scm:git:ssh://git@github.com/odrotbohm/moduliths.git</developerConnection>
<url>https://github.com/spring-projects-experimental/spring-modulith</url>
<connection>scm:git:https://github.com/spring-projects-experimental/spring-modulith</connection>
<developerConnection>scm:git:ssh://git@github.com/spring-projects-experimental/spring-modulith</developerConnection>
<tag>main</tag>
</scm>

12
moduliths-api/pom.xml → spring-modulith-api/pom.xml
View File

@@ -2,17 +2,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Moduliths - API</name>
<artifactId>moduliths-api</artifactId>
<name>Spring Modulith - API</name>
<artifactId>spring-modulith-api</artifactId>
<properties>
<module.name>org.moduliths.api</module.name>
<module.name>org.springframework.modulith.api</module.name>
</properties>
<dependencies>

2
moduliths-api/src/main/java/org/moduliths/Module.java → spring-modulith-api/src/main/java/org/springframework/modulith/Module.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths;
package org.springframework.modulith;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
moduliths-api/src/main/java/org/moduliths/Modulith.java → spring-modulith-api/src/main/java/org/springframework/modulith/Modulith.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths;
package org.springframework.modulith;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
moduliths-api/src/main/java/org/moduliths/Modulithic.java → spring-modulith-api/src/main/java/org/springframework/modulith/Modulithic.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths;
package org.springframework.modulith;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
moduliths-api/src/main/java/org/moduliths/NamedInterface.java → spring-modulith-api/src/main/java/org/springframework/modulith/NamedInterface.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths;
package org.springframework.modulith;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

16
moduliths-core/pom.xml → spring-modulith-core/pom.xml
View File

@@ -2,24 +2,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Moduliths - Core</name>
<artifactId>moduliths-core</artifactId>
<name>Spring Modulith - Core</name>
<artifactId>spring-modulith-core</artifactId>
<properties>
<module.name>org.moduliths.core</module.name>
<module.name>org.springframework.modulith.core</module.name>
</properties>
<dependencies>
<dependency>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-api</artifactId>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith-api</artifactId>
<version>${project.version}</version>
</dependency>

14
moduliths-core/src/main/java/org/moduliths/model/AnnotationModulithMetadata.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import org.moduliths.Modulithic;
import org.springframework.modulith.Modulithic;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -58,7 +58,7 @@ class AnnotationModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getModulithSource()
* @see org.springframework.modulith.model.ModulithMetadata#getModulithSource()
*/
@Override
public Object getModulithSource() {
@@ -67,7 +67,7 @@ class AnnotationModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getAdditionalPackages()
* @see org.springframework.modulith.model.ModulithMetadata#getAdditionalPackages()
*/
@Override
public List<String> getAdditionalPackages() {
@@ -76,7 +76,7 @@ class AnnotationModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#useFullyQualifiedModuleNames()
* @see org.springframework.modulith.model.ModulithMetadata#useFullyQualifiedModuleNames()
*/
@Override
public boolean useFullyQualifiedModuleNames() {
@@ -85,7 +85,7 @@ class AnnotationModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getSharedModuleNames()
* @see org.springframework.modulith.model.ModulithMetadata#getSharedModuleNames()
*/
@Override
public Stream<String> getSharedModuleNames() {
@@ -94,7 +94,7 @@ class AnnotationModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getSystemName()
* @see org.springframework.modulith.model.ModulithMetadata#getSystemName()
*/
@Override
public Optional<String> getSystemName() {

64
moduliths-core/src/main/java/org/moduliths/model/ArchitecturallyEvidentType.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java
View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.moduliths.model.Types.JavaXTypes.*;
import static org.springframework.modulith.model.Types.JavaXTypes.*;
import lombok.AccessLevel;
import lombok.Getter;
@@ -35,9 +35,9 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.model.Types.JMoleculesTypes;
import org.moduliths.model.Types.SpringDataTypes;
import org.moduliths.model.Types.SpringTypes;
import org.springframework.modulith.model.Types.JMoleculesTypes;
import org.springframework.modulith.model.Types.SpringDataTypes;
import org.springframework.modulith.model.Types.SpringTypes;
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
@@ -60,7 +60,7 @@ public abstract class ArchitecturallyEvidentType {
private final @Getter JavaClass type;
/**
* Creates a new {@link AbstractArchitecturallyEvidentType} for the given {@link JavaType} and {@link Classes} of
* Creates a new {@link ArchitecturallyEvidentType} for the given {@link JavaType} and {@link Classes} of
* Spring components.
*
* @param type must not be {@literal null}.
@@ -201,7 +201,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isAggregateRoot()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isAggregateRoot()
*/
@Override
public boolean isAggregateRoot() {
@@ -210,7 +210,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isRepository()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isRepository()
*/
@Override
public boolean isRepository() {
@@ -219,7 +219,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isService()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isService()
*/
@Override
public boolean isService() {
@@ -228,7 +228,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isController()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isController()
*/
@Override
public boolean isController() {
@@ -237,7 +237,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isEventListener()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isEventListener()
*/
@Override
public boolean isEventListener() {
@@ -246,7 +246,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isConfigurationProperties()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isConfigurationProperties()
*/
@Override
public boolean isConfigurationProperties() {
@@ -255,7 +255,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#getOtherTypeReferences()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#getOtherTypeReferences()
*/
@Override
public Stream<JavaClass> getReferenceTypes() {
@@ -273,7 +273,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#getReferenceMethods()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#getReferenceMethods()
*/
@Override
public Stream<ReferenceMethod> getReferenceMethods() {
@@ -301,7 +301,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isEntity()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isEntity()
*/
@Override
public boolean isEntity() {
@@ -312,7 +312,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.DefaultArchitectuallyEvidentType#isAggregateRoot(org.moduliths.model.Classes)
* @see org.springframework.modulith.model.DefaultArchitectuallyEvidentType#isAggregateRoot(org.springframework.modulith.model.Classes)
*/
@Override
public boolean isAggregateRoot() {
@@ -325,7 +325,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isRepository()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isRepository()
*/
@Override
public boolean isRepository() {
@@ -334,7 +334,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isController()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isController()
*/
@Override
public boolean isController() {
@@ -353,7 +353,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isEntity()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isEntity()
*/
@Override
public boolean isEntity() {
@@ -366,7 +366,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isAggregateRoot()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isAggregateRoot()
*/
@Override
public boolean isAggregateRoot() {
@@ -379,7 +379,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isRepository()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isRepository()
*/
@Override
public boolean isRepository() {
@@ -392,7 +392,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isService()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isService()
*/
@Override
public boolean isService() {
@@ -404,7 +404,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isEventListener()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isEventListener()
*/
@Override
public boolean isEventListener() {
@@ -474,7 +474,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isAggregateRoot()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isAggregateRoot()
*/
// @Override
@Override
@@ -484,7 +484,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isRepository()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isRepository()
*/
// @Override
@Override
@@ -494,7 +494,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isEntity()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isEntity()
*/
@Override
public boolean isEntity() {
@@ -503,7 +503,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isService()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isService()
*/
@Override
public boolean isService() {
@@ -512,7 +512,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isController()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isController()
*/
@Override
public boolean isController() {
@@ -521,7 +521,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isEventListener()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isEventListener()
*/
@Override
public boolean isEventListener() {
@@ -530,7 +530,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#isConfigurationProperties()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#isConfigurationProperties()
*/
@Override
public boolean isConfigurationProperties() {
@@ -539,7 +539,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#getOtherTypeReferences()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#getOtherTypeReferences()
*/
@Override
public Stream<JavaClass> getReferenceTypes() {
@@ -548,7 +548,7 @@ public abstract class ArchitecturallyEvidentType {
/*
* (non-Javadoc)
* @see org.moduliths.model.ArchitecturallyEvidentType#getReferenceMethods()
* @see org.springframework.modulith.model.ArchitecturallyEvidentType#getReferenceMethods()
*/
@Override
public Stream<ReferenceMethod> getReferenceMethods() {

2
moduliths-core/src/main/java/org/moduliths/model/Classes.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.EqualsAndHashCode;
import lombok.ToString;

18
moduliths-core/src/main/java/org/moduliths/model/DefaultModulithMetadata.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.NonNull;
@@ -25,9 +25,9 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import org.moduliths.Modulith;
import org.moduliths.Modulithic;
import org.moduliths.model.Types.SpringTypes;
import org.springframework.modulith.Modulith;
import org.springframework.modulith.Modulithic;
import org.springframework.modulith.model.Types.SpringTypes;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.Assert;
@@ -77,7 +77,7 @@ class DefaultModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getModulithSource()
* @see org.springframework.modulith.model.ModulithMetadata#getModulithSource()
*/
@Override
public Object getModulithSource() {
@@ -86,7 +86,7 @@ class DefaultModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getAdditionalPackages()
* @see org.springframework.modulith.model.ModulithMetadata#getAdditionalPackages()
*/
@Override
public List<String> getAdditionalPackages() {
@@ -95,7 +95,7 @@ class DefaultModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#useFullyQualifiedModuleNames()
* @see org.springframework.modulith.model.ModulithMetadata#useFullyQualifiedModuleNames()
*/
@Override
public boolean useFullyQualifiedModuleNames() {
@@ -104,7 +104,7 @@ class DefaultModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getSharedModuleNames()
* @see org.springframework.modulith.model.ModulithMetadata#getSharedModuleNames()
*/
@Override
public Stream<String> getSharedModuleNames() {
@@ -113,7 +113,7 @@ class DefaultModulithMetadata implements ModulithMetadata {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModulithMetadata#getSystemName()
* @see org.springframework.modulith.model.ModulithMetadata#getSystemName()
*/
@Override
public Optional<String> getSystemName() {

2
moduliths-core/src/main/java/org/moduliths/model/EventType.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.Value;

2
moduliths-core/src/main/java/org/moduliths/model/FormatableJavaClass.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableJavaClass.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;

4
moduliths-core/src/main/java/org/moduliths/model/JavaAccessSource.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -53,7 +53,7 @@ class JavaAccessSource implements Source {
/*
* (non-Javadoc)
* @see org.moduliths.model.Source#toString(org.moduliths.model.Module)
* @see org.springframework.modulith.model.Source#toString(org.springframework.modulith.model.Module)
*/
@Override
public String toString(Module module) {

2
moduliths-core/src/main/java/org/moduliths/model/JavaPackage.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;

29
moduliths-core/src/main/java/org/moduliths/model/Module.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java
View File

@@ -13,16 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static com.tngtech.archunit.base.DescribedPredicate.*;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;
import static java.lang.System.*;
import static org.moduliths.model.Classes.*;
import static org.moduliths.model.Types.*;
import static org.moduliths.model.Types.JavaXTypes.*;
import static org.moduliths.model.Types.SpringDataTypes.*;
import static org.moduliths.model.Types.SpringTypes.*;
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 lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -40,8 +39,8 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.model.Types.JMoleculesTypes;
import org.moduliths.model.Types.SpringTypes;
import org.springframework.modulith.model.Types.JMoleculesTypes;
import org.springframework.modulith.model.Types.SpringTypes;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -427,7 +426,7 @@ public class Module {
return source.stream() //
.map(it -> ArchitecturallyEvidentType.of(it, getSpringBeansInternal()))
.filter(ArchitecturallyEvidentType::isEntity) //
.map(ArchitecturallyEvidentType::getType).collect(toClasses());
.map(ArchitecturallyEvidentType::getType).collect(Classes.toClasses());
}
private static Classes filterSpringBeans(JavaPackage source) {
@@ -671,7 +670,7 @@ public class Module {
/*
* (non-Javadoc)
* @see org.moduliths.model.Module.ModuleDependency#isValidDependencyWithin(org.moduliths.model.Modules)
* @see org.springframework.modulith.model.Module.ModuleDependency#isValidDependencyWithin(org.springframework.modulith.model.Modules)
*/
@Override
Violations isValidDependencyWithin(Modules modules) {
@@ -714,7 +713,7 @@ public class Module {
/*
* (non-Javadoc)
* @see org.moduliths.model.Module.DependencyType#format(org.moduliths.model.FormatableJavaClass, org.moduliths.model.FormatableJavaClass)
* @see org.springframework.modulith.model.Module.DependencyType#format(org.springframework.modulith.model.FormatableJavaClass, org.springframework.modulith.model.FormatableJavaClass)
*/
@Override
public String format(FormatableJavaClass source, FormatableJavaClass target) {
@@ -729,7 +728,7 @@ public class Module {
/*
* (non-Javadoc)
* @see org.moduliths.model.Module.DependencyType#format(org.moduliths.model.FormatableJavaClass, org.moduliths.model.FormatableJavaClass)
* @see org.springframework.modulith.model.Module.DependencyType#format(org.springframework.modulith.model.FormatableJavaClass, org.springframework.modulith.model.FormatableJavaClass)
*/
@Override
public String format(FormatableJavaClass source, FormatableJavaClass target) {
@@ -746,7 +745,7 @@ public class Module {
/*
* (non-Javadoc)
* @see org.moduliths.model.Module.DependencyType#format(org.moduliths.model.FormatableJavaClass, org.moduliths.model.FormatableJavaClass)
* @see org.springframework.modulith.model.Module.DependencyType#format(org.springframework.modulith.model.FormatableJavaClass, org.springframework.modulith.model.FormatableJavaClass)
*/
@Override
public String format(FormatableJavaClass source, FormatableJavaClass target) {
@@ -759,7 +758,7 @@ public class Module {
/*
* (non-Javadoc)
* @see org.moduliths.model.Module.DependencyType#or(com.tngtech.archunit.thirdparty.com.google.common.base.Supplier)
* @see org.springframework.modulith.model.Module.DependencyType#or(com.tngtech.archunit.thirdparty.com.google.common.base.Supplier)
*/
@Override
public DependencyType or(Supplier<DependencyType> supplier) {
@@ -768,7 +767,7 @@ public class Module {
/*
* (non-Javadoc)
* @see org.moduliths.model.Module.DependencyType#format(org.moduliths.model.FormatableJavaClass, org.moduliths.model.FormatableJavaClass)
* @see org.springframework.modulith.model.Module.DependencyType#format(org.springframework.modulith.model.FormatableJavaClass, org.springframework.modulith.model.FormatableJavaClass)
*/
@Override
public String format(FormatableJavaClass source, FormatableJavaClass target) {

10
moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategies.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategies.java
View File

@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import java.util.Objects;
import java.util.stream.Stream;
import org.moduliths.Module;
import org.moduliths.model.Types.JMoleculesTypes;
import org.springframework.modulith.Module;
import org.springframework.modulith.model.Types.JMoleculesTypes;
/**
* Default implementations of {@link ModuleDetectionStrategy}.
@@ -34,7 +34,7 @@ enum ModuleDetectionStrategies implements ModuleDetectionStrategy {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleDetection#getModuleBasePackages(org.moduliths.model.JavaPackage)
* @see org.springframework.modulith.model.ModuleDetection#getModuleBasePackages(org.springframework.modulith.model.JavaPackage)
*/
@Override
public Stream<JavaPackage> getModuleBasePackages(
@@ -47,7 +47,7 @@ enum ModuleDetectionStrategies implements ModuleDetectionStrategy {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleDetection#getModuleBasePackages(org.moduliths.model.JavaPackage)
* @see org.springframework.modulith.model.ModuleDetection#getModuleBasePackages(org.springframework.modulith.model.JavaPackage)
*/
@Override
public Stream<JavaPackage> getModuleBasePackages(JavaPackage basePackage) {

4
moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategy.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategy.java
View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import java.util.stream.Stream;
import org.moduliths.Module;
import org.springframework.modulith.Module;
/**
* Strategy interface to customize which packages are considered module base packages.

14
moduliths-core/src/main/java/org/moduliths/model/ModuleInformation.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleInformation.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -25,7 +25,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.Module;
import org.springframework.modulith.Module;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
@@ -58,7 +58,7 @@ interface ModuleInformation {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleInformation#getName()
* @see org.springframework.modulith.model.ModuleInformation#getName()
*/
@Override
public String getDisplayName() {
@@ -83,7 +83,7 @@ interface ModuleInformation {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleInformation#getName()
* @see org.springframework.modulith.model.ModuleInformation#getName()
*/
@Override
public String getDisplayName() {
@@ -99,7 +99,7 @@ interface ModuleInformation {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleInformation#getAllowedDependencies()
* @see org.springframework.modulith.model.ModuleInformation#getAllowedDependencies()
*/
@Override
public List<String> getAllowedDependencies() {
@@ -124,7 +124,7 @@ interface ModuleInformation {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleInformation.AbstractModuleInformation#getName()
* @see org.springframework.modulith.model.ModuleInformation.AbstractModuleInformation#getName()
*/
@Override
public String getDisplayName() {
@@ -137,7 +137,7 @@ interface ModuleInformation {
/*
* (non-Javadoc)
* @see org.moduliths.model.ModuleInformation#getAllowedDependencies()
* @see org.springframework.modulith.model.ModuleInformation#getAllowedDependencies()
*/
@Override
public List<String> getAllowedDependencies() {

14
moduliths-core/src/main/java/org/moduliths/model/Modules.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static com.tngtech.archunit.base.DescribedPredicate.*;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;
@@ -31,9 +31,9 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.jmolecules.archunit.JMoleculesDddRules;
import org.moduliths.Modulith;
import org.moduliths.Modulithic;
import org.moduliths.model.Types.JMoleculesTypes;
import org.springframework.modulith.Modulith;
import org.springframework.modulith.Modulithic;
import org.springframework.modulith.model.Types.JMoleculesTypes;
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.util.Assert;
@@ -416,7 +416,7 @@ public class Modules implements Iterable<Module> {
/*
* (non-Javadoc)
* @see org.moduliths.model.Modules.CacheKey#getBasePackage()
* @see org.springframework.modulith.model.Modules.CacheKey#getBasePackage()
*/
@Override
public String getBasePackage() {
@@ -425,7 +425,7 @@ public class Modules implements Iterable<Module> {
/*
* (non-Javadoc)
* @see org.moduliths.model.Modules.CacheKey#getMetadata()
* @see org.springframework.modulith.model.Modules.CacheKey#getMetadata()
*/
@Override
public ModulithMetadata getMetadata() {
@@ -441,7 +441,7 @@ public class Modules implements Iterable<Module> {
/*
* (non-Javadoc)
* @see org.moduliths.model.Modules.CacheKey#getMetadata()
* @see org.springframework.modulith.model.Modules.CacheKey#getMetadata()
*/
@Override
public ModulithMetadata getMetadata() {

8
moduliths-core/src/main/java/org/moduliths/model/ModulithMetadata.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java
View File

@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
import org.moduliths.Modulith;
import org.moduliths.Modulithic;
import org.moduliths.model.Types.SpringTypes;
import org.springframework.modulith.Modulith;
import org.springframework.modulith.Modulithic;
import org.springframework.modulith.model.Types.SpringTypes;
import org.springframework.util.Assert;
interface ModulithMetadata {

12
moduliths-core/src/main/java/org/moduliths/model/NamedInterface.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.Getter;
@@ -49,7 +49,7 @@ public abstract class NamedInterface implements Iterable<JavaClass> {
public static List<PackageBasedNamedInterface> of(JavaPackage javaPackage) {
String[] name = javaPackage.getAnnotation(org.moduliths.NamedInterface.class) //
String[] name = javaPackage.getAnnotation(org.springframework.modulith.NamedInterface.class) //
.map(it -> it.value()) //
.orElseThrow(() -> new IllegalArgumentException(
String.format("Couldn't find NamedInterface annotation on package %s!", javaPackage)));
@@ -126,7 +126,7 @@ public abstract class NamedInterface implements Iterable<JavaClass> {
/*
* (non-Javadoc)
* @see org.moduliths.model.NamedInterface#merge(org.moduliths.model.NamedInterface.TypeBasedNamedInterface)
* @see org.springframework.modulith.model.NamedInterface#merge(org.springframework.modulith.model.NamedInterface.TypeBasedNamedInterface)
*/
@Override
public NamedInterface merge(TypeBasedNamedInterface other) {
@@ -135,7 +135,7 @@ public abstract class NamedInterface implements Iterable<JavaClass> {
/*
* (non-Javadoc)
* @see org.moduliths.model.NamedInterface#toString()
* @see org.springframework.modulith.model.NamedInterface#toString()
*/
@Override
public String toString() {
@@ -158,7 +158,7 @@ public abstract class NamedInterface implements Iterable<JavaClass> {
/*
* (non-Javadoc)
* @see org.moduliths.model.NamedInterface#merge(org.moduliths.model.NamedInterface.TypeBasedNamedInterface)
* @see org.springframework.modulith.model.NamedInterface#merge(org.springframework.modulith.model.NamedInterface.TypeBasedNamedInterface)
*/
@Override
public NamedInterface merge(TypeBasedNamedInterface other) {
@@ -167,7 +167,7 @@ public abstract class NamedInterface implements Iterable<JavaClass> {
/*
* (non-Javadoc)
* @see org.moduliths.model.NamedInterface#toString()
* @see org.springframework.modulith.model.NamedInterface#toString()
*/
@Override
public String toString() {

12
moduliths-core/src/main/java/org/moduliths/model/NamedInterfaces.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -26,7 +26,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.model.NamedInterface.TypeBasedNamedInterface;
import org.springframework.modulith.model.NamedInterface.TypeBasedNamedInterface;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@@ -56,7 +56,7 @@ public class NamedInterfaces implements Iterable<NamedInterface> {
static NamedInterfaces ofAnnotatedPackages(JavaPackage basePackage) {
return basePackage //
.getSubPackagesAnnotatedWith(org.moduliths.NamedInterface.class) //
.getSubPackagesAnnotatedWith(org.springframework.modulith.NamedInterface.class) //
.flatMap(it -> NamedInterface.of(it).stream()) //
.collect(Collectors.collectingAndThen(Collectors.toList(), NamedInterfaces::of));
}
@@ -69,12 +69,12 @@ public class NamedInterfaces implements Iterable<NamedInterface> {
.filter(it -> !JavaPackage.isPackageInfoType(it)) //
.forEach(it -> {
if (!it.isAnnotatedWith(org.moduliths.NamedInterface.class)) {
if (!it.isAnnotatedWith(org.springframework.modulith.NamedInterface.class)) {
return;
}
org.moduliths.NamedInterface annotation = it
.getAnnotationOfType(org.moduliths.NamedInterface.class);
org.springframework.modulith.NamedInterface annotation = it
.getAnnotationOfType(org.springframework.modulith.NamedInterface.class);
for (String name : annotation.value()) {
mappings.add(name, it);

2
moduliths-core/src/main/java/org/moduliths/model/Source.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
/**
* A {@link Source} of some type, bean definition etc. Essentially describes the origin of that bean, event etc.

2
moduliths-core/src/main/java/org/moduliths/model/SpringBean.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;

2
moduliths-core/src/main/java/org/moduliths/model/Types.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;

2
moduliths-core/src/main/java/org/moduliths/model/Violations.java → spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;

2
spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java Normal file
View File

@@ -0,0 +1,2 @@
@org.springframework.lang.NonNullApi
package org.springframework.modulith.model;

0
moduliths-core/src/test/java/com/acme/withatbean/SampleConfiguration.java → spring-modulith-core/src/test/java/com/acme/withatbean/SampleConfiguration.java
View File

0
moduliths-core/src/test/java/com/acme/withatbean/TestEvents.java → spring-modulith-core/src/test/java/com/acme/withatbean/TestEvents.java
View File

0
moduliths-core/src/test/java/jmolecules/package-info.java → spring-modulith-core/src/test/java/jmolecules/package-info.java
View File

4
moduliths-core/src/test/java/org/moduliths/model/AnnotationModulithMetadataUnitTest.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import org.junit.jupiter.api.Test;
import org.moduliths.Modulithic;
import org.springframework.modulith.Modulithic;
/**
* Unit tests for {@link AnnotationModulithMetadata}.

8
moduliths-core/src/test/java/org/moduliths/model/ArchitecturallyEvidentTypeUnitTest.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;
@@ -29,8 +29,8 @@ import org.jmolecules.event.annotation.DomainEventHandler;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.moduliths.model.ArchitecturallyEvidentType.SpringAwareArchitecturallyEvidentType;
import org.moduliths.model.ArchitecturallyEvidentType.SpringDataAwareArchitecturallyEvidentType;
import org.springframework.modulith.model.ArchitecturallyEvidentType.SpringAwareArchitecturallyEvidentType;
import org.springframework.modulith.model.ArchitecturallyEvidentType.SpringDataAwareArchitecturallyEvidentType;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.EventListener;
@@ -54,7 +54,7 @@ class ArchitecturallyEvidentTypeUnitTest {
ArchitecturallyEvidentType type = ArchitecturallyEvidentType.of(self, classes);
assertThat(type.getAbbreviatedFullName()).isEqualTo("o.m.m.ArchitecturallyEvidentTypeUnitTest");
assertThat(type.getAbbreviatedFullName()).isEqualTo("o.s.m.m.ArchitecturallyEvidentTypeUnitTest");
}
@Test

4
moduliths-core/src/test/java/org/moduliths/model/ModuleDependencyUnitTest.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java
View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.moduliths.model.Module.ModuleDependency;
import org.springframework.modulith.model.Module.ModuleDependency;
import org.springframework.beans.factory.annotation.Autowired;
import com.tngtech.archunit.core.domain.JavaClass;

2
moduliths-core/src/test/java/org/moduliths/model/ModuleDetectionStrategyUnitTest.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;

2
moduliths-core/src/test/java/org/moduliths/model/ModuleUnitTest.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;

6
moduliths-core/src/test/java/org/moduliths/model/ModulithMetadataUnitTest.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java
View File

@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.moduliths.Modulith;
import org.moduliths.Modulithic;
import org.springframework.modulith.Modulith;
import org.springframework.modulith.Modulithic;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**

2
moduliths-core/src/test/java/org/moduliths/model/TestUtils.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;

2
moduliths-core/src/test/java/org/moduliths/model/ViolationsUnitTests.java → spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.model;
package org.springframework.modulith.model;
import static org.assertj.core.api.Assertions.*;

0
moduliths-core/src/test/resources/application.properties → spring-modulith-core/src/test/resources/application.properties
View File

0
moduliths-core/src/test/resources/logback.xml → spring-modulith-core/src/test/resources/logback.xml
View File

16
moduliths-docs/pom.xml → spring-modulith-docs/pom.xml
View File

@@ -2,17 +2,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Moduliths - Docs</name>
<artifactId>moduliths-docs</artifactId>
<name>Spring Modulith - Docs</name>
<artifactId>spring-modulith-docs</artifactId>
<properties>
<module.name>org.moduliths.docs</module.name>
<module.name>org.springframework.modulith.docs</module.name>
<structurizr.version>1.3.0</structurizr.version>
</properties>
@@ -20,13 +20,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>moduliths-core</artifactId>
<artifactId>spring-modulith-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>moduliths-sample</artifactId>
<artifactId>spring-modulith-sample</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

22
moduliths-docs/src/main/java/org/moduliths/docs/Asciidoctor.java → spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import static org.springframework.util.ClassUtils.*;
@@ -24,16 +24,16 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.docs.ConfigurationProperties.ModuleProperty;
import org.moduliths.docs.Documenter.CanvasOptions;
import org.moduliths.docs.Documenter.CanvasOptions.Groupings;
import org.moduliths.model.ArchitecturallyEvidentType;
import org.moduliths.model.EventType;
import org.moduliths.model.FormatableJavaClass;
import org.moduliths.model.Module;
import org.moduliths.model.Modules;
import org.moduliths.model.Source;
import org.moduliths.model.SpringBean;
import org.springframework.modulith.docs.ConfigurationProperties.ModuleProperty;
import org.springframework.modulith.docs.Documenter.CanvasOptions;
import org.springframework.modulith.docs.Documenter.CanvasOptions.Groupings;
import org.springframework.modulith.model.ArchitecturallyEvidentType;
import org.springframework.modulith.model.EventType;
import org.springframework.modulith.model.FormatableJavaClass;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.Source;
import org.springframework.modulith.model.SpringBean;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;

4
moduliths-docs/src/main/java/org/moduliths/docs/CodeReplacingDocumentationSource.java → spring-modulith-docs/src/main/java/org/springframework/modulith/docs/CodeReplacingDocumentationSource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import lombok.RequiredArgsConstructor;
@@ -36,7 +36,7 @@ class CodeReplacingDocumentationSource implements DocumentationSource {
/*
* (non-Javadoc)
* @see org.moduliths.docs.DocumentationSource#getDocumentation(com.tngtech.archunit.core.domain.JavaMethod)
* @see org.springframework.modulith.docs.DocumentationSource#getDocumentation(com.tngtech.archunit.core.domain.JavaMethod)
*/
@Override
public Optional<String> getDocumentation(JavaMethod method) {

6
moduliths-docs/src/main/java/org/moduliths/docs/ConfigurationProperties.java → spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import lombok.Value;
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.docs.ConfigurationProperties.ConfigurationProperty;
import org.moduliths.model.Module;
import org.springframework.modulith.docs.ConfigurationProperties.ConfigurationProperty;
import org.springframework.modulith.model.Module;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.lang.Nullable;

2
moduliths-docs/src/main/java/org/moduliths/docs/DocumentationSource.java → spring-modulith-docs/src/main/java/org/springframework/modulith/docs/DocumentationSource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import java.util.Optional;

18
moduliths-docs/src/main/java/org/moduliths/docs/Documenter.java → spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java
View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import static org.moduliths.docs.Asciidoctor.*;
import static org.springframework.modulith.docs.Asciidoctor.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -42,11 +42,11 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.moduliths.model.Module;
import org.moduliths.model.Module.DependencyDepth;
import org.moduliths.model.Module.DependencyType;
import org.moduliths.model.Modules;
import org.moduliths.model.SpringBean;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.Module.DependencyDepth;
import org.springframework.modulith.model.Module.DependencyType;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.SpringBean;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.LinkedMultiValueMap;
@@ -520,7 +520,7 @@ public class Documenter {
* @return will never be {@literal null}.
*/
private static String getDefaultOutputDirectory() {
return (new File("pom.xml").exists() ? "target" : "build").concat("/moduliths-docs");
return (new File("pom.xml").exists() ? "target" : "build").concat("/spring-modulith-docs");
}
@Value
@@ -542,7 +542,7 @@ public class Documenter {
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public static class Options {
private static Set<DependencyType> ALL_TYPES = Arrays.stream(DependencyType.values()).collect(Collectors.toSet());
private static final Set<DependencyType> ALL_TYPES = Arrays.stream(DependencyType.values()).collect(Collectors.toSet());
private final Set<DependencyType> dependencyTypes;

4
moduliths-docs/src/main/java/org/moduliths/docs/SpringAutoRestDocsDocumentationSource.java → spring-modulith-docs/src/main/java/org/springframework/modulith/docs/SpringAutoRestDocsDocumentationSource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import capital.scalable.restdocs.javadoc.JavadocReader;
import capital.scalable.restdocs.javadoc.JavadocReaderImpl;
@@ -34,7 +34,7 @@ class SpringAutoRestDocsDocumentationSource implements DocumentationSource {
/*
* (non-Javadoc)
* @see org.moduliths.docs.JavadocSource#getDocumentation(com.tngtech.archunit.core.domain.JavaMethod)
* @see org.springframework.modulith.docs.JavadocSource#getDocumentation(com.tngtech.archunit.core.domain.JavaMethod)
*/
@Override
public Optional<String> getDocumentation(JavaMethod method) {

2
spring-modulith-docs/src/main/java/org/springframework/modulith/docs/package-info.java Normal file
View File

@@ -0,0 +1,2 @@
@org.springframework.lang.NonNullApi
package org.springframework.modulith.docs;

14
moduliths-docs/src/test/java/org/moduliths/docs/AsciidoctorUnitTests.java → spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java
View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.moduliths.model.Modules;
import org.springframework.modulith.model.Modules;
import org.springframework.context.ApplicationContext;
import com.tngtech.archunit.core.domain.JavaClass;
@@ -29,7 +29,7 @@ import com.tngtech.archunit.core.importer.ClassFileImporter;
*/
class AsciidoctorUnitTests {
Asciidoctor asciidoctor = Asciidoctor.withJavadocBase(Modules.of("org.moduliths"), "{javadoc}");
Asciidoctor asciidoctor = Asciidoctor.withJavadocBase(Modules.of("org.springframework.modulith"), "{javadoc}");
@Test
void formatsInlineCode() {
@@ -40,15 +40,15 @@ class AsciidoctorUnitTests {
void rendersLinkToMethodReference() {
assertThat(asciidoctor.toInlineCode("Documenter#toModuleCanvas(Module, CanvasOptions)"))
.isEqualTo("link:{javadoc}/org/moduliths/docs/Documenter.html"
+ "[`o.m.d.Documenter#toModuleCanvas(Module, CanvasOptions)`]");
.isEqualTo("link:{javadoc}/org/springframework/modulith/docs/Documenter.html"
+ "[`o.s.m.d.Documenter#toModuleCanvas(Module, CanvasOptions)`]");
}
@Test
void doesNotRenderLinkToMethodReferenceForNonPublicType() {
assertThat(asciidoctor.toInlineCode("DocumentationSource#getDocumentation(JavaMethod)"))
.isEqualTo("`o.m.d.DocumentationSource#getDocumentation(JavaMethod)`");
.isEqualTo("`o.s.m.d.DocumentationSource#getDocumentation(JavaMethod)`");
}
@Test
@@ -64,7 +64,7 @@ class AsciidoctorUnitTests {
ConfigurationProperties metadata = new ConfigurationProperties();
assertThat(metadata).containsExactly(new ConfigurationProperties.ConfigurationProperty("org.moduliths.sample.test",
assertThat(metadata).containsExactly(new ConfigurationProperties.ConfigurationProperty("org.springframework.modulith.sample.test",
"Some test property of type {@link java.lang.Boolean}.", "java.lang.Boolean",
"com.acme.myproject.stereotypes.Stereotypes$SomeConfigurationProperties", "false"));
}

10
moduliths-docs/src/test/java/org/moduliths/docs/DocumenterTest.java → spring-modulith-docs/src/test/java/org/springframework/modulith/docs/DocumenterTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.docs;
package org.springframework.modulith.docs;
import static org.assertj.core.api.Assertions.*;
@@ -26,9 +26,9 @@ import java.util.Comparator;
import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.moduliths.docs.Documenter.Options;
import org.moduliths.model.Module;
import org.moduliths.model.Module.DependencyType;
import org.springframework.modulith.docs.Documenter.Options;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.Module.DependencyType;
import com.acme.myproject.Application;
@@ -73,7 +73,7 @@ class DocumenterTest {
@Test
void customizesOutputLocation() throws IOException {
String customOutputFolder = "build/moduliths";
String customOutputFolder = "build/spring-modulith";
Path path = Paths.get(customOutputFolder);
try {

4
moduliths-docs/src/test/resources/META-INF/spring-configuration-metadata.json → spring-modulith-docs/src/test/resources/META-INF/spring-configuration-metadata.json
View File

@@ -1,14 +1,14 @@
{
"groups": [
{
"name": "org.moduliths.sample",
"name": "org.springframework.modulith.sample",
"type": "com.acme.myproject.stereotypes.Stereotypes$SomeConfigurationProperties",
"sourceType": "com.acme.myproject.stereotypes.Stereotypes$SomeConfigurationProperties"
}
],
"properties": [
{
"name": "org.moduliths.sample.test",
"name": "org.springframework.modulith.sample.test",
"type": "java.lang.Boolean",
"description": "Some test property of type {@link java.lang.Boolean}.",
"sourceType": "com.acme.myproject.stereotypes.Stereotypes$SomeConfigurationProperties",

0
moduliths-docs/src/test/resources/logback.xml → spring-modulith-docs/src/test/resources/logback.xml
View File

22
moduliths-events/pom.xml → spring-modulith-events/pom.xml
View File

@@ -2,24 +2,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths</artifactId>
<version>1.4.0-SNAPSHOT</version>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>moduliths-events</artifactId>
<artifactId>spring-modulith-events</artifactId>
<packaging>pom</packaging>
<name>Moduliths - Events</name>
<name>Spring Modulith - Events</name>
<modules>
<module>moduliths-events-core</module>
<module>moduliths-events-jpa</module>
<module>moduliths-events-jpa-jakarta</module>
<module>moduliths-events-jackson</module>
<module>moduliths-events-tests</module>
<module>moduliths-events-starter</module>
<module>spring-modulith-events-core</module>
<module>spring-modulith-events-jpa</module>
<module>spring-modulith-events-jpa-jakarta</module>
<module>spring-modulith-events-jackson</module>
<module>spring-modulith-events-tests</module>
<module>spring-modulith-events-starter</module>
</modules>
<dependencies>

0
moduliths-events/readme.adoc → spring-modulith-events/readme.adoc
View File

12
moduliths-events/moduliths-events-core/pom.xml → spring-modulith-events/spring-modulith-events-core/pom.xml
View File

@@ -2,18 +2,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-events</artifactId>
<version>1.4.0-SNAPSHOT</version>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-modulith-events</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Moduliths - Events - Core</name>
<name>Spring Modulith - Events - Core</name>
<artifactId>moduliths-events-core</artifactId>
<artifactId>spring-modulith-events-core</artifactId>
<properties>
<module.name>org.moduliths.events.core</module.name>
<module.name>org.springframework.modulith.events.core</module.name>
</properties>

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/CompletableEventPublication.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/CompletableEventPublication.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events;
package org.springframework.modulith.events;
import java.time.Instant;
import java.util.Optional;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/DefaultEventPublication.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events;
package org.springframework.modulith.events;
import lombok.EqualsAndHashCode;
import lombok.Getter;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublication.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events;
package org.springframework.modulith.events;
import java.time.Instant;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublicationRegistry.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events;
package org.springframework.modulith.events;
import java.util.stream.Stream;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventSerializer.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events;
package org.springframework.modulith.events;
/**
* @author Oliver Drotbohm

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/PublicationTargetIdentifier.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events;
package org.springframework.modulith.events;
import lombok.RequiredArgsConstructor;
import lombok.Value;

4
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EnablePersistentDomainEvents.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events.config;
package org.springframework.modulith.events.config;
import static org.springframework.core.io.support.SpringFactoriesLoader.*;
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
import java.util.ArrayList;
import java.util.List;
import org.moduliths.events.config.EnablePersistentDomainEvents.PersistentDomainEventsImportSelector;
import org.springframework.modulith.events.config.EnablePersistentDomainEvents.PersistentDomainEventsImportSelector;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.ImportSelector;

10
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfiguration.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java
View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events.config;
package org.springframework.modulith.events.config;
import org.moduliths.events.EventPublicationRegistry;
import org.moduliths.events.support.CompletionRegisteringBeanPostProcessor;
import org.moduliths.events.support.MapEventPublicationRegistry;
import org.moduliths.events.support.PersistentApplicationEventMulticaster;
import org.springframework.modulith.events.EventPublicationRegistry;
import org.springframework.modulith.events.support.CompletionRegisteringBeanPostProcessor;
import org.springframework.modulith.events.support.MapEventPublicationRegistry;
import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.context.annotation.Bean;

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfigurationExtension.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfigurationExtension.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events.config;
package org.springframework.modulith.events.config;
/**
* @author Oliver Gierke

2
moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventSerializationConfigurationExtension.java → spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventSerializationConfigurationExtension.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.moduliths.events.config;
package org.springframework.modulith.events.config;
/**
* @author Oliver Gierke

2
spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/package-info.java Normal file
View File

@@ -0,0 +1,2 @@
@org.springframework.lang.NonNullApi
package org.springframework.modulith.events.config;

Some files were not shown because too many files have changed in this diff Show More