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

GH-9 - Rename core, public abstractions from Module to ApplicationModule.

Browse Source 
Remove obsolete @since tags and deprecations.
This commit is contained in:
Oliver Drotbohm
2022-07-19 15:15:29 +02:00
parent 8ba6c11e3d
commit 82c18fe509
60 changed files with 272 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-modulith-sample/src/main/java/com/acme/myproject/invalid2/package-info.java
View File

@@ -1,4 +1,4 @@
@Module(allowedDependencies = "moduleB")
@ApplicationModule(allowedDependencies = "moduleB")
package com.acme.myproject.invalid2;
import org.springframework.modulith.Module;
import org.springframework.modulith.ApplicationModule;

4
spring-modulith-sample/src/main/java/com/acme/myproject/moduleC/package-info.java
View File

@@ -1,4 +1,4 @@
@Module(displayName = "MyModule C")
@ApplicationModule(displayName = "MyModule C")
package com.acme.myproject.moduleC;
import org.springframework.modulith.Module;
import org.springframework.modulith.ApplicationModule;

10
spring-modulith-sample/src/test/java/com/acme/myproject/ModulithTest.java
View File

@@ -18,8 +18,8 @@ package com.acme.myproject;
import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.Modules.Filters;
import org.springframework.modulith.model.ApplicationModules;
import org.springframework.modulith.model.ApplicationModules.Filters;
import org.springframework.modulith.model.Violations;
import com.acme.myproject.invalid.InvalidComponent;
@@ -44,7 +44,7 @@ class ModulithTest {
String componentName = InternalComponentB.class.getSimpleName();
assertThatExceptionOfType(Violations.class) //
.isThrownBy(() -> Modules.of(Application.class, DEFAULT_EXCLUSIONS).verify()) //
.isThrownBy(() -> ApplicationModules.of(Application.class, DEFAULT_EXCLUSIONS).verify()) //
.withMessageContaining(String.format("Module '%s' depends on non-exposed type %s within module 'moduleB'",
"invalid", InternalComponentB.class.getName()))
.withMessageContaining(String.format("%s declares constructor %s(%s)", InvalidComponent.class.getSimpleName(),
@@ -53,14 +53,14 @@ class ModulithTest {
@Test
void verifyModulesWithoutInvalid() {
Modules.of(Application.class, DEFAULT_EXCLUSIONS.or(Filters.withoutModule("invalid"))).verify();
ApplicationModules.of(Application.class, DEFAULT_EXCLUSIONS.or(Filters.withoutModule("invalid"))).verify();
}
@Test
void detectsCycleBetweenModules() {
assertThatExceptionOfType(Violations.class) //
.isThrownBy(() -> Modules.of(Application.class, Filters.withoutModules("invalid", "invalid2")).verify()) //
.isThrownBy(() -> ApplicationModules.of(Application.class, Filters.withoutModules("invalid", "invalid2")).verify()) //
// mentions modules
.withMessageContaining("cycleA") //

8
spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java
View File

@@ -21,17 +21,17 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.core.annotation.AliasFor;
import org.springframework.modulith.test.ModuleTest;
import org.springframework.modulith.test.ModuleTest.BootstrapMode;
import org.springframework.modulith.test.ApplicationModuleTest;
import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
/**
* @author Oliver Drotbohm
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@ModuleTest(verifyAutomatically = false)
@ApplicationModuleTest(verifyAutomatically = false)
public @interface NonVerifyingModuleTest {
@AliasFor(annotation = ModuleTest.class, attribute = "mode")
@AliasFor(annotation = ApplicationModuleTest.class, attribute = "mode")
BootstrapMode value() default BootstrapMode.STANDALONE;
}

4
spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java
View File

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModules;
import org.springframework.modulith.test.ModuleTestExecution;
import com.acme.myproject.NonVerifyingModuleTest;
@@ -41,7 +41,7 @@ class FieldInjectedIntegrationTest {
@Test
void rejectsFieldInjection() {
Modules modules = execution.getModules();
ApplicationModules modules = execution.getModules();
assertThat(execution.getModule().detectDependencies(modules)) //
.hasMessageContaining("field injection") //

2
spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
View File

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationContext;
import org.springframework.modulith.test.ModuleTest.BootstrapMode;
import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
import org.springframework.modulith.test.TestUtils;
import com.acme.myproject.NonVerifyingModuleTest;

2
spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java
View File

@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.modulith.test.ModuleTest.BootstrapMode;
import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
import org.springframework.modulith.test.TestUtils;
import com.acme.myproject.NonVerifyingModuleTest;