diff --git a/moduliths-core/src/main/java/org/moduliths/model/package-info.java b/moduliths-core/src/main/java/org/moduliths/model/package-info.java deleted file mode 100644 index 3dd041c5..00000000 --- a/moduliths-core/src/main/java/org/moduliths/model/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.model; diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/package-info.java b/moduliths-docs/src/main/java/org/moduliths/docs/package-info.java deleted file mode 100644 index 2cf78dc1..00000000 --- a/moduliths-docs/src/main/java/org/moduliths/docs/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.docs; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/package-info.java b/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/package-info.java deleted file mode 100644 index 853ab3f9..00000000 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events.config; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/package-info.java b/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/package-info.java deleted file mode 100644 index 77cda59a..00000000 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/package-info.java b/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/package-info.java deleted file mode 100644 index 8565f24b..00000000 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events.support; diff --git a/moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3cc2586f..00000000 --- a/moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.moduliths.events.config.EventPublicationConfiguration diff --git a/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/package-info.java b/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/package-info.java deleted file mode 100644 index b1dc742f..00000000 --- a/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events.jackson; diff --git a/moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring.factories b/moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring.factories deleted file mode 100644 index b5d0cfc8..00000000 --- a/moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,5 +0,0 @@ -org.moduliths.events.config.EventSerializationConfigurationExtension=\ - org.moduliths.events.jackson.JacksonEventSerializationConfiguration - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.moduliths.events.jackson.JacksonEventSerializationConfiguration diff --git a/moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 52da31f4..00000000 --- a/moduliths-events/moduliths-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.moduliths.events.jackson.JacksonEventSerializationConfiguration diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/package-info.java b/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/package-info.java deleted file mode 100644 index a48c9cea..00000000 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events.jpa; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties b/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index aecea6f4..00000000 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.moduliths-events:/moduliths-events-jpa-[\\w-\\.]+\.jar diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring.factories b/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 118209eb..00000000 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -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 diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories b/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories deleted file mode 100644 index 3346c654..00000000 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.moduliths.events.jpa.JpaEventPublicationAutoConfiguration -org.moduliths.events.jpa.JpaEventPublicationConfiguration diff --git a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/package-info.java b/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/package-info.java deleted file mode 100644 index a48c9cea..00000000 --- a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events.jpa; diff --git a/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring-devtools.properties b/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index aecea6f4..00000000 --- a/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.moduliths-events:/moduliths-events-jpa-[\\w-\\.]+\.jar diff --git a/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring.factories b/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 118209eb..00000000 --- a/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -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 diff --git a/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3346c654..00000000 --- a/moduliths-events/moduliths-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.moduliths.events.jpa.JpaEventPublicationAutoConfiguration -org.moduliths.events.jpa.JpaEventPublicationConfiguration diff --git a/moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/package-info.java b/moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/package-info.java deleted file mode 100644 index 9d2df0a2..00000000 --- a/moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.events.starter; diff --git a/moduliths-events/moduliths-events-starter/src/main/resources/META-INF/spring.factories b/moduliths-events/moduliths-events-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 32037b4a..00000000 --- a/moduliths-events/moduliths-events-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.moduliths.events.starter.DomainEventsAutoConfiguration diff --git a/moduliths-integration-test/src/test/resources/META-INF/spring.factories b/moduliths-integration-test/src/test/resources/META-INF/spring.factories deleted file mode 100644 index cae44a4f..00000000 --- a/moduliths-integration-test/src/test/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.moduliths.model.ModuleDetectionStrategy=org.moduliths.model.TestModuleDetectionStrategy diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/package-info.java b/moduliths-moments/src/main/java/org/moduliths/moments/package-info.java deleted file mode 100644 index 03b20952..00000000 --- a/moduliths-moments/src/main/java/org/moduliths/moments/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.springframework.lang.NonNullApi -package org.moduliths.moments; diff --git a/moduliths-moments/src/main/resources/META-INF/spring.factories b/moduliths-moments/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 8f448a42..00000000 --- a/moduliths-moments/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.moduliths.moments.autoconfigure.MomentsAutoConfiguration diff --git a/moduliths-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/moduliths-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e183efc1..00000000 --- a/moduliths-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.moduliths.moments.autoconfigure.MomentsAutoConfiguration diff --git a/moduliths-observability/src/main/resources/META-INF/spring.factories b/moduliths-observability/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 4133ff65..00000000 --- a/moduliths-observability/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.moduliths.observability.autoconfigure.ModuleObservabilityAutoConfiguration,\ - org.moduliths.observability.autoconfigure.SpringDataRestModuleObservabilityAutoConfiguration \ No newline at end of file diff --git a/moduliths-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories b/moduliths-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories deleted file mode 100644 index d6d5a2b4..00000000 --- a/moduliths-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.moduliths.observability.autoconfigure.ModuleObservabilityAutoConfiguration -org.moduliths.observability.autoconfigure.SpringDataRestModuleObservabilityAutoConfiguration diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/api/package-info.java b/moduliths-sample/src/main/java/com/acme/myproject/complex/api/package-info.java deleted file mode 100644 index 15c09d58..00000000 --- a/moduliths-sample/src/main/java/com/acme/myproject/complex/api/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.moduliths.NamedInterface("API") -package com.acme.myproject.complex.api; diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java b/moduliths-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java deleted file mode 100644 index 9b624dd3..00000000 --- a/moduliths-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.moduliths.NamedInterface("SPI") -package com.acme.myproject.complex.spi; diff --git a/moduliths-sample/src/main/java/com/acme/myproject/invalid2/package-info.java b/moduliths-sample/src/main/java/com/acme/myproject/invalid2/package-info.java deleted file mode 100644 index 0112d114..00000000 --- a/moduliths-sample/src/main/java/com/acme/myproject/invalid2/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.moduliths.Module(allowedDependencies = "moduleB") -package com.acme.myproject.invalid2; diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleC/package-info.java b/moduliths-sample/src/main/java/com/acme/myproject/moduleC/package-info.java deleted file mode 100644 index 157da8cb..00000000 --- a/moduliths-sample/src/main/java/com/acme/myproject/moduleC/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@org.moduliths.Module(displayName = "MyModule C") -package com.acme.myproject.moduleC; diff --git a/moduliths-starter-jpa-jakarta/pom.xml b/moduliths-starter-jpa-jakarta/pom.xml deleted file mode 100644 index fc1c4b77..00000000 --- a/moduliths-starter-jpa-jakarta/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - org.moduliths - moduliths - 1.4.0-SNAPSHOT - - - moduliths-starter-jpa-jakarta - Moduliths - Starter JPA (Jakarta) - - - org.moduliths.starter.jpa.jakarta - - - - - - org.moduliths - moduliths-api - 1.4.0-SNAPSHOT - - - org.moduliths - moduliths-moments - 1.4.0-SNAPSHOT - - - - - - org.moduliths - moduliths-events-core - 1.4.0-SNAPSHOT - - - org.moduliths - moduliths-events-jackson - 1.4.0-SNAPSHOT - runtime - - - org.moduliths - moduliths-events-jpa-jakarta - 1.4.0-SNAPSHOT - runtime - - - - - \ No newline at end of file diff --git a/moduliths-starter-jpa/pom.xml b/moduliths-starter-jpa/pom.xml deleted file mode 100644 index 95d22094..00000000 --- a/moduliths-starter-jpa/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - org.moduliths - moduliths - 1.4.0-SNAPSHOT - - - moduliths-starter-jpa - Moduliths - Starter JPA - - - org.moduliths.starter.jpa - - - - - - org.moduliths - moduliths-api - 1.4.0-SNAPSHOT - - - org.moduliths - moduliths-moments - 1.4.0-SNAPSHOT - - - - - - org.moduliths - moduliths-events-core - 1.4.0-SNAPSHOT - - - org.moduliths - moduliths-events-jackson - 1.4.0-SNAPSHOT - runtime - - - org.moduliths - moduliths-events-jpa - 1.4.0-SNAPSHOT - runtime - - - - - \ No newline at end of file diff --git a/moduliths-starter-test/pom.xml b/moduliths-starter-test/pom.xml deleted file mode 100644 index b12f7b2c..00000000 --- a/moduliths-starter-test/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - 4.0.0 - - - org.moduliths - moduliths - 1.4.0-SNAPSHOT - - - moduliths-starter-test - Moduliths - Starter Test - - - org.moduliths.starter.test - - - - - - org.moduliths - moduliths-test - 1.4.0-SNAPSHOT - - - - org.moduliths - moduliths-docs - 1.4.0-SNAPSHOT - - - - - diff --git a/moduliths-test/src/main/resources/META-INF/spring.factories b/moduliths-test/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c8dfaf23..00000000 --- a/moduliths-test/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.test.context.ContextCustomizerFactory=org.moduliths.test.ModuleContextCustomizerFactory diff --git a/pom.xml b/pom.xml index be9702b8..18b1cae9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT pom - Moduliths + Spring Modulith org.springframework.boot @@ -17,16 +17,16 @@ - moduliths-api - moduliths-core - moduliths-events - moduliths-test - moduliths-docs - moduliths-observability - moduliths-moments - moduliths-starter-jpa - moduliths-starter-jpa-jakarta - moduliths-starter-test + spring-modulith-api + spring-modulith-core + spring-modulith-events + spring-modulith-test + spring-modulith-docs + spring-modulith-observability + spring-modulith-moments + spring-modulith-starter-jpa + spring-modulith-starter-jpa-jakarta + spring-modulith-starter-test @@ -39,7 +39,7 @@ - Moduliths + Spring Modulith http://moduliths.org @@ -91,8 +91,8 @@ limitations under the License. - moduliths-sample - moduliths-integration-test + spring-modulith-sample + spring-modulith-integration-test @@ -289,9 +289,9 @@ limitations under the License. - https://github.com/odrotbohm/moduliths - scm:git:https://github.com/odrotbohm/moduliths - scm:git:ssh://git@github.com/odrotbohm/moduliths.git + https://github.com/spring-projects-experimental/spring-modulith + scm:git:https://github.com/spring-projects-experimental/spring-modulith + scm:git:ssh://git@github.com/spring-projects-experimental/spring-modulith main diff --git a/moduliths-api/pom.xml b/spring-modulith-api/pom.xml similarity index 66% rename from moduliths-api/pom.xml rename to spring-modulith-api/pom.xml index 877df18e..d03cf33b 100644 --- a/moduliths-api/pom.xml +++ b/spring-modulith-api/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - API - moduliths-api + Spring Modulith - API + spring-modulith-api - org.moduliths.api + org.springframework.modulith.api diff --git a/moduliths-api/src/main/java/org/moduliths/Module.java b/spring-modulith-api/src/main/java/org/springframework/modulith/Module.java similarity index 97% rename from moduliths-api/src/main/java/org/moduliths/Module.java rename to spring-modulith-api/src/main/java/org/springframework/modulith/Module.java index c3b215c5..c2bbc37f 100644 --- a/moduliths-api/src/main/java/org/moduliths/Module.java +++ b/spring-modulith-api/src/main/java/org/springframework/modulith/Module.java @@ -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; diff --git a/moduliths-api/src/main/java/org/moduliths/Modulith.java b/spring-modulith-api/src/main/java/org/springframework/modulith/Modulith.java similarity index 98% rename from moduliths-api/src/main/java/org/moduliths/Modulith.java rename to spring-modulith-api/src/main/java/org/springframework/modulith/Modulith.java index ce6c647b..3b75b33c 100644 --- a/moduliths-api/src/main/java/org/moduliths/Modulith.java +++ b/spring-modulith-api/src/main/java/org/springframework/modulith/Modulith.java @@ -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; diff --git a/moduliths-api/src/main/java/org/moduliths/Modulithic.java b/spring-modulith-api/src/main/java/org/springframework/modulith/Modulithic.java similarity index 98% rename from moduliths-api/src/main/java/org/moduliths/Modulithic.java rename to spring-modulith-api/src/main/java/org/springframework/modulith/Modulithic.java index 8515e624..b11716db 100644 --- a/moduliths-api/src/main/java/org/moduliths/Modulithic.java +++ b/spring-modulith-api/src/main/java/org/springframework/modulith/Modulithic.java @@ -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; diff --git a/moduliths-api/src/main/java/org/moduliths/NamedInterface.java b/spring-modulith-api/src/main/java/org/springframework/modulith/NamedInterface.java similarity index 96% rename from moduliths-api/src/main/java/org/moduliths/NamedInterface.java rename to spring-modulith-api/src/main/java/org/springframework/modulith/NamedInterface.java index 32404bc8..1c047d95 100644 --- a/moduliths-api/src/main/java/org/moduliths/NamedInterface.java +++ b/spring-modulith-api/src/main/java/org/springframework/modulith/NamedInterface.java @@ -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; diff --git a/moduliths-core/pom.xml b/spring-modulith-core/pom.xml similarity index 82% rename from moduliths-core/pom.xml rename to spring-modulith-core/pom.xml index ae177346..d6cf5aba 100644 --- a/moduliths-core/pom.xml +++ b/spring-modulith-core/pom.xml @@ -2,24 +2,24 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Core - moduliths-core + Spring Modulith - Core + spring-modulith-core - org.moduliths.core + org.springframework.modulith.core - org.moduliths - moduliths-api + org.springframework.experimental + spring-modulith-api ${project.version} diff --git a/moduliths-core/src/main/java/org/moduliths/model/AnnotationModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java similarity index 83% rename from moduliths-core/src/main/java/org/moduliths/model/AnnotationModulithMetadata.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java index 82bc8174..4c5a4f88 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/AnnotationModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java @@ -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 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 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 getSystemName() { diff --git a/moduliths-core/src/main/java/org/moduliths/model/ArchitecturallyEvidentType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java similarity index 83% rename from moduliths-core/src/main/java/org/moduliths/model/ArchitecturallyEvidentType.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java index 79c05fd2..66f3ae22 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/ArchitecturallyEvidentType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java @@ -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 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 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 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 getReferenceMethods() { diff --git a/moduliths-core/src/main/java/org/moduliths/model/Classes.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java similarity index 99% rename from moduliths-core/src/main/java/org/moduliths/model/Classes.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java index 5573930f..83df90cc 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/Classes.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java @@ -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; diff --git a/moduliths-core/src/main/java/org/moduliths/model/DefaultModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java similarity index 82% rename from moduliths-core/src/main/java/org/moduliths/model/DefaultModulithMetadata.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java index 0025d036..3db0be5a 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/DefaultModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java @@ -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 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 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 getSystemName() { diff --git a/moduliths-core/src/main/java/org/moduliths/model/EventType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java similarity index 98% rename from moduliths-core/src/main/java/org/moduliths/model/EventType.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java index 84b24719..ae653f7f 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/EventType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java @@ -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; diff --git a/moduliths-core/src/main/java/org/moduliths/model/FormatableJavaClass.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableJavaClass.java similarity index 98% rename from moduliths-core/src/main/java/org/moduliths/model/FormatableJavaClass.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableJavaClass.java index 962d573b..4f8c7b81 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/FormatableJavaClass.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/FormatableJavaClass.java @@ -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; diff --git a/moduliths-core/src/main/java/org/moduliths/model/JavaAccessSource.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java similarity index 92% rename from moduliths-core/src/main/java/org/moduliths/model/JavaAccessSource.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java index a48e77c4..9c692410 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/JavaAccessSource.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaAccessSource.java @@ -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) { diff --git a/moduliths-core/src/main/java/org/moduliths/model/JavaPackage.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java similarity index 99% rename from moduliths-core/src/main/java/org/moduliths/model/JavaPackage.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java index 6429467d..6adf0223 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/JavaPackage.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/JavaPackage.java @@ -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.*; diff --git a/moduliths-core/src/main/java/org/moduliths/model/Module.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java similarity index 94% rename from moduliths-core/src/main/java/org/moduliths/model/Module.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java index 7b1748fb..219a2d2c 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/Module.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java @@ -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 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) { diff --git a/moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategies.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategies.java similarity index 78% rename from moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategies.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategies.java index 855856e6..8931836d 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategies.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategies.java @@ -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 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 getModuleBasePackages(JavaPackage basePackage) { diff --git a/moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategy.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategy.java similarity index 95% rename from moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategy.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategy.java index 3e33ad71..36209eb1 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/ModuleDetectionStrategy.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleDetectionStrategy.java @@ -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. diff --git a/moduliths-core/src/main/java/org/moduliths/model/ModuleInformation.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleInformation.java similarity index 87% rename from moduliths-core/src/main/java/org/moduliths/model/ModuleInformation.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleInformation.java index 3733396b..719b5083 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/ModuleInformation.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModuleInformation.java @@ -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 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 getAllowedDependencies() { diff --git a/moduliths-core/src/main/java/org/moduliths/model/Modules.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java similarity index 96% rename from moduliths-core/src/main/java/org/moduliths/model/Modules.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java index 3a7354fb..6a529db5 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/Modules.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java @@ -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 { /* * (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 { /* * (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 { /* * (non-Javadoc) - * @see org.moduliths.model.Modules.CacheKey#getMetadata() + * @see org.springframework.modulith.model.Modules.CacheKey#getMetadata() */ @Override public ModulithMetadata getMetadata() { diff --git a/moduliths-core/src/main/java/org/moduliths/model/ModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java similarity index 94% rename from moduliths-core/src/main/java/org/moduliths/model/ModulithMetadata.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java index 89e91a4a..8358b62e 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/ModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ModulithMetadata.java @@ -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 { diff --git a/moduliths-core/src/main/java/org/moduliths/model/NamedInterface.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java similarity index 89% rename from moduliths-core/src/main/java/org/moduliths/model/NamedInterface.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java index 596eb8c4..3d6ce75a 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/NamedInterface.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java @@ -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 { public static List 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 { /* * (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 { /* * (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 { /* * (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 { /* * (non-Javadoc) - * @see org.moduliths.model.NamedInterface#toString() + * @see org.springframework.modulith.model.NamedInterface#toString() */ @Override public String toString() { diff --git a/moduliths-core/src/main/java/org/moduliths/model/NamedInterfaces.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java similarity index 90% rename from moduliths-core/src/main/java/org/moduliths/model/NamedInterfaces.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java index 0dbf2262..61698cb4 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/NamedInterfaces.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java @@ -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 { 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 { .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); diff --git a/moduliths-core/src/main/java/org/moduliths/model/Source.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java similarity index 95% rename from moduliths-core/src/main/java/org/moduliths/model/Source.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java index 60e07507..81cc0d33 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/Source.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Source.java @@ -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. diff --git a/moduliths-core/src/main/java/org/moduliths/model/SpringBean.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java similarity index 97% rename from moduliths-core/src/main/java/org/moduliths/model/SpringBean.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java index 87cb0214..21728eaa 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/SpringBean.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java @@ -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; diff --git a/moduliths-core/src/main/java/org/moduliths/model/Types.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java similarity index 99% rename from moduliths-core/src/main/java/org/moduliths/model/Types.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java index bf3fc855..59de56f3 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/Types.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Types.java @@ -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.*; diff --git a/moduliths-core/src/main/java/org/moduliths/model/Violations.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java similarity index 98% rename from moduliths-core/src/main/java/org/moduliths/model/Violations.java rename to spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java index 55e478f4..9adfeda6 100644 --- a/moduliths-core/src/main/java/org/moduliths/model/Violations.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Violations.java @@ -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; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java new file mode 100644 index 00000000..318d486f --- /dev/null +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.model; diff --git a/moduliths-core/src/test/java/com/acme/withatbean/SampleConfiguration.java b/spring-modulith-core/src/test/java/com/acme/withatbean/SampleConfiguration.java similarity index 100% rename from moduliths-core/src/test/java/com/acme/withatbean/SampleConfiguration.java rename to spring-modulith-core/src/test/java/com/acme/withatbean/SampleConfiguration.java diff --git a/moduliths-core/src/test/java/com/acme/withatbean/TestEvents.java b/spring-modulith-core/src/test/java/com/acme/withatbean/TestEvents.java similarity index 100% rename from moduliths-core/src/test/java/com/acme/withatbean/TestEvents.java rename to spring-modulith-core/src/test/java/com/acme/withatbean/TestEvents.java diff --git a/moduliths-core/src/test/java/jmolecules/package-info.java b/spring-modulith-core/src/test/java/jmolecules/package-info.java similarity index 100% rename from moduliths-core/src/test/java/jmolecules/package-info.java rename to spring-modulith-core/src/test/java/jmolecules/package-info.java diff --git a/moduliths-core/src/test/java/org/moduliths/model/AnnotationModulithMetadataUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java similarity index 94% rename from moduliths-core/src/test/java/org/moduliths/model/AnnotationModulithMetadataUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java index 4ef9d0fc..ab6aee9a 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/AnnotationModulithMetadataUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/AnnotationModulithMetadataUnitTest.java @@ -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}. diff --git a/moduliths-core/src/test/java/org/moduliths/model/ArchitecturallyEvidentTypeUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java similarity index 95% rename from moduliths-core/src/test/java/org/moduliths/model/ArchitecturallyEvidentTypeUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java index 52ba61a0..1409918b 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/ArchitecturallyEvidentTypeUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ArchitecturallyEvidentTypeUnitTest.java @@ -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 diff --git a/moduliths-core/src/test/java/org/moduliths/model/ModuleDependencyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java similarity index 95% rename from moduliths-core/src/test/java/org/moduliths/model/ModuleDependencyUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java index 6d1df0f2..9c7c0677 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/ModuleDependencyUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java @@ -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; diff --git a/moduliths-core/src/test/java/org/moduliths/model/ModuleDetectionStrategyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java similarity index 97% rename from moduliths-core/src/test/java/org/moduliths/model/ModuleDetectionStrategyUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java index 7e36bc35..a739c266 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/ModuleDetectionStrategyUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDetectionStrategyUnitTest.java @@ -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.*; diff --git a/moduliths-core/src/test/java/org/moduliths/model/ModuleUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java similarity index 98% rename from moduliths-core/src/test/java/org/moduliths/model/ModuleUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java index c8c2944e..3db90de2 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/ModuleUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleUnitTest.java @@ -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.*; diff --git a/moduliths-core/src/test/java/org/moduliths/model/ModulithMetadataUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java similarity index 95% rename from moduliths-core/src/test/java/org/moduliths/model/ModulithMetadataUnitTest.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java index e19c010d..38a99961 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/ModulithMetadataUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java @@ -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; /** diff --git a/moduliths-core/src/test/java/org/moduliths/model/TestUtils.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java similarity index 98% rename from moduliths-core/src/test/java/org/moduliths/model/TestUtils.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java index 58542027..1b3b0ee4 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/TestUtils.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/TestUtils.java @@ -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.*; diff --git a/moduliths-core/src/test/java/org/moduliths/model/ViolationsUnitTests.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java similarity index 96% rename from moduliths-core/src/test/java/org/moduliths/model/ViolationsUnitTests.java rename to spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java index 294a64b7..7731930a 100644 --- a/moduliths-core/src/test/java/org/moduliths/model/ViolationsUnitTests.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ViolationsUnitTests.java @@ -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.*; diff --git a/moduliths-core/src/test/resources/application.properties b/spring-modulith-core/src/test/resources/application.properties similarity index 100% rename from moduliths-core/src/test/resources/application.properties rename to spring-modulith-core/src/test/resources/application.properties diff --git a/moduliths-core/src/test/resources/logback.xml b/spring-modulith-core/src/test/resources/logback.xml similarity index 100% rename from moduliths-core/src/test/resources/logback.xml rename to spring-modulith-core/src/test/resources/logback.xml diff --git a/moduliths-docs/pom.xml b/spring-modulith-docs/pom.xml similarity index 80% rename from moduliths-docs/pom.xml rename to spring-modulith-docs/pom.xml index 84132c3e..8e1714d7 100644 --- a/moduliths-docs/pom.xml +++ b/spring-modulith-docs/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Docs - moduliths-docs + Spring Modulith - Docs + spring-modulith-docs - org.moduliths.docs + org.springframework.modulith.docs 1.3.0 @@ -20,13 +20,13 @@ ${project.groupId} - moduliths-core + spring-modulith-core ${project.version} ${project.groupId} - moduliths-sample + spring-modulith-sample ${project.version} test diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/Asciidoctor.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java similarity index 93% rename from moduliths-docs/src/main/java/org/moduliths/docs/Asciidoctor.java rename to spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java index 92310b24..aafb37d9 100644 --- a/moduliths-docs/src/main/java/org/moduliths/docs/Asciidoctor.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java @@ -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; diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/CodeReplacingDocumentationSource.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/CodeReplacingDocumentationSource.java similarity index 88% rename from moduliths-docs/src/main/java/org/moduliths/docs/CodeReplacingDocumentationSource.java rename to spring-modulith-docs/src/main/java/org/springframework/modulith/docs/CodeReplacingDocumentationSource.java index 19749c67..089cc870 100644 --- a/moduliths-docs/src/main/java/org/moduliths/docs/CodeReplacingDocumentationSource.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/CodeReplacingDocumentationSource.java @@ -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 getDocumentation(JavaMethod method) { diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/ConfigurationProperties.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java similarity index 96% rename from moduliths-docs/src/main/java/org/moduliths/docs/ConfigurationProperties.java rename to spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java index 097846c7..93f12a74 100644 --- a/moduliths-docs/src/main/java/org/moduliths/docs/ConfigurationProperties.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java @@ -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; diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/DocumentationSource.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/DocumentationSource.java similarity index 96% rename from moduliths-docs/src/main/java/org/moduliths/docs/DocumentationSource.java rename to spring-modulith-docs/src/main/java/org/springframework/modulith/docs/DocumentationSource.java index a1bdf04c..2d5e8bfa 100644 --- a/moduliths-docs/src/main/java/org/moduliths/docs/DocumentationSource.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/DocumentationSource.java @@ -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; diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/Documenter.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java similarity index 97% rename from moduliths-docs/src/main/java/org/moduliths/docs/Documenter.java rename to spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java index fe7cd6bd..608ed4bb 100644 --- a/moduliths-docs/src/main/java/org/moduliths/docs/Documenter.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java @@ -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 ALL_TYPES = Arrays.stream(DependencyType.values()).collect(Collectors.toSet()); + private static final Set ALL_TYPES = Arrays.stream(DependencyType.values()).collect(Collectors.toSet()); private final Set dependencyTypes; diff --git a/moduliths-docs/src/main/java/org/moduliths/docs/SpringAutoRestDocsDocumentationSource.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/SpringAutoRestDocsDocumentationSource.java similarity index 89% rename from moduliths-docs/src/main/java/org/moduliths/docs/SpringAutoRestDocsDocumentationSource.java rename to spring-modulith-docs/src/main/java/org/springframework/modulith/docs/SpringAutoRestDocsDocumentationSource.java index eedb7eaf..118ead7c 100644 --- a/moduliths-docs/src/main/java/org/moduliths/docs/SpringAutoRestDocsDocumentationSource.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/SpringAutoRestDocsDocumentationSource.java @@ -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 getDocumentation(JavaMethod method) { diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/package-info.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/package-info.java new file mode 100644 index 00000000..35933587 --- /dev/null +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.docs; diff --git a/moduliths-docs/src/test/java/org/moduliths/docs/AsciidoctorUnitTests.java b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java similarity index 81% rename from moduliths-docs/src/test/java/org/moduliths/docs/AsciidoctorUnitTests.java rename to spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java index e8d21982..4122db47 100644 --- a/moduliths-docs/src/test/java/org/moduliths/docs/AsciidoctorUnitTests.java +++ b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java @@ -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")); } diff --git a/moduliths-docs/src/test/java/org/moduliths/docs/DocumenterTest.java b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/DocumenterTest.java similarity index 89% rename from moduliths-docs/src/test/java/org/moduliths/docs/DocumenterTest.java rename to spring-modulith-docs/src/test/java/org/springframework/modulith/docs/DocumenterTest.java index dfdf9062..244d1fd1 100644 --- a/moduliths-docs/src/test/java/org/moduliths/docs/DocumenterTest.java +++ b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/DocumenterTest.java @@ -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 { diff --git a/moduliths-docs/src/test/resources/META-INF/spring-configuration-metadata.json b/spring-modulith-docs/src/test/resources/META-INF/spring-configuration-metadata.json similarity index 81% rename from moduliths-docs/src/test/resources/META-INF/spring-configuration-metadata.json rename to spring-modulith-docs/src/test/resources/META-INF/spring-configuration-metadata.json index 2497677f..802be727 100644 --- a/moduliths-docs/src/test/resources/META-INF/spring-configuration-metadata.json +++ b/spring-modulith-docs/src/test/resources/META-INF/spring-configuration-metadata.json @@ -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", diff --git a/moduliths-docs/src/test/resources/logback.xml b/spring-modulith-docs/src/test/resources/logback.xml similarity index 100% rename from moduliths-docs/src/test/resources/logback.xml rename to spring-modulith-docs/src/test/resources/logback.xml diff --git a/moduliths-events/pom.xml b/spring-modulith-events/pom.xml similarity index 77% rename from moduliths-events/pom.xml rename to spring-modulith-events/pom.xml index 215972d5..531e173d 100644 --- a/moduliths-events/pom.xml +++ b/spring-modulith-events/pom.xml @@ -2,24 +2,24 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - moduliths-events + spring-modulith-events pom - Moduliths - Events + Spring Modulith - Events - moduliths-events-core - moduliths-events-jpa - moduliths-events-jpa-jakarta - moduliths-events-jackson - moduliths-events-tests - moduliths-events-starter + spring-modulith-events-core + spring-modulith-events-jpa + spring-modulith-events-jpa-jakarta + spring-modulith-events-jackson + spring-modulith-events-tests + spring-modulith-events-starter diff --git a/moduliths-events/readme.adoc b/spring-modulith-events/readme.adoc similarity index 100% rename from moduliths-events/readme.adoc rename to spring-modulith-events/readme.adoc diff --git a/moduliths-events/moduliths-events-core/pom.xml b/spring-modulith-events/spring-modulith-events-core/pom.xml similarity index 53% rename from moduliths-events/moduliths-events-core/pom.xml rename to spring-modulith-events/spring-modulith-events-core/pom.xml index 7205e60c..b0b63e82 100644 --- a/moduliths-events/moduliths-events-core/pom.xml +++ b/spring-modulith-events/spring-modulith-events-core/pom.xml @@ -2,18 +2,18 @@ 4.0.0 - org.moduliths - moduliths-events - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith-events + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Events - Core + Spring Modulith - Events - Core - moduliths-events-core + spring-modulith-events-core - org.moduliths.events.core + org.springframework.modulith.events.core diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/CompletableEventPublication.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/CompletableEventPublication.java similarity index 97% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/CompletableEventPublication.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/CompletableEventPublication.java index 8dd1874a..68906e05 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/CompletableEventPublication.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/CompletableEventPublication.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/DefaultEventPublication.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java similarity index 97% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/DefaultEventPublication.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java index 0a56e5fa..f1e30d42 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/DefaultEventPublication.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublication.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java similarity index 98% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublication.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java index 6ed79700..b6532172 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublication.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java similarity index 97% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublicationRegistry.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java index e884298c..580f3d22 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventSerializer.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java similarity index 96% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventSerializer.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java index 669233f3..36d2f2ef 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/EventSerializer.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java @@ -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 diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/PublicationTargetIdentifier.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java similarity index 95% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/PublicationTargetIdentifier.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java index 90a42e5e..d1696028 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/PublicationTargetIdentifier.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EnablePersistentDomainEvents.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java similarity index 93% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EnablePersistentDomainEvents.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java index 554dc4c8..587b7e4b 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EnablePersistentDomainEvents.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfiguration.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java similarity index 78% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfiguration.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java index 75dd56a4..2a0acc10 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java @@ -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; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfigurationExtension.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfigurationExtension.java similarity index 93% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfigurationExtension.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfigurationExtension.java index e9caf697..bbeecdb7 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventPublicationConfigurationExtension.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfigurationExtension.java @@ -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 diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventSerializationConfigurationExtension.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventSerializationConfigurationExtension.java similarity index 93% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventSerializationConfigurationExtension.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventSerializationConfigurationExtension.java index 9307dadb..4d95c163 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/config/EventSerializationConfigurationExtension.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventSerializationConfigurationExtension.java @@ -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 diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/package-info.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/package-info.java new file mode 100644 index 00000000..19dc2478 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events.config; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/package-info.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/package-info.java new file mode 100644 index 00000000..068392ef --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events; diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/CompletionRegisteringBeanPostProcessor.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java similarity index 95% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/CompletionRegisteringBeanPostProcessor.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java index 3761705d..381d353e 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/CompletionRegisteringBeanPostProcessor.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.support; +package org.springframework.modulith.events.support; import lombok.AllArgsConstructor; import lombok.Getter; @@ -28,8 +28,8 @@ import java.util.function.Supplier; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.moduliths.events.EventPublicationRegistry; -import org.moduliths.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.AopProxyUtils; import org.springframework.aop.framework.ProxyFactory; @@ -47,7 +47,7 @@ import org.springframework.util.ReflectionUtils.MethodCallback; /** * {@link BeanPostProcessor} that will add a - * {@link org.moduliths.events.support.CompletionRegisteringBeanPostProcessor.ProxyCreatingMethodCallback.CompletionRegisteringMethodInterceptor} + * {@link CompletionRegisteringBeanPostProcessor.ProxyCreatingMethodCallback.CompletionRegisteringMethodInterceptor} * to the bean in case it carries a {@link TransactionalEventListener} annotation so that the successful invocation of * those methods mark the event publication to those listeners as completed. * diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/MapEventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/MapEventPublicationRegistry.java similarity index 87% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/MapEventPublicationRegistry.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/MapEventPublicationRegistry.java index 0a3b1e37..0a901593 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/MapEventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/MapEventPublicationRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.support; +package org.springframework.modulith.events.support; import lombok.Value; @@ -22,10 +22,10 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.moduliths.events.CompletableEventPublication; -import org.moduliths.events.EventPublication; -import org.moduliths.events.EventPublicationRegistry; -import org.moduliths.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.CompletableEventPublication; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; /** * Map based {@link EventPublicationRegistry}, for testing purposes only. diff --git a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/PersistentApplicationEventMulticaster.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticaster.java similarity index 97% rename from moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/PersistentApplicationEventMulticaster.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticaster.java index 4d2135f3..4824ae1c 100644 --- a/moduliths-events/moduliths-events-core/src/main/java/org/moduliths/events/support/PersistentApplicationEventMulticaster.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticaster.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.support; +package org.springframework.modulith.events.support; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -26,9 +26,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.moduliths.events.EventPublication; -import org.moduliths.events.EventPublicationRegistry; -import org.moduliths.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/package-info.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/package-info.java new file mode 100644 index 00000000..c2b6e6c0 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events.support; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories b/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..0e2890c4 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + org.springframework.modulith.events.config.EventPublicationConfiguration diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..11cddd87 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.modulith.events.config.EventPublicationConfiguration diff --git a/moduliths-events/moduliths-events-core/src/test/java/org/moduliths/events/CompletableEventPublicationUnitTest.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/CompletableEventPublicationUnitTest.java similarity index 97% rename from moduliths-events/moduliths-events-core/src/test/java/org/moduliths/events/CompletableEventPublicationUnitTest.java rename to spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/CompletableEventPublicationUnitTest.java index dbcd64b8..047818d9 100644 --- a/moduliths-events/moduliths-events-core/src/test/java/org/moduliths/events/CompletableEventPublicationUnitTest.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/CompletableEventPublicationUnitTest.java @@ -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 static org.assertj.core.api.Assertions.*; diff --git a/moduliths-events/moduliths-events-core/src/test/java/org/moduliths/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java similarity index 96% rename from moduliths-events/moduliths-events-core/src/test/java/org/moduliths/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java rename to spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java index 1792605f..581f53f5 100644 --- a/moduliths-events/moduliths-events-core/src/test/java/org/moduliths/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.support; +package org.springframework.modulith.events.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -22,7 +22,7 @@ import static org.mockito.Mockito.*; import java.util.function.BiConsumer; import org.junit.jupiter.api.Test; -import org.moduliths.events.EventPublicationRegistry; +import org.springframework.modulith.events.EventPublicationRegistry; import org.springframework.aop.framework.Advised; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.event.EventListener; diff --git a/moduliths-events/moduliths-events-jackson/pom.xml b/spring-modulith-events/spring-modulith-events-jackson/pom.xml similarity index 57% rename from moduliths-events/moduliths-events-jackson/pom.xml rename to spring-modulith-events/spring-modulith-events-jackson/pom.xml index 06765e2f..0b7d1b91 100644 --- a/moduliths-events/moduliths-events-jackson/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jackson/pom.xml @@ -2,25 +2,25 @@ 4.0.0 - org.moduliths - moduliths-events - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith-events + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Events - Jackson serializer - moduliths-events-jackson + Spring Modulith - Events - Jackson serializer + spring-modulith-events-jackson - org.moduliths.events.jackson + org.springframework.modulith.events.jackson - org.moduliths - moduliths-events-core + org.springframework.experimental + spring-modulith-events-core ${project.version} diff --git a/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/JacksonEventSerializationConfiguration.java b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java similarity index 91% rename from moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/JacksonEventSerializationConfiguration.java rename to spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java index 9f9eaad2..032091b4 100644 --- a/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/JacksonEventSerializationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jackson; +package org.springframework.modulith.events.jackson; import lombok.RequiredArgsConstructor; -import org.moduliths.events.config.EventSerializationConfigurationExtension; +import org.springframework.modulith.events.config.EventSerializationConfigurationExtension; import org.springframework.beans.factory.ObjectProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/JacksonEventSerializer.java b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java similarity index 93% rename from moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/JacksonEventSerializer.java rename to spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java index 6e8d0941..6314f744 100644 --- a/moduliths-events/moduliths-events-jackson/src/main/java/org/moduliths/events/jackson/JacksonEventSerializer.java +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jackson; +package org.springframework.modulith.events.jackson; import lombok.RequiredArgsConstructor; import java.io.IOException; import java.util.function.Supplier; -import org.moduliths.events.EventSerializer; +import org.springframework.modulith.events.EventSerializer; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java new file mode 100644 index 00000000..577f08f0 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events.jackson; diff --git a/spring-modulith-events/spring-modulith-events-jackson/src/main/resources/META-INF/spring.factories b/spring-modulith-events/spring-modulith-events-jackson/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..26cf5765 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/resources/META-INF/spring.factories @@ -0,0 +1,5 @@ +org.springframework.modulith.events.config.EventSerializationConfigurationExtension=\ + org.springframework.modulith.events.jackson.JacksonEventSerializationConfiguration + +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + org.springframework.modulith.events.jackson.JacksonEventSerializationConfiguration diff --git a/spring-modulith-events/spring-modulith-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-modulith-events/spring-modulith-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..726c6c5e --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.modulith.events.jackson.JacksonEventSerializationConfiguration diff --git a/moduliths-events/moduliths-events-jpa-jakarta/pom.xml b/spring-modulith-events/spring-modulith-events-jpa-jakarta/pom.xml similarity index 83% rename from moduliths-events/moduliths-events-jpa-jakarta/pom.xml rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/pom.xml index 4b5053e2..73c8f27c 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/pom.xml @@ -2,18 +2,18 @@ 4.0.0 - org.moduliths - moduliths-events - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith-events + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Events - Jakarta JPA-based registry - moduliths-events-jpa-jakarta + Spring Modulith - Events - Jakarta JPA-based registry + spring-modulith-events-jpa-jakarta 17 - org.moduliths.events.jpa.jakarta + org.springframework.modulith.events.jpa.jakarta 6.0.0-M1 @@ -21,7 +21,7 @@ ${project.groupId} - moduliths-events-core + spring-modulith-events-core ${project.version} diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublication.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublication.java similarity index 97% rename from moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublication.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublication.java index 8880bff9..92425f50 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublication.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfiguration.java similarity index 94% rename from moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationAutoConfiguration.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfiguration.java index 6da461ea..058bb5d4 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import org.springframework.boot.autoconfigure.AutoConfigurationPackage; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationConfiguration.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java similarity index 87% rename from moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationConfiguration.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java index 132b6456..59affa96 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import lombok.RequiredArgsConstructor; import jakarta.persistence.EntityManager; -import org.moduliths.events.EventSerializer; -import org.moduliths.events.config.EventPublicationConfigurationExtension; +import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.config.EventPublicationConfigurationExtension; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java similarity index 93% rename from moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRegistry.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java index 17966221..82c01e3d 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -25,11 +25,11 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.moduliths.events.CompletableEventPublication; -import org.moduliths.events.EventPublication; -import org.moduliths.events.EventPublicationRegistry; -import org.moduliths.events.EventSerializer; -import org.moduliths.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.CompletableEventPublication; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.beans.factory.DisposableBean; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRepository.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java similarity index 98% rename from moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRepository.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java index d4cd6083..57155e4c 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRepository.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; diff --git a/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/package-info.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/package-info.java new file mode 100644 index 00000000..9a6858fd --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/java/org/springframework/modulith/events/jpa/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events.jpa; diff --git a/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 00000000..4ebaf768 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.spring-modulith-events:/spring-modulith-events-jpa-[\\w-\\.]+\.jar diff --git a/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring.factories b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..66c6805f --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring.factories @@ -0,0 +1,6 @@ +org.springframework.modulith.events.config.EventPublicationConfigurationExtension=\ + org.springframework.modulith.events.jpa.JpaEventPublicationConfiguration + +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + org.springframework.modulith.events.jpa.JpaEventPublicationAutoConfiguration,\ + org.springframework.modulith.events.jpa.JpaEventPublicationConfiguration diff --git a/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories new file mode 100644 index 00000000..dc43aae2 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories @@ -0,0 +1,2 @@ +org.springframework.modulith.events.jpa.JpaEventPublicationAutoConfiguration +org.springframework.modulith.events.jpa.JpaEventPublicationConfiguration diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/test/java/org/moduliths/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java similarity index 95% rename from moduliths-events/moduliths-events-jpa-jakarta/src/test/java/org/moduliths/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java index c6141c6b..5be78a68 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/test/java/org/moduliths/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -25,7 +25,7 @@ import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.moduliths.events.EventSerializer; +import org.springframework.modulith.events.EventSerializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/test/java/org/moduliths/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java similarity index 97% rename from moduliths-events/moduliths-events-jpa-jakarta/src/test/java/org/moduliths/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java index a5e513cc..870d5a58 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/test/java/org/moduliths/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -28,7 +28,7 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.moduliths.events.EventSerializer; +import org.springframework.modulith.events.EventSerializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/moduliths-events/moduliths-events-jpa/src/test/resources/logback.xml b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/resources/logback.xml similarity index 82% rename from moduliths-events/moduliths-events-jpa/src/test/resources/logback.xml rename to spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/resources/logback.xml index bd79b4ab..1200a71e 100644 --- a/moduliths-events/moduliths-events-jpa/src/test/resources/logback.xml +++ b/spring-modulith-events/spring-modulith-events-jpa-jakarta/src/test/resources/logback.xml @@ -11,6 +11,6 @@ - + diff --git a/moduliths-events/moduliths-events-jpa/pom.xml b/spring-modulith-events/spring-modulith-events-jpa/pom.xml similarity index 78% rename from moduliths-events/moduliths-events-jpa/pom.xml rename to spring-modulith-events/spring-modulith-events-jpa/pom.xml index 4f014c49..6d8031ac 100644 --- a/moduliths-events/moduliths-events-jpa/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jpa/pom.xml @@ -2,24 +2,24 @@ 4.0.0 - org.moduliths - moduliths-events - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith-events + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Events - JPA-based registry - moduliths-events-jpa + Spring Modulith - Events - JPA-based registry + spring-modulith-events-jpa - org.moduliths.events.jpa + org.springframework.modulith.events.jpa ${project.groupId} - moduliths-events-core + spring-modulith-events-core ${project.version} diff --git a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublication.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublication.java similarity index 97% rename from moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublication.java rename to spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublication.java index 785dae9b..74f501a9 100644 --- a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublication.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import lombok.AccessLevel; import lombok.Builder; diff --git a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfiguration.java similarity index 94% rename from moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationAutoConfiguration.java rename to spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfiguration.java index 0d871487..d9f0384e 100644 --- a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import org.springframework.boot.autoconfigure.AutoConfigurationPackage; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationConfiguration.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java similarity index 87% rename from moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationConfiguration.java rename to spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java index 65875ba2..4b7190b1 100644 --- a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import lombok.RequiredArgsConstructor; import javax.persistence.EntityManager; -import org.moduliths.events.EventSerializer; -import org.moduliths.events.config.EventPublicationConfigurationExtension; +import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.config.EventPublicationConfigurationExtension; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java similarity index 93% rename from moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRegistry.java rename to spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java index dee0bceb..3f1df1d2 100644 --- a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -25,11 +25,11 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.moduliths.events.CompletableEventPublication; -import org.moduliths.events.EventPublication; -import org.moduliths.events.EventPublicationRegistry; -import org.moduliths.events.EventSerializer; -import org.moduliths.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.CompletableEventPublication; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.beans.factory.DisposableBean; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRepository.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java similarity index 98% rename from moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRepository.java rename to spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java index 396cc0fa..c90afe40 100644 --- a/moduliths-events/moduliths-events-jpa/src/main/java/org/moduliths/events/jpa/JpaEventPublicationRepository.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import lombok.RequiredArgsConstructor; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java new file mode 100644 index 00000000..9a6858fd --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events.jpa; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring-devtools.properties b/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 00000000..4ebaf768 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.spring-modulith-events:/spring-modulith-events-jpa-[\\w-\\.]+\.jar diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring.factories b/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..66c6805f --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring.factories @@ -0,0 +1,6 @@ +org.springframework.modulith.events.config.EventPublicationConfigurationExtension=\ + org.springframework.modulith.events.jpa.JpaEventPublicationConfiguration + +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + org.springframework.modulith.events.jpa.JpaEventPublicationAutoConfiguration,\ + org.springframework.modulith.events.jpa.JpaEventPublicationConfiguration diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..dc43aae2 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +org.springframework.modulith.events.jpa.JpaEventPublicationAutoConfiguration +org.springframework.modulith.events.jpa.JpaEventPublicationConfiguration diff --git a/moduliths-events/moduliths-events-jpa/src/test/java/org/moduliths/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java similarity index 95% rename from moduliths-events/moduliths-events-jpa/src/test/java/org/moduliths/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java rename to spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java index b405461f..ca2a59dd 100644 --- a/moduliths-events/moduliths-events-jpa/src/test/java/org/moduliths/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -26,7 +26,7 @@ import javax.persistence.TypedQuery; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.moduliths.events.EventSerializer; +import org.springframework.modulith.events.EventSerializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/moduliths-events/moduliths-events-jpa/src/test/java/org/moduliths/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java similarity index 97% rename from moduliths-events/moduliths-events-jpa/src/test/java/org/moduliths/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java rename to spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java index 6435276e..3d0ff48d 100644 --- a/moduliths-events/moduliths-events-jpa/src/test/java/org/moduliths/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.jpa; +package org.springframework.modulith.events.jpa; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -28,7 +28,7 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.moduliths.events.EventSerializer; +import org.springframework.modulith.events.EventSerializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/moduliths-events/moduliths-events-jpa-jakarta/src/test/resources/logback.xml b/spring-modulith-events/spring-modulith-events-jpa/src/test/resources/logback.xml similarity index 82% rename from moduliths-events/moduliths-events-jpa-jakarta/src/test/resources/logback.xml rename to spring-modulith-events/spring-modulith-events-jpa/src/test/resources/logback.xml index bd79b4ab..1200a71e 100644 --- a/moduliths-events/moduliths-events-jpa-jakarta/src/test/resources/logback.xml +++ b/spring-modulith-events/spring-modulith-events-jpa/src/test/resources/logback.xml @@ -11,6 +11,6 @@ - + diff --git a/moduliths-events/moduliths-events-starter/pom.xml b/spring-modulith-events/spring-modulith-events-starter/pom.xml similarity index 62% rename from moduliths-events/moduliths-events-starter/pom.xml rename to spring-modulith-events/spring-modulith-events-starter/pom.xml index e01edb49..b0dd9d24 100644 --- a/moduliths-events/moduliths-events-starter/pom.xml +++ b/spring-modulith-events/spring-modulith-events-starter/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - org.moduliths - moduliths-events - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith-events + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Events - Spring Boot Starter - moduliths-events-starter + Spring Modulith - Events - Spring Boot Starter + spring-modulith-events-starter - org.moduliths.events.starter + org.springframework.modulith.events.starter @@ -24,13 +24,13 @@ ${project.groupId} - moduliths-events-jpa + spring-modulith-events-jpa ${project.version} ${project.groupId} - moduliths-events-jackson + spring-modulith-events-jackson ${project.version} diff --git a/moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/DomainEventsAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java similarity index 91% rename from moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/DomainEventsAutoConfiguration.java rename to spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java index 1e69a3c5..eede6754 100644 --- a/moduliths-events/moduliths-events-starter/src/main/java/org/moduliths/events/starter/DomainEventsAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.events.starter; +package org.springframework.modulith.events.starter; -import org.moduliths.events.EventPublication; -import org.moduliths.events.config.EnablePersistentDomainEvents; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.config.EnablePersistentDomainEvents; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.AutoConfigureBefore; diff --git a/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/package-info.java b/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/package-info.java new file mode 100644 index 00000000..ac6801f8 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.events.starter; diff --git a/spring-modulith-events/spring-modulith-events-starter/src/main/resources/META-INF/spring.factories b/spring-modulith-events/spring-modulith-events-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..819f0759 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + org.springframework.modulith.events.starter.DomainEventsAutoConfiguration diff --git a/moduliths-events/moduliths-events-tests/pom.xml b/spring-modulith-events/spring-modulith-events-tests/pom.xml similarity index 64% rename from moduliths-events/moduliths-events-tests/pom.xml rename to spring-modulith-events/spring-modulith-events-tests/pom.xml index c8b5896b..6a7dfb7e 100644 --- a/moduliths-events/moduliths-events-tests/pom.xml +++ b/spring-modulith-events/spring-modulith-events-tests/pom.xml @@ -1,35 +1,35 @@ 4.0.0 - org.moduliths - moduliths-events - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith-events + 0.1.0-SNAPSHOT - Moduliths - Events - Integration tests - moduliths-events-tests + Spring Modulith - Events - Integration tests + spring-modulith-events-tests - org.moduliths.events.integrationtests + org.springframework.modulith.events.integrationtests ${project.groupId} - moduliths-events-core + spring-modulith-events-core ${project.version} ${project.groupId} - moduliths-events-jpa + spring-modulith-events-jpa ${project.version} ${project.groupId} - moduliths-events-jackson + spring-modulith-events-jackson ${project.version} diff --git a/moduliths-events/moduliths-events-tests/src/test/java/example/events/InfrastructureConfiguration.java b/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/InfrastructureConfiguration.java similarity index 97% rename from moduliths-events/moduliths-events-tests/src/test/java/example/events/InfrastructureConfiguration.java rename to spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/InfrastructureConfiguration.java index 9d44400e..cfb86bd4 100644 --- a/moduliths-events/moduliths-events-tests/src/test/java/example/events/InfrastructureConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/InfrastructureConfiguration.java @@ -45,7 +45,7 @@ class InfrastructureConfiguration { LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean(); factoryBean.setDataSource(dataSource); factoryBean.setJpaVendorAdapter(adapter); - factoryBean.setPackagesToScan("org.moduliths.events.jpa"); + factoryBean.setPackagesToScan("org.springframework.modulith.events.jpa"); return factoryBean; } diff --git a/moduliths-events/moduliths-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java b/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java similarity index 93% rename from moduliths-events/moduliths-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java rename to spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java index 98b855ba..0f133b0b 100644 --- a/moduliths-events/moduliths-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java +++ b/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java @@ -21,11 +21,11 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; -import org.moduliths.events.EventPublication; -import org.moduliths.events.EventPublicationRegistry; -import org.moduliths.events.PublicationTargetIdentifier; -import org.moduliths.events.config.EnablePersistentDomainEvents; -import org.moduliths.events.support.PersistentApplicationEventMulticaster; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.config.EnablePersistentDomainEvents; +import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/moduliths-events/moduliths-events-tests/src/test/resources/logback.xml b/spring-modulith-events/spring-modulith-events-tests/src/test/resources/logback.xml similarity index 83% rename from moduliths-events/moduliths-events-tests/src/test/resources/logback.xml rename to spring-modulith-events/spring-modulith-events-tests/src/test/resources/logback.xml index 08efe7ce..af632ee5 100644 --- a/moduliths-events/moduliths-events-tests/src/test/resources/logback.xml +++ b/spring-modulith-events/spring-modulith-events-tests/src/test/resources/logback.xml @@ -8,7 +8,7 @@ - + diff --git a/moduliths-integration-test/pom.xml b/spring-modulith-integration-test/pom.xml similarity index 67% rename from moduliths-integration-test/pom.xml rename to spring-modulith-integration-test/pom.xml index 0113965c..e61e139d 100644 --- a/moduliths-integration-test/pom.xml +++ b/spring-modulith-integration-test/pom.xml @@ -2,38 +2,38 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Integration Tests - moduliths-integration-test + Spring Modulith - Integration Tests + spring-modulith-integration-test - org.moduliths.integrationtests + org.springframework.modulith.integrationtests ${project.groupId} - moduliths-test + spring-modulith-test ${project.version} test ${project.groupId} - moduliths-sample + spring-modulith-sample ${project.version} test ${project.groupId} - moduliths-docs + spring-modulith-docs ${project.version} test diff --git a/moduliths-integration-test/src/test/java/org/moduliths/docs/DocumenterUnitTests.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java similarity index 72% rename from moduliths-integration-test/src/test/java/org/moduliths/docs/DocumenterUnitTests.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java index 11bbf9f5..606dcc7e 100644 --- a/moduliths-integration-test/src/test/java/org/moduliths/docs/DocumenterUnitTests.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java @@ -13,19 +13,15 @@ * 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 static org.moduliths.docs.Documenter.CanvasOptions.Grouping.*; import java.util.List; import org.junit.jupiter.api.Test; -import org.moduliths.docs.Documenter.CanvasOptions; -import org.moduliths.docs.Documenter.CanvasOptions.Grouping; -import org.moduliths.docs.Documenter.CanvasOptions.Groupings; -import org.moduliths.model.Modules; -import org.moduliths.model.SpringBean; +import org.springframework.modulith.model.Modules; +import org.springframework.modulith.model.SpringBean; import com.acme.myproject.Application; import com.acme.myproject.stereotypes.Stereotypes; @@ -43,13 +39,13 @@ class DocumenterUnitTests { @Test void groupsSpringBeansByArchitecturallyEvidentType() { - Groupings result = CanvasOptions.defaults() - .groupingBy(of("Representations", nameMatching(".*Representations"))) - .groupingBy(of("Interface implementations", subtypeOf(Stereotypes.SomeAppInterface.class))) + Documenter.CanvasOptions.Groupings result = Documenter.CanvasOptions.defaults() + .groupingBy(Documenter.CanvasOptions.Grouping.of("Representations", Documenter.CanvasOptions.Grouping.nameMatching(".*Representations"))) + .groupingBy(Documenter.CanvasOptions.Grouping.of("Interface implementations", Documenter.CanvasOptions.Grouping.subtypeOf(Stereotypes.SomeAppInterface.class))) .groupBeans(modules.getModuleByName("stereotypes").orElseThrow(RuntimeException::new)); assertThat(result.keySet()) - .extracting(Grouping::getName) + .extracting(Documenter.CanvasOptions.Grouping::getName) .containsExactlyInAnyOrder("Controllers", "Services", "Repositories", "Event listeners", "Configuration properties", "Representations", "Interface implementations", "Others"); @@ -73,8 +69,8 @@ class DocumenterUnitTests { Documenter documenter = new Documenter(modules); - CanvasOptions options = CanvasOptions.defaults() // - .groupingBy(of("Representations", nameMatching(".*Representations"))); + Documenter.CanvasOptions options = Documenter.CanvasOptions.defaults() // + .groupingBy(Documenter.CanvasOptions.Grouping.of("Representations", Documenter.CanvasOptions.Grouping.nameMatching(".*Representations"))); assertThatNoException().isThrownBy(() -> { modules.forEach(it -> documenter.toModuleCanvas(it, options)); diff --git a/moduliths-integration-test/src/test/java/org/moduliths/model/JavaPackageUnitTests.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/JavaPackageUnitTests.java similarity index 97% rename from moduliths-integration-test/src/test/java/org/moduliths/model/JavaPackageUnitTests.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/JavaPackageUnitTests.java index 57ea593f..ed705d68 100644 --- a/moduliths-integration-test/src/test/java/org/moduliths/model/JavaPackageUnitTests.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/JavaPackageUnitTests.java @@ -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.*; diff --git a/moduliths-integration-test/src/test/java/org/moduliths/model/ModulesIntegrationTest.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ModulesIntegrationTest.java similarity index 97% rename from moduliths-integration-test/src/test/java/org/moduliths/model/ModulesIntegrationTest.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ModulesIntegrationTest.java index 27f099ab..1641d74a 100644 --- a/moduliths-integration-test/src/test/java/org/moduliths/model/ModulesIntegrationTest.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ModulesIntegrationTest.java @@ -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.*; @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.jupiter.api.Test; -import org.moduliths.model.Module.DependencyType; +import org.springframework.modulith.model.Module.DependencyType; import com.acme.myproject.Application; import com.acme.myproject.complex.internal.FirstTypeBasedPort; diff --git a/moduliths-integration-test/src/test/java/org/moduliths/model/TestModuleDetectionStrategy.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java similarity index 85% rename from moduliths-integration-test/src/test/java/org/moduliths/model/TestModuleDetectionStrategy.java rename to spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java index bca85891..3941b01c 100644 --- a/moduliths-integration-test/src/test/java/org/moduliths/model/TestModuleDetectionStrategy.java +++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java @@ -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.stream.Stream; @@ -28,7 +28,7 @@ class TestModuleDetectionStrategy implements ModuleDetectionStrategy { /* * (non-Javadoc) - * @see org.moduliths.model.ModuleDetectionStrategy#getModuleBasePackages(org.moduliths.model.JavaPackage) + * @see org.springframework.modulith.model.ModuleDetectionStrategy#getModuleBasePackages(org.springframework.modulith.model.JavaPackage) */ @Override public Stream getModuleBasePackages(JavaPackage basePackage) { diff --git a/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories b/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories new file mode 100644 index 00000000..ae20d68b --- /dev/null +++ b/spring-modulith-integration-test/src/test/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.modulith.model.ModuleDetectionStrategy=\ + org.springframework.modulith.model.TestModuleDetectionStrategy diff --git a/moduliths-integration-test/src/test/resources/logback.xml b/spring-modulith-integration-test/src/test/resources/logback.xml similarity index 82% rename from moduliths-integration-test/src/test/resources/logback.xml rename to spring-modulith-integration-test/src/test/resources/logback.xml index 0cd7abba..509f2604 100644 --- a/moduliths-integration-test/src/test/resources/logback.xml +++ b/spring-modulith-integration-test/src/test/resources/logback.xml @@ -7,7 +7,7 @@ - + diff --git a/moduliths-moments/pom.xml b/spring-modulith-moments/pom.xml similarity index 76% rename from moduliths-moments/pom.xml rename to spring-modulith-moments/pom.xml index 3e0ae2a3..e84db0f8 100644 --- a/moduliths-moments/pom.xml +++ b/spring-modulith-moments/pom.xml @@ -2,16 +2,16 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT - Moduliths - Moments - moduliths-moments + Spring Modulith - Moments + spring-modulith-moments - org.moduliths.moments + org.springframework.modulith.moments diff --git a/moduliths-moments/readme.adoc b/spring-modulith-moments/readme.adoc similarity index 96% rename from moduliths-moments/readme.adoc rename to spring-modulith-moments/readme.adoc index 5af03278..6c309232 100644 --- a/moduliths-moments/readme.adoc +++ b/spring-modulith-moments/readme.adoc @@ -19,8 +19,8 @@ Moments will auto-activate in a Spring Boot application if you put it on the cla [source, xml] ---- - org.moduliths - moduliths-moments + org.springframework.experimental + spring-modulith-moments … ---- diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/DayHasPassed.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/DayHasPassed.java similarity index 95% rename from moduliths-moments/src/main/java/org/moduliths/moments/DayHasPassed.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/DayHasPassed.java index 8a8a99d9..c2ec218c 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/DayHasPassed.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/DayHasPassed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.Value; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/HourHasPassed.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/HourHasPassed.java similarity index 95% rename from moduliths-moments/src/main/java/org/moduliths/moments/HourHasPassed.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/HourHasPassed.java index 29f8f482..cb45f2a5 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/HourHasPassed.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/HourHasPassed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.Value; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/MonthHasPassed.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/MonthHasPassed.java similarity index 95% rename from moduliths-moments/src/main/java/org/moduliths/moments/MonthHasPassed.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/MonthHasPassed.java index 93d41e2f..f0567a6e 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/MonthHasPassed.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/MonthHasPassed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.Value; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/Quarter.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/Quarter.java similarity index 97% rename from moduliths-moments/src/main/java/org/moduliths/moments/Quarter.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/Quarter.java index a873e71a..d0b09d9d 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/Quarter.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/Quarter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import static java.time.MonthDay.*; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/QuarterHasPassed.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/QuarterHasPassed.java similarity index 98% rename from moduliths-moments/src/main/java/org/moduliths/moments/QuarterHasPassed.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/QuarterHasPassed.java index 3335933f..3375d84d 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/QuarterHasPassed.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/QuarterHasPassed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.NonNull; import lombok.Value; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/ShiftedQuarter.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/ShiftedQuarter.java similarity index 98% rename from moduliths-moments/src/main/java/org/moduliths/moments/ShiftedQuarter.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/ShiftedQuarter.java index 270422ca..746d191e 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/ShiftedQuarter.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/ShiftedQuarter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.AccessLevel; import lombok.Getter; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/WeekHasPassed.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/WeekHasPassed.java similarity index 98% rename from moduliths-moments/src/main/java/org/moduliths/moments/WeekHasPassed.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/WeekHasPassed.java index 12232312..c47a0e80 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/WeekHasPassed.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/WeekHasPassed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.AccessLevel; import lombok.Getter; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/YearHasPassed.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/YearHasPassed.java similarity index 97% rename from moduliths-moments/src/main/java/org/moduliths/moments/YearHasPassed.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/YearHasPassed.java index 4a34414f..63965416 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/YearHasPassed.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/YearHasPassed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import lombok.Value; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/autoconfigure/MomentsAutoConfiguration.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java similarity index 89% rename from moduliths-moments/src/main/java/org/moduliths/moments/autoconfigure/MomentsAutoConfiguration.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java index c45a4394..08e37c81 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/autoconfigure/MomentsAutoConfiguration.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments.autoconfigure; +package org.springframework.modulith.moments.autoconfigure; import java.time.Clock; -import org.moduliths.moments.support.Moments; -import org.moduliths.moments.support.MomentsProperties; -import org.moduliths.moments.support.TimeMachine; +import org.springframework.modulith.moments.support.Moments; +import org.springframework.modulith.moments.support.MomentsProperties; +import org.springframework.modulith.moments.support.TimeMachine; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/package-info.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/package-info.java new file mode 100644 index 00000000..500efc9f --- /dev/null +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/package-info.java @@ -0,0 +1,2 @@ +@org.springframework.lang.NonNullApi +package org.springframework.modulith.moments; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/support/Moments.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java similarity index 88% rename from moduliths-moments/src/main/java/org/moduliths/moments/support/Moments.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java index 6de3f9c8..a3a89a85 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/support/Moments.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments.support; +package org.springframework.modulith.moments.support; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -30,13 +30,13 @@ import java.time.YearMonth; import java.time.temporal.ChronoUnit; import java.time.temporal.WeekFields; -import org.moduliths.moments.DayHasPassed; -import org.moduliths.moments.HourHasPassed; -import org.moduliths.moments.MonthHasPassed; -import org.moduliths.moments.QuarterHasPassed; -import org.moduliths.moments.ShiftedQuarter; -import org.moduliths.moments.WeekHasPassed; -import org.moduliths.moments.YearHasPassed; +import org.springframework.modulith.moments.DayHasPassed; +import org.springframework.modulith.moments.HourHasPassed; +import org.springframework.modulith.moments.MonthHasPassed; +import org.springframework.modulith.moments.QuarterHasPassed; +import org.springframework.modulith.moments.ShiftedQuarter; +import org.springframework.modulith.moments.WeekHasPassed; +import org.springframework.modulith.moments.YearHasPassed; import org.springframework.context.ApplicationEventPublisher; import org.springframework.scheduling.annotation.Scheduled; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/support/MomentsProperties.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/MomentsProperties.java similarity index 96% rename from moduliths-moments/src/main/java/org/moduliths/moments/support/MomentsProperties.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/MomentsProperties.java index 781bf596..e5d84e5b 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/support/MomentsProperties.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/MomentsProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments.support; +package org.springframework.modulith.moments.support; import lombok.AccessLevel; import lombok.Getter; @@ -29,8 +29,8 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -import org.moduliths.moments.Quarter; -import org.moduliths.moments.ShiftedQuarter; +import org.springframework.modulith.moments.Quarter; +import org.springframework.modulith.moments.ShiftedQuarter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.boot.context.properties.bind.DefaultValue; diff --git a/moduliths-moments/src/main/java/org/moduliths/moments/support/TimeMachine.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/TimeMachine.java similarity index 88% rename from moduliths-moments/src/main/java/org/moduliths/moments/support/TimeMachine.java rename to spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/TimeMachine.java index c1952308..ecc7833e 100644 --- a/moduliths-moments/src/main/java/org/moduliths/moments/support/TimeMachine.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/TimeMachine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments.support; +package org.springframework.modulith.moments.support; import java.time.Clock; import java.time.Duration; @@ -45,7 +45,7 @@ public class TimeMachine extends Moments { /* * (non-Javadoc) - * @see org.moduliths.moments.support.Moments#now() + * @see org.springframework.modulith.moments.support.Moments#now() */ @Override public LocalDateTime now() { @@ -54,7 +54,7 @@ public class TimeMachine extends Moments { /* * (non-Javadoc) - * @see org.moduliths.moments.support.Moments#shiftBy(java.time.Duration) + * @see org.springframework.modulith.moments.support.Moments#shiftBy(java.time.Duration) */ @Override public Moments shiftBy(Duration duration) { diff --git a/moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring.factories b/spring-modulith-moments/src/main/resources/META-INF/spring.factories similarity index 50% rename from moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring.factories rename to spring-modulith-moments/src/main/resources/META-INF/spring.factories index 911ae0aa..ff6accec 100644 --- a/moduliths-events/moduliths-events-core/src/main/resources/META-INF/spring.factories +++ b/spring-modulith-moments/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.moduliths.events.config.EventPublicationConfiguration + org.springframework.modulith.moments.MomentsAutoConfiguration diff --git a/spring-modulith-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-modulith-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..7770b82c --- /dev/null +++ b/spring-modulith-moments/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.modulith.moments.MomentsAutoConfiguration diff --git a/moduliths-moments/src/test/java/org/moduliths/moments/QuarterHasPassedUnitTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/QuarterHasPassedUnitTests.java similarity index 96% rename from moduliths-moments/src/test/java/org/moduliths/moments/QuarterHasPassedUnitTests.java rename to spring-modulith-moments/src/test/java/org/springframework/modulith/moments/QuarterHasPassedUnitTests.java index 0b3ee176..25e42925 100644 --- a/moduliths-moments/src/test/java/org/moduliths/moments/QuarterHasPassedUnitTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/QuarterHasPassedUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import static org.assertj.core.api.Assertions.*; diff --git a/moduliths-moments/src/test/java/org/moduliths/moments/QuarterUnitTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/QuarterUnitTests.java similarity index 92% rename from moduliths-moments/src/test/java/org/moduliths/moments/QuarterUnitTests.java rename to spring-modulith-moments/src/test/java/org/springframework/modulith/moments/QuarterUnitTests.java index 238b3f10..ad94151b 100644 --- a/moduliths-moments/src/test/java/org/moduliths/moments/QuarterUnitTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/QuarterUnitTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import static org.assertj.core.api.Assertions.*; -import static org.moduliths.moments.Quarter.*; +import static org.springframework.modulith.moments.Quarter.*; import java.util.HashMap; import java.util.Map; diff --git a/moduliths-moments/src/test/java/org/moduliths/moments/WeekHasPassedUnitTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/WeekHasPassedUnitTests.java similarity index 96% rename from moduliths-moments/src/test/java/org/moduliths/moments/WeekHasPassedUnitTests.java rename to spring-modulith-moments/src/test/java/org/springframework/modulith/moments/WeekHasPassedUnitTests.java index b8c9d87e..a797cd2e 100644 --- a/moduliths-moments/src/test/java/org/moduliths/moments/WeekHasPassedUnitTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/WeekHasPassedUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import static org.assertj.core.api.Assertions.*; diff --git a/moduliths-moments/src/test/java/org/moduliths/moments/YearHasPassedUnitTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/YearHasPassedUnitTests.java similarity index 96% rename from moduliths-moments/src/test/java/org/moduliths/moments/YearHasPassedUnitTests.java rename to spring-modulith-moments/src/test/java/org/springframework/modulith/moments/YearHasPassedUnitTests.java index fb9113de..6f92939e 100644 --- a/moduliths-moments/src/test/java/org/moduliths/moments/YearHasPassedUnitTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/YearHasPassedUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments; +package org.springframework.modulith.moments; import static org.assertj.core.api.Assertions.*; diff --git a/moduliths-moments/src/test/java/org/moduliths/moments/autoconfigure/MomentsAutoConfigurationTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java similarity index 90% rename from moduliths-moments/src/test/java/org/moduliths/moments/autoconfigure/MomentsAutoConfigurationTests.java rename to spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java index 9bc47d51..eeffd56c 100644 --- a/moduliths-moments/src/test/java/org/moduliths/moments/autoconfigure/MomentsAutoConfigurationTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments.autoconfigure; +package org.springframework.modulith.moments.autoconfigure; import static org.assertj.core.api.Assertions.*; @@ -21,10 +21,10 @@ import java.time.LocalDate; import java.time.ZoneId; import org.junit.jupiter.api.Test; -import org.moduliths.moments.Quarter; -import org.moduliths.moments.support.Moments; -import org.moduliths.moments.support.MomentsProperties; -import org.moduliths.moments.support.TimeMachine; +import org.springframework.modulith.moments.Quarter; +import org.springframework.modulith.moments.support.Moments; +import org.springframework.modulith.moments.support.MomentsProperties; +import org.springframework.modulith.moments.support.TimeMachine; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/moduliths-moments/src/test/java/org/moduliths/moments/support/MomentsUnitTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java similarity index 89% rename from moduliths-moments/src/test/java/org/moduliths/moments/support/MomentsUnitTests.java rename to spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java index 94556c52..5d51bc83 100644 --- a/moduliths-moments/src/test/java/org/moduliths/moments/support/MomentsUnitTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.moments.support; +package org.springframework.modulith.moments.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -29,14 +29,14 @@ import java.time.temporal.WeekFields; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.moduliths.moments.DayHasPassed; -import org.moduliths.moments.HourHasPassed; -import org.moduliths.moments.MonthHasPassed; -import org.moduliths.moments.QuarterHasPassed; -import org.moduliths.moments.ShiftedQuarter; -import org.moduliths.moments.WeekHasPassed; -import org.moduliths.moments.YearHasPassed; -import org.moduliths.moments.support.MomentsProperties.Granularity; +import org.springframework.modulith.moments.DayHasPassed; +import org.springframework.modulith.moments.HourHasPassed; +import org.springframework.modulith.moments.MonthHasPassed; +import org.springframework.modulith.moments.QuarterHasPassed; +import org.springframework.modulith.moments.ShiftedQuarter; +import org.springframework.modulith.moments.WeekHasPassed; +import org.springframework.modulith.moments.YearHasPassed; +import org.springframework.modulith.moments.support.MomentsProperties.Granularity; import org.springframework.context.ApplicationEventPublisher; /** diff --git a/moduliths-observability/src/test/resources/logback.xml b/spring-modulith-moments/src/test/resources/logback.xml similarity index 80% rename from moduliths-observability/src/test/resources/logback.xml rename to spring-modulith-moments/src/test/resources/logback.xml index 12e067d7..d3eda199 100644 --- a/moduliths-observability/src/test/resources/logback.xml +++ b/spring-modulith-moments/src/test/resources/logback.xml @@ -7,7 +7,7 @@ - + diff --git a/moduliths-observability/pom.xml b/spring-modulith-observability/pom.xml similarity index 80% rename from moduliths-observability/pom.xml rename to spring-modulith-observability/pom.xml index 0b1505fa..68c50b44 100644 --- a/moduliths-observability/pom.xml +++ b/spring-modulith-observability/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT - moduliths-observability + spring-modulith-observability - Moduliths - Observability + Spring Modulith - Observability - org.moduliths.observability + org.springframework.modulith.observability 2021.0.0 @@ -31,8 +31,8 @@ - org.moduliths - moduliths-core + org.springframework.experimental + spring-modulith-core ${project.version} diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ApplicationRuntime.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ApplicationRuntime.java similarity index 96% rename from moduliths-observability/src/main/java/org/moduliths/observability/ApplicationRuntime.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ApplicationRuntime.java index bc4ac8fc..f12713b3 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ApplicationRuntime.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ApplicationRuntime.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; /** * Abstraction of the application runtime environment. Primarily to keep references to Spring Boot out of the core diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/DefaultObservedModule.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java similarity index 77% rename from moduliths-observability/src/main/java/org/moduliths/observability/DefaultObservedModule.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java index 90d41602..d938e454 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/DefaultObservedModule.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.RequiredArgsConstructor; @@ -21,10 +21,10 @@ import java.lang.reflect.Method; import java.util.Arrays; import org.aopalliance.intercept.MethodInvocation; -import org.moduliths.model.FormatableJavaClass; -import org.moduliths.model.Module; -import org.moduliths.model.Modules; -import org.moduliths.model.SpringBean; +import org.springframework.modulith.model.FormatableJavaClass; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; +import org.springframework.modulith.model.SpringBean; import org.springframework.aop.ProxyMethodInvocation; import org.springframework.aop.framework.Advised; @@ -37,7 +37,7 @@ class DefaultObservedModule implements ObservedModule { /* * (non-Javadoc) - * @see org.moduliths.observability.ObservedModule#getName() + * @see org.springframework.modulith.observability.ObservedModule#getName() */ @Override public String getName() { @@ -46,7 +46,7 @@ class DefaultObservedModule implements ObservedModule { /* * (non-Javadoc) - * @see org.moduliths.observability.ObservedModule#getDisplayName() + * @see org.springframework.modulith.observability.ObservedModule#getDisplayName() */ @Override public String getDisplayName() { @@ -55,7 +55,7 @@ class DefaultObservedModule implements ObservedModule { /* * (non-Javadoc) - * @see org.moduliths.observability.ObservedModule#getInvokedMethod(org.aopalliance.intercept.MethodInvocation) + * @see org.springframework.modulith.observability.ObservedModule#getInvokedMethod(org.aopalliance.intercept.MethodInvocation) */ @Override public String getInvokedMethod(MethodInvocation invocation) { @@ -94,7 +94,7 @@ class DefaultObservedModule implements ObservedModule { /* * (non-Javadoc) - * @see org.moduliths.observability.ObservedModule#exposes(com.tngtech.archunit.core.domain.JavaClass) + * @see org.springframework.modulith.observability.ObservedModule#exposes(com.tngtech.archunit.core.domain.JavaClass) */ @Override public boolean exposes(JavaClass type) { @@ -103,7 +103,7 @@ class DefaultObservedModule implements ObservedModule { /* * (non-Javadoc) - * @see org.moduliths.observability.ObservedModule#isObservedModule(org.moduliths.model.Module) + * @see org.springframework.modulith.observability.ObservedModule#isObservedModule(org.springframework.modulith.model.Module) */ @Override public boolean isObservedModule(Module module) { @@ -112,7 +112,7 @@ class DefaultObservedModule implements ObservedModule { /* * (non-Javadoc) - * @see org.moduliths.observability.ObservedModule#getInterceptionConfiguration(java.lang.Class, org.moduliths.model.Modules) + * @see org.springframework.modulith.observability.ObservedModule#getInterceptionConfiguration(java.lang.Class, org.springframework.modulith.model.Modules) */ public ObservedModuleType getObservedModuleType(Class type, Modules modules) { diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleEntryInterceptor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEntryInterceptor.java similarity index 98% rename from moduliths-observability/src/main/java/org/moduliths/observability/ModuleEntryInterceptor.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEntryInterceptor.java index e0c52d30..29bd57a7 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleEntryInterceptor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEntryInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleEventListener.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java similarity index 95% rename from moduliths-observability/src/main/java/org/moduliths/observability/ModuleEventListener.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java index d86d71c7..c3cec4dc 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleEventListener.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.RequiredArgsConstructor; import java.util.function.Supplier; -import org.moduliths.model.Module; +import org.springframework.modulith.model.Module; import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.Tracer; import org.springframework.context.ApplicationEvent; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleTracingBeanPostProcessor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java similarity index 94% rename from moduliths-observability/src/main/java/org/moduliths/observability/ModuleTracingBeanPostProcessor.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java index 95c55e2f..8f504f8d 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleTracingBeanPostProcessor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.RequiredArgsConstructor; @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.aopalliance.aop.Advice; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.Modules; import org.springframework.aop.Advisor; import org.springframework.aop.MethodMatcher; import org.springframework.aop.Pointcut; @@ -38,7 +38,7 @@ import org.springframework.cloud.sleuth.Tracer; */ public class ModuleTracingBeanPostProcessor extends ModuleTracingSupport implements BeanPostProcessor { - public static final String MODULE_BAGGAGE_KEY = "org.moduliths.module"; + public static final String MODULE_BAGGAGE_KEY = "org.springframework.modulith.module"; private final ApplicationRuntime runtime; private final Tracer tracer; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleTracingSupport.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java similarity index 95% rename from moduliths-observability/src/main/java/org/moduliths/observability/ModuleTracingSupport.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java index 49c63bc6..c239a505 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ModuleTracingSupport.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import java.util.function.Consumer; import java.util.function.Supplier; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.Modules; import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ModulesRuntime.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModulesRuntime.java similarity index 95% rename from moduliths-observability/src/main/java/org/moduliths/observability/ModulesRuntime.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModulesRuntime.java index 5e95deec..4aba2303 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ModulesRuntime.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModulesRuntime.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.function.Supplier; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.Modules; /** * Bootstrap type to make sure we only bootstrap the initialization of a {@link Modules} instance per application class diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ObservedModule.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java similarity index 90% rename from moduliths-observability/src/main/java/org/moduliths/observability/ObservedModule.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java index eca03c34..d8cfee14 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ObservedModule.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import java.lang.reflect.Method; import org.aopalliance.intercept.MethodInvocation; -import org.moduliths.model.Module; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; import com.tngtech.archunit.core.domain.JavaClass; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/ObservedModuleType.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java similarity index 89% rename from moduliths-observability/src/main/java/org/moduliths/observability/ObservedModuleType.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java index 2929acfb..780d6e4c 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/ObservedModuleType.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.RequiredArgsConstructor; @@ -21,9 +21,9 @@ import java.lang.reflect.Method; import java.util.function.Predicate; import java.util.stream.Stream; -import org.moduliths.model.ArchitecturallyEvidentType; -import org.moduliths.model.ArchitecturallyEvidentType.ReferenceMethod; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.ArchitecturallyEvidentType; +import org.springframework.modulith.model.ArchitecturallyEvidentType.ReferenceMethod; +import org.springframework.modulith.model.Modules; /** * Represents a type in an {@link ObservedModule}. diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/SpringDataRestModuleTracingBeanPostProcessor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java similarity index 95% rename from moduliths-observability/src/main/java/org/moduliths/observability/SpringDataRestModuleTracingBeanPostProcessor.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java index 37d98a32..5b393905 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/SpringDataRestModuleTracingBeanPostProcessor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability; +package org.springframework.modulith.observability; import lombok.RequiredArgsConstructor; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.moduliths.model.Module; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; import org.springframework.aop.Advisor; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.beans.BeansException; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java similarity index 89% rename from moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java index 98012105..8eef4cd8 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability.autoconfigure; +package org.springframework.modulith.observability.autoconfigure; import brave.TracingCustomizer; import brave.baggage.BaggageField; @@ -23,10 +23,10 @@ import brave.handler.MutableSpan; import brave.handler.SpanHandler; import brave.propagation.TraceContext; -import org.moduliths.observability.ApplicationRuntime; -import org.moduliths.observability.ModuleEventListener; -import org.moduliths.observability.ModuleTracingBeanPostProcessor; -import org.moduliths.observability.ModulesRuntime; +import org.springframework.modulith.observability.ApplicationRuntime; +import org.springframework.modulith.observability.ModuleEventListener; +import org.springframework.modulith.observability.ModuleTracingBeanPostProcessor; +import org.springframework.modulith.observability.ModulesRuntime; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.sleuth.Tracer; diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/SpringBootApplicationRuntime.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java similarity index 80% rename from moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/SpringBootApplicationRuntime.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java index 52640065..4c5d50a1 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/SpringBootApplicationRuntime.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability.autoconfigure; +package org.springframework.modulith.observability.autoconfigure; import lombok.RequiredArgsConstructor; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.moduliths.observability.ApplicationRuntime; +import org.springframework.modulith.observability.ApplicationRuntime; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; @@ -38,7 +38,7 @@ class SpringBootApplicationRuntime implements ApplicationRuntime { /* * (non-Javadoc) - * @see org.moduliths.observability.ApplicationRuntime#getId() + * @see org.springframework.modulith.observability.ApplicationRuntime#getId() */ @Override public String getId() { @@ -47,7 +47,7 @@ class SpringBootApplicationRuntime implements ApplicationRuntime { /* * (non-Javadoc) - * @see org.moduliths.observability.ApplicationRuntime#getApplicationClass() + * @see org.springframework.modulith.observability.ApplicationRuntime#getApplicationClass() */ @Override public Class getMainApplicationClass() { @@ -59,7 +59,7 @@ class SpringBootApplicationRuntime implements ApplicationRuntime { /* * (non-Javadoc) - * @see org.moduliths.observability.ApplicationRuntime#getBeanUserClass(java.lang.Object, java.lang.String) + * @see org.springframework.modulith.observability.ApplicationRuntime#getBeanUserClass(java.lang.Object, java.lang.String) */ @Override public Class getUserClass(Object bean, String beanName) { @@ -73,7 +73,7 @@ class SpringBootApplicationRuntime implements ApplicationRuntime { /* * (non-Javadoc) - * @see org.moduliths.observability.ApplicationRuntime#isApplicationClass(java.lang.Class) + * @see org.springframework.modulith.observability.ApplicationRuntime#isApplicationClass(java.lang.Class) */ @Override public boolean isApplicationClass(Class type) { diff --git a/moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java similarity index 85% rename from moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java rename to spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java index 5699312c..f93c5dda 100644 --- a/moduliths-observability/src/main/java/org/moduliths/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability.autoconfigure; +package org.springframework.modulith.observability.autoconfigure; -import org.moduliths.observability.ApplicationRuntime; -import org.moduliths.observability.SpringDataRestModuleTracingBeanPostProcessor; +import org.springframework.modulith.observability.ApplicationRuntime; +import org.springframework.modulith.observability.SpringDataRestModuleTracingBeanPostProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.sleuth.Tracer; import org.springframework.context.annotation.Bean; diff --git a/spring-modulith-observability/src/main/resources/META-INF/spring.factories b/spring-modulith-observability/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..8a8be6e5 --- /dev/null +++ b/spring-modulith-observability/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + org.springframework.modulith.observability.autoconfigure.ModuleObservabilityAutoConfiguration,\ + org.springframework.modulith.observability.autoconfigure.SpringDataRestModuleObservabilityAutoConfiguration \ No newline at end of file diff --git a/spring-modulith-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories b/spring-modulith-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories new file mode 100644 index 00000000..0823f7b5 --- /dev/null +++ b/spring-modulith-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports.factories @@ -0,0 +1,2 @@ +org.springframework.modulith.observability.autoconfigure.ModuleObservabilityAutoConfiguration +org.springframework.modulith.observability.autoconfigure.SpringDataRestModuleObservabilityAutoConfiguration diff --git a/moduliths-observability/src/test/java/example/ExampleApplication.java b/spring-modulith-observability/src/test/java/example/ExampleApplication.java similarity index 100% rename from moduliths-observability/src/test/java/example/ExampleApplication.java rename to spring-modulith-observability/src/test/java/example/ExampleApplication.java diff --git a/moduliths-observability/src/test/java/example/ExampleApplicationIntegrationTests.java b/spring-modulith-observability/src/test/java/example/ExampleApplicationIntegrationTests.java similarity index 100% rename from moduliths-observability/src/test/java/example/ExampleApplicationIntegrationTests.java rename to spring-modulith-observability/src/test/java/example/ExampleApplicationIntegrationTests.java diff --git a/moduliths-observability/src/test/java/org/moduliths/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java similarity index 91% rename from moduliths-observability/src/test/java/org/moduliths/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java rename to spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java index 5253847c..a9d3cfe7 100644 --- a/moduliths-observability/src/test/java/org/moduliths/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java +++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.observability.autoconfigure; +package org.springframework.modulith.observability.autoconfigure; import static org.assertj.core.api.Assertions.*; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.moduliths.observability.ApplicationRuntime; +import org.springframework.modulith.observability.ApplicationRuntime; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.ApplicationContext; diff --git a/moduliths-observability/src/test/resources/application.properties b/spring-modulith-observability/src/test/resources/application.properties similarity index 100% rename from moduliths-observability/src/test/resources/application.properties rename to spring-modulith-observability/src/test/resources/application.properties diff --git a/moduliths-moments/src/test/resources/logback.xml b/spring-modulith-observability/src/test/resources/logback.xml similarity index 80% rename from moduliths-moments/src/test/resources/logback.xml rename to spring-modulith-observability/src/test/resources/logback.xml index 12e067d7..d3eda199 100644 --- a/moduliths-moments/src/test/resources/logback.xml +++ b/spring-modulith-observability/src/test/resources/logback.xml @@ -7,7 +7,7 @@ - + diff --git a/moduliths-sample/jqassistant/index.adoc b/spring-modulith-sample/jqassistant/index.adoc similarity index 89% rename from moduliths-sample/jqassistant/index.adoc rename to spring-modulith-sample/jqassistant/index.adoc index 1275a3ca..643a034d 100644 --- a/moduliths-sample/jqassistant/index.adoc +++ b/spring-modulith-sample/jqassistant/index.adoc @@ -10,10 +10,10 @@ include::jQA:Summary[] [[modulith:ModulithApplication]] [source,cypher,role=concept] -.Classes annotated by `org.moduliths.Modulith` are labeled with `Modulith` and `Application`. +.Classes annotated by `org.springframework.modulith.Modulith` are labeled with `Modulith` and `Application`. ---- MATCH - (:Artifact)-[:CONTAINS]->(modulith:Type)-[:ANNOTATED_BY]->()-[:OF_TYPE]->(:Type{fqn:"org.moduliths.Modulith"}) + (:Artifact)-[:CONTAINS]->(modulith:Type)-[:ANNOTATED_BY]->()-[:OF_TYPE]->(:Type{fqn:"org.springframework.modulith.Modulith"}) SET modulith:Modulith:Application RETURN @@ -29,7 +29,7 @@ MATCH (root)-[:CONTAINS]->(module:Package) OPTIONAL MATCH (module)-[:CONTAINS]->(:Type{name:"package-info"})-[:ANNOTATED_BY]->(moduleInfo), - (moduleInfo)-[:OF_TYPE]->(:Type{fqn:"org.moduliths.Module"}), + (moduleInfo)-[:OF_TYPE]->(:Type{fqn:"org.springframework.modulith.Module"}), (moduleInfo)-[:HAS]->(displayName:Value{name:"displayName"}) SET module:Module diff --git a/moduliths-sample/pom.xml b/spring-modulith-sample/pom.xml similarity index 84% rename from moduliths-sample/pom.xml rename to spring-modulith-sample/pom.xml index 3d462c29..2a34533e 100644 --- a/moduliths-sample/pom.xml +++ b/spring-modulith-sample/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Sample - moduliths-sample + Spring Modulith - Sample + spring-modulith-sample - org.moduliths.sample + org.springframework.modulith.sample @@ -44,13 +44,13 @@ ${project.groupId} - moduliths-api + spring-modulith-api ${project.version} ${project.groupId} - moduliths-test + spring-modulith-test ${project.version} test diff --git a/moduliths-sample/src/main/java/com/acme/myproject/Application.java b/spring-modulith-sample/src/main/java/com/acme/myproject/Application.java similarity index 93% rename from moduliths-sample/src/main/java/com/acme/myproject/Application.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/Application.java index a4ae6fac..0a803219 100644 --- a/moduliths-sample/src/main/java/com/acme/myproject/Application.java +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/Application.java @@ -15,7 +15,7 @@ */ package com.acme.myproject; -import org.moduliths.Modulith; +import org.springframework.modulith.Modulith; /** * @author Oliver Gierke diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/api/ComplexApiComponent.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/api/ComplexApiComponent.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/complex/api/ComplexApiComponent.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/complex/api/ComplexApiComponent.java diff --git a/spring-modulith-sample/src/main/java/com/acme/myproject/complex/api/package-info.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/api/package-info.java new file mode 100644 index 00000000..c7279203 --- /dev/null +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/api/package-info.java @@ -0,0 +1,4 @@ +@NamedInterface("API") +package com.acme.myproject.complex.api; + +import org.springframework.modulith.NamedInterface; \ No newline at end of file diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/internal/ComplextInternalComponent.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/ComplextInternalComponent.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/complex/internal/ComplextInternalComponent.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/ComplextInternalComponent.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/internal/FirstTypeBasedPort.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/FirstTypeBasedPort.java similarity index 93% rename from moduliths-sample/src/main/java/com/acme/myproject/complex/internal/FirstTypeBasedPort.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/FirstTypeBasedPort.java index 7dae2c2e..3df6c2a9 100644 --- a/moduliths-sample/src/main/java/com/acme/myproject/complex/internal/FirstTypeBasedPort.java +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/FirstTypeBasedPort.java @@ -15,7 +15,7 @@ */ package com.acme.myproject.complex.internal; -import org.moduliths.NamedInterface; +import org.springframework.modulith.NamedInterface; /** * @author Oliver Drotbohm diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/internal/SecondTypeBasePort.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/SecondTypeBasePort.java similarity index 93% rename from moduliths-sample/src/main/java/com/acme/myproject/complex/internal/SecondTypeBasePort.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/SecondTypeBasePort.java index 0178d4f2..e20ad6c3 100644 --- a/moduliths-sample/src/main/java/com/acme/myproject/complex/internal/SecondTypeBasePort.java +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/internal/SecondTypeBasePort.java @@ -15,7 +15,7 @@ */ package com.acme.myproject.complex.internal; -import org.moduliths.NamedInterface; +import org.springframework.modulith.NamedInterface; /** * @author Oliver Drotbohm diff --git a/moduliths-sample/src/main/java/com/acme/myproject/complex/spi/ComplexSpiComponent.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/spi/ComplexSpiComponent.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/complex/spi/ComplexSpiComponent.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/complex/spi/ComplexSpiComponent.java diff --git a/spring-modulith-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java new file mode 100644 index 00000000..c8a67007 --- /dev/null +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/complex/spi/package-info.java @@ -0,0 +1,4 @@ +@NamedInterface("SPI") +package com.acme.myproject.complex.spi; + +import org.springframework.modulith.NamedInterface; \ No newline at end of file diff --git a/moduliths-sample/src/main/java/com/acme/myproject/cycleA/CycleA.java b/spring-modulith-sample/src/main/java/com/acme/myproject/cycleA/CycleA.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/cycleA/CycleA.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/cycleA/CycleA.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/cycleB/CycleB.java b/spring-modulith-sample/src/main/java/com/acme/myproject/cycleB/CycleB.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/cycleB/CycleB.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/cycleB/CycleB.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/fieldinjected/WithFieldInjection.java b/spring-modulith-sample/src/main/java/com/acme/myproject/fieldinjected/WithFieldInjection.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/fieldinjected/WithFieldInjection.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/fieldinjected/WithFieldInjection.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/invalid/InvalidComponent.java b/spring-modulith-sample/src/main/java/com/acme/myproject/invalid/InvalidComponent.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/invalid/InvalidComponent.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/invalid/InvalidComponent.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/invalid2/InvalidModuleDependency.java b/spring-modulith-sample/src/main/java/com/acme/myproject/invalid2/InvalidModuleDependency.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/invalid2/InvalidModuleDependency.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/invalid2/InvalidModuleDependency.java diff --git a/spring-modulith-sample/src/main/java/com/acme/myproject/invalid2/package-info.java b/spring-modulith-sample/src/main/java/com/acme/myproject/invalid2/package-info.java new file mode 100644 index 00000000..1a5d7181 --- /dev/null +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/invalid2/package-info.java @@ -0,0 +1,4 @@ +@Module(allowedDependencies = "moduleB") +package com.acme.myproject.invalid2; + +import org.springframework.modulith.Module; \ No newline at end of file diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleA/ServiceComponentA.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleA/ServiceComponentA.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleA/ServiceComponentA.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleA/ServiceComponentA.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleA/SomeConfigurationA.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleA/SomeConfigurationA.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleA/SomeConfigurationA.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleA/SomeConfigurationA.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleA/SomeEventA.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleA/SomeEventA.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleA/SomeEventA.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleA/SomeEventA.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleB/ServiceComponentB.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/ServiceComponentB.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleB/ServiceComponentB.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/ServiceComponentB.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleB/SomeEventListenerB.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/SomeEventListenerB.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleB/SomeEventListenerB.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/SomeEventListenerB.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleB/internal/InternalComponentB.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/internal/InternalComponentB.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleB/internal/InternalComponentB.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/internal/InternalComponentB.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleB/internal/SupportingComponentB.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/internal/SupportingComponentB.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleB/internal/SupportingComponentB.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleB/internal/SupportingComponentB.java diff --git a/moduliths-sample/src/main/java/com/acme/myproject/moduleC/ServiceComponentC.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleC/ServiceComponentC.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/moduleC/ServiceComponentC.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/moduleC/ServiceComponentC.java diff --git a/spring-modulith-sample/src/main/java/com/acme/myproject/moduleC/package-info.java b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleC/package-info.java new file mode 100644 index 00000000..4808247f --- /dev/null +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/moduleC/package-info.java @@ -0,0 +1,4 @@ +@Module(displayName = "MyModule C") +package com.acme.myproject.moduleC; + +import org.springframework.modulith.Module; \ No newline at end of file diff --git a/moduliths-sample/src/main/java/com/acme/myproject/stereotypes/Stereotypes.java b/spring-modulith-sample/src/main/java/com/acme/myproject/stereotypes/Stereotypes.java similarity index 96% rename from moduliths-sample/src/main/java/com/acme/myproject/stereotypes/Stereotypes.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/stereotypes/Stereotypes.java index ee33f5fc..0523dc05 100644 --- a/moduliths-sample/src/main/java/com/acme/myproject/stereotypes/Stereotypes.java +++ b/spring-modulith-sample/src/main/java/com/acme/myproject/stereotypes/Stereotypes.java @@ -68,7 +68,7 @@ public class Stereotypes { @Value @ConstructorBinding - @ConfigurationProperties("org.moduliths.sample") + @ConfigurationProperties("org.springframework.modulith.sample") static class SomeConfigurationProperties { /** diff --git a/moduliths-sample/src/main/java/com/acme/myproject/stereotypes/web/WebRepresentations.java b/spring-modulith-sample/src/main/java/com/acme/myproject/stereotypes/web/WebRepresentations.java similarity index 100% rename from moduliths-sample/src/main/java/com/acme/myproject/stereotypes/web/WebRepresentations.java rename to spring-modulith-sample/src/main/java/com/acme/myproject/stereotypes/web/WebRepresentations.java diff --git a/moduliths-sample/src/test/java/com/acme/myproject/ModulithTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/ModulithTest.java similarity index 93% rename from moduliths-sample/src/test/java/com/acme/myproject/ModulithTest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/ModulithTest.java index 18475af2..bf832404 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/ModulithTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/ModulithTest.java @@ -18,9 +18,9 @@ package com.acme.myproject; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.moduliths.model.Modules; -import org.moduliths.model.Modules.Filters; -import org.moduliths.model.Violations; +import org.springframework.modulith.model.Modules; +import org.springframework.modulith.model.Modules.Filters; +import org.springframework.modulith.model.Violations; import com.acme.myproject.invalid.InvalidComponent; import com.acme.myproject.moduleB.internal.InternalComponentB; diff --git a/moduliths-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java similarity index 90% rename from moduliths-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java index f3a50f15..9ee19256 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java @@ -20,8 +20,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.moduliths.test.ModuleTest; -import org.moduliths.test.ModuleTest.BootstrapMode; +import org.springframework.modulith.test.ModuleTest; +import org.springframework.modulith.test.ModuleTest.BootstrapMode; import org.springframework.core.annotation.AliasFor; /** diff --git a/moduliths-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java similarity index 87% rename from moduliths-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java index 253508bb..a1830c4e 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java @@ -18,9 +18,9 @@ package com.acme.myproject.complex; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.moduliths.model.NamedInterface; -import org.moduliths.model.NamedInterfaces; -import org.moduliths.test.ModuleTestExecution; +import org.springframework.modulith.model.NamedInterface; +import org.springframework.modulith.model.NamedInterfaces; +import org.springframework.modulith.test.ModuleTestExecution; import org.springframework.beans.factory.annotation.Autowired; import com.acme.myproject.NonVerifyingModuleTest; diff --git a/moduliths-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java similarity index 92% rename from moduliths-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java index 2de5c507..de0c6f78 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java @@ -18,8 +18,8 @@ package com.acme.myproject.fieldinjected; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.moduliths.model.Modules; -import org.moduliths.test.ModuleTestExecution; +import org.springframework.modulith.model.Modules; +import org.springframework.modulith.test.ModuleTestExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/moduliths-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java similarity index 90% rename from moduliths-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java index 686fed0a..c4c04033 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java @@ -15,12 +15,11 @@ */ package com.acme.myproject.moduleA; -// import static org.moduliths.test.assertj.PublishedEventAssertions.*; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.moduliths.test.PublishedEvents; -import org.moduliths.test.PublishedEvents.TypedPublishedEvents; +import org.springframework.modulith.test.PublishedEvents; +import org.springframework.modulith.test.PublishedEvents.TypedPublishedEvents; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/moduliths-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java similarity index 95% rename from moduliths-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java index fc35d5c5..7b5fe481 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.internal.creation.bytebuddy.MockAccess; -import org.moduliths.test.ModuleTest.BootstrapMode; -import org.moduliths.test.TestUtils; +import org.springframework.modulith.test.ModuleTest.BootstrapMode; +import org.springframework.modulith.test.TestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/moduliths-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java similarity index 95% rename from moduliths-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java rename to spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java index b0b419e5..943c26cc 100644 --- a/moduliths-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.moduliths.test.ModuleTest.BootstrapMode; -import org.moduliths.test.TestUtils; +import org.springframework.modulith.test.ModuleTest.BootstrapMode; +import org.springframework.modulith.test.TestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/moduliths-sample/src/test/resources/logback.xml b/spring-modulith-sample/src/test/resources/logback.xml similarity index 100% rename from moduliths-sample/src/test/resources/logback.xml rename to spring-modulith-sample/src/test/resources/logback.xml diff --git a/spring-modulith-starter-jpa-jakarta/pom.xml b/spring-modulith-starter-jpa-jakarta/pom.xml new file mode 100644 index 00000000..01d0aba1 --- /dev/null +++ b/spring-modulith-starter-jpa-jakarta/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT + + + spring-modulith-starter-jpa-jakarta + Spring Modulith - Starter JPA (Jakarta) + + + org.springframework.modulith.starter.jpa.jakarta + + + + + + org.springframework.experimental + spring-modulith-api + 0.1.0-SNAPSHOT + + + org.springframework.experimental + spring-modulith-moments + 0.1.0-SNAPSHOT + + + + + + org.springframework.experimental + spring-modulith-events-core + 0.1.0-SNAPSHOT + + + org.springframework.experimental + spring-modulith-events-jackson + 0.1.0-SNAPSHOT + runtime + + + org.springframework.experimental + spring-modulith-events-jpa-jakarta + 0.1.0-SNAPSHOT + runtime + + + + + \ No newline at end of file diff --git a/spring-modulith-starter-jpa/pom.xml b/spring-modulith-starter-jpa/pom.xml new file mode 100644 index 00000000..da73b71d --- /dev/null +++ b/spring-modulith-starter-jpa/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT + + + spring-modulith-starter-jpa + Spring Modulith - Starter JPA + + + org.springframework.modulith.starter.jpa + + + + + + org.springframework.experimental + spring-modulith-api + 0.1.0-SNAPSHOT + + + org.springframework.experimental + spring-modulith-moments + 0.1.0-SNAPSHOT + + + + + + org.springframework.experimental + spring-modulith-events-core + 0.1.0-SNAPSHOT + + + org.springframework.experimental + spring-modulith-events-jackson + 0.1.0-SNAPSHOT + runtime + + + org.springframework.experimental + spring-modulith-events-jpa + 0.1.0-SNAPSHOT + runtime + + + + + \ No newline at end of file diff --git a/spring-modulith-starter-test/pom.xml b/spring-modulith-starter-test/pom.xml new file mode 100644 index 00000000..80f85476 --- /dev/null +++ b/spring-modulith-starter-test/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + + + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT + + + spring-modulith-starter-test + Spring Modulith - Starter Test + + + org.springframework.modulith.starter.test + + + + + + org.springframework.experimental + spring-modulith-test + 0.1.0-SNAPSHOT + + + + org.springframework.experimental + spring-modulith-docs + 0.1.0-SNAPSHOT + + + + + diff --git a/moduliths-test/pom.xml b/spring-modulith-test/pom.xml similarity index 80% rename from moduliths-test/pom.xml rename to spring-modulith-test/pom.xml index dfff799b..3cc09aa7 100644 --- a/moduliths-test/pom.xml +++ b/spring-modulith-test/pom.xml @@ -2,24 +2,24 @@ 4.0.0 - org.moduliths - moduliths - 1.4.0-SNAPSHOT + org.springframework.experimental + spring-modulith + 0.1.0-SNAPSHOT ../pom.xml - Moduliths - Test - moduliths-test + Spring Modulith - Test + spring-modulith-test - org.moduliths.test + org.springframework.modulith.test ${project.groupId} - moduliths-core + spring-modulith-core ${project.version} diff --git a/moduliths-test/src/main/java/org/moduliths/test/AggregateTestUtils.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/AggregateTestUtils.java similarity index 98% rename from moduliths-test/src/main/java/org/moduliths/test/AggregateTestUtils.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/AggregateTestUtils.java index 34d24d64..984b1f52 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/AggregateTestUtils.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/AggregateTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import java.lang.reflect.Method; import java.util.Collection; diff --git a/moduliths-test/src/main/java/org/moduliths/test/DefaultPublishedEvents.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java similarity index 89% rename from moduliths-test/src/main/java/org/moduliths/test/DefaultPublishedEvents.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java index 56d9953f..cbfc46c0 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/DefaultPublishedEvents.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import lombok.RequiredArgsConstructor; @@ -71,7 +71,7 @@ class DefaultPublishedEvents implements PublishedEvents, ApplicationListener TypedPublishedEvents ofType(Class type) { @@ -99,7 +99,7 @@ class DefaultPublishedEvents implements PublishedEvents, ApplicationListener TypedPublishedEvents ofSubType(Class subType) { @@ -111,7 +111,7 @@ class DefaultPublishedEvents implements PublishedEvents, ApplicationListener matching(Predicate predicate) { @@ -120,7 +120,7 @@ class DefaultPublishedEvents implements PublishedEvents, ApplicationListener TypedPublishedEvents matchingMapped(Function mapper, Predicate predicate) { diff --git a/moduliths-test/src/main/java/org/moduliths/test/ModuleContextCustomizerFactory.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java similarity index 97% rename from moduliths-test/src/main/java/org/moduliths/test/ModuleContextCustomizerFactory.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java index bee5763a..217bf45d 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/ModuleContextCustomizerFactory.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; @@ -25,8 +25,8 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Stream; -import org.moduliths.model.Module; -import org.moduliths.model.Modules; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.annotation.AnnotatedElementUtils; diff --git a/moduliths-test/src/main/java/org/moduliths/test/ModuleTest.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java similarity index 95% rename from moduliths-test/src/main/java/org/moduliths/test/ModuleTest.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java index bdca5345..ee2bc8fc 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/ModuleTest.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.extension.ExtendWith; -import org.moduliths.model.Module.DependencyDepth; +import org.springframework.modulith.model.Module.DependencyDepth; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTestContextBootstrapper; @@ -80,7 +80,7 @@ public @interface ModuleTest { public enum BootstrapMode { /** - * Boorstraps the current module only. + * Bootstraps the current module only. */ STANDALONE(DependencyDepth.NONE), diff --git a/moduliths-test/src/main/java/org/moduliths/test/ModuleTestAutoConfiguration.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestAutoConfiguration.java similarity index 96% rename from moduliths-test/src/main/java/org/moduliths/test/ModuleTestAutoConfiguration.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestAutoConfiguration.java index cc840a2b..913d8166 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/ModuleTestAutoConfiguration.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import lombok.extern.slf4j.Slf4j; @@ -93,7 +93,7 @@ class ModuleTestAutoConfiguration { ReflectionUtils.makeAccessible(field); ((Set) ReflectionUtils.getField(field, definition)).stream() - .filter(it -> it.startsWith("org.moduliths")) + .filter(it -> it.startsWith("org.springframework.modulith")) .forEach(packages::add); ReflectionUtils.setField(field, definition, new HashSet<>(packages)); @@ -102,7 +102,7 @@ class ModuleTestAutoConfiguration { ValueHolder holder = definition.getConstructorArgumentValues().getArgumentValue(0, String[].class); Arrays.stream((String[]) holder.getValue()) - .filter(it -> it.startsWith("org.moduliths")) + .filter(it -> it.startsWith("org.springframework.modulith")) .forEach(packages::add); // Fall back to customize the bean definition in a Boot 2.3 arrangement diff --git a/moduliths-test/src/main/java/org/moduliths/test/ModuleTestExecution.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java similarity index 94% rename from moduliths-test/src/main/java/org/moduliths/test/ModuleTestExecution.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java index 1b7e738f..9ebe9e12 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/ModuleTestExecution.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import lombok.AccessLevel; import lombok.EqualsAndHashCode; @@ -30,10 +30,10 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.moduliths.model.JavaPackage; -import org.moduliths.model.Module; -import org.moduliths.model.Modules; -import org.moduliths.test.ModuleTest.BootstrapMode; +import org.springframework.modulith.model.JavaPackage; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; +import org.springframework.modulith.test.ModuleTest.BootstrapMode; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.AnnotatedClassFinder; import org.springframework.core.annotation.AnnotatedElementUtils; @@ -133,7 +133,7 @@ public class ModuleTestExecution implements Iterable { } /** - * Returns all module dependencies, based on the current {@link BootstrapMode}. + * Returns all module dependencies, based on the current {@link ModuleTest.BootstrapMode}. * * @return */ diff --git a/moduliths-test/src/main/java/org/moduliths/test/ModuleTypeExcludeFilter.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTypeExcludeFilter.java similarity index 97% rename from moduliths-test/src/main/java/org/moduliths/test/ModuleTypeExcludeFilter.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTypeExcludeFilter.java index 3e8a52aa..a0c9bde8 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/ModuleTypeExcludeFilter.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTypeExcludeFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import lombok.EqualsAndHashCode; diff --git a/moduliths-test/src/main/java/org/moduliths/test/PublishedEvents.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEvents.java similarity index 98% rename from moduliths-test/src/main/java/org/moduliths/test/PublishedEvents.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEvents.java index e3aa0e48..54600538 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/PublishedEvents.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEvents.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import java.util.Arrays; import java.util.Collection; diff --git a/moduliths-test/src/main/java/org/moduliths/test/PublishedEventsExtension.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsExtension.java similarity index 95% rename from moduliths-test/src/main/java/org/moduliths/test/PublishedEventsExtension.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsExtension.java index ea452f24..c80dfc4c 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/PublishedEventsExtension.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsExtension.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import org.junit.jupiter.api.extension.Extension; diff --git a/moduliths-test/src/main/java/org/moduliths/test/PublishedEventsParameterResolver.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsParameterResolver.java similarity index 99% rename from moduliths-test/src/main/java/org/moduliths/test/PublishedEventsParameterResolver.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsParameterResolver.java index d21a6644..40e3f938 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/PublishedEventsParameterResolver.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsParameterResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import java.util.function.Function; diff --git a/moduliths-test/src/main/java/org/moduliths/test/TestUtils.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/TestUtils.java similarity index 98% rename from moduliths-test/src/main/java/org/moduliths/test/TestUtils.java rename to spring-modulith-test/src/main/java/org/springframework/modulith/test/TestUtils.java index e62d00de..e75fe686 100644 --- a/moduliths-test/src/main/java/org/moduliths/test/TestUtils.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/TestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import static org.assertj.core.api.Assertions.*; diff --git a/spring-modulith-test/src/main/resources/META-INF/spring.factories b/spring-modulith-test/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..f5f37a72 --- /dev/null +++ b/spring-modulith-test/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.test.context.ContextCustomizerFactory=\ + org.springframework.modulith.test.ModuleContextCustomizerFactory diff --git a/moduliths-test/src/test/java/org/moduliths/test/PublishedEventsParameterResolverUnitTests.java b/spring-modulith-test/src/test/java/org/springframework/modulith/test/PublishedEventsParameterResolverUnitTests.java similarity index 98% rename from moduliths-test/src/test/java/org/moduliths/test/PublishedEventsParameterResolverUnitTests.java rename to spring-modulith-test/src/test/java/org/springframework/modulith/test/PublishedEventsParameterResolverUnitTests.java index 2e2ba6ab..5c92a234 100644 --- a/moduliths-test/src/test/java/org/moduliths/test/PublishedEventsParameterResolverUnitTests.java +++ b/spring-modulith-test/src/test/java/org/springframework/modulith/test/PublishedEventsParameterResolverUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/moduliths-test/src/test/java/org/moduliths/test/PublishedEventsUnitTests.java b/spring-modulith-test/src/test/java/org/springframework/modulith/test/PublishedEventsUnitTests.java similarity index 96% rename from moduliths-test/src/test/java/org/moduliths/test/PublishedEventsUnitTests.java rename to spring-modulith-test/src/test/java/org/springframework/modulith/test/PublishedEventsUnitTests.java index 97ebc9df..3ddb830b 100644 --- a/moduliths-test/src/test/java/org/moduliths/test/PublishedEventsUnitTests.java +++ b/spring-modulith-test/src/test/java/org/springframework/modulith/test/PublishedEventsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.moduliths.test; +package org.springframework.modulith.test; import static org.assertj.core.api.Assertions.*; diff --git a/moduliths-test/src/test/resources/logback.xml b/spring-modulith-test/src/test/resources/logback.xml similarity index 80% rename from moduliths-test/src/test/resources/logback.xml rename to spring-modulith-test/src/test/resources/logback.xml index 12e067d7..d3eda199 100644 --- a/moduliths-test/src/test/resources/logback.xml +++ b/spring-modulith-test/src/test/resources/logback.xml @@ -7,7 +7,7 @@ - +