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-integration-test/src/test/java/org/springframework/modulith/docs/DocumenterUnitTests.java
View File

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModules;
import org.springframework.modulith.model.SpringBean;
import com.acme.myproject.Application;
@@ -34,7 +34,7 @@ import com.tngtech.archunit.core.domain.JavaClass;
*/
class DocumenterUnitTests {
Modules modules = Modules.of(Application.class);
ApplicationModules modules = ApplicationModules.of(Application.class);
@Test
void groupsSpringBeansByArchitecturallyEvidentType() {

26
spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ModulesIntegrationTest.java
View File

@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.springframework.modulith.model.Module.DependencyType;
import org.springframework.modulith.model.ApplicationModule.DependencyType;
import com.acme.myproject.Application;
import com.acme.myproject.complex.internal.FirstTypeBasedPort;
@@ -35,7 +35,7 @@ import com.acme.myproject.moduleA.SomeConfigurationA.SomeAtBeanComponentA;
*/
class ModulesIntegrationTest {
Modules modules = Modules.of(Application.class);
ApplicationModules modules = ApplicationModules.of(Application.class);
@Test
void moduleDetectionUsesStrategyDefinedInSpringFactories() {
@@ -45,7 +45,7 @@ class ModulesIntegrationTest {
@Test
void exposesModulesForPrimaryPackages() {
Optional<Module> module = modules.getModuleByName("moduleB");
Optional<ApplicationModule> module = modules.getModuleByName("moduleB");
assertThat(module).hasValueSatisfying(it -> {
assertThat(it.getBootstrapDependencies(modules)).anySatisfy(dep -> {
@@ -57,7 +57,7 @@ class ModulesIntegrationTest {
@Test
public void usesExplicitlyAnnotatedDisplayName() {
Optional<Module> module = modules.getModuleByName("moduleC");
Optional<ApplicationModule> module = modules.getModuleByName("moduleC");
assertThat(module).hasValueSatisfying(it -> {
assertThat(it.getDisplayName()).isEqualTo("MyModule C");
@@ -67,7 +67,7 @@ class ModulesIntegrationTest {
@Test
public void rejectsDependencyIntoInternalPackage() {
Optional<Module> module = modules.getModuleByName("invalid");
Optional<ApplicationModule> module = modules.getModuleByName("invalid");
assertThat(module).hasValueSatisfying(it -> {
assertThatExceptionOfType(Violations.class) //
@@ -78,7 +78,7 @@ class ModulesIntegrationTest {
@Test
public void complexModuleExposesNamedInterfaces() {
Optional<Module> module = modules.getModuleByName("complex");
Optional<ApplicationModule> module = modules.getModuleByName("complex");
assertThat(module).hasValueSatisfying(it -> {
@@ -105,7 +105,7 @@ class ModulesIntegrationTest {
@Test
public void discoversAtBeanComponent() {
Optional<Module> module = modules.getModuleByName("moduleA");
Optional<ApplicationModule> module = modules.getModuleByName("moduleA");
assertThat(module).hasValueSatisfying(it -> {
assertThat(it.getSpringBeansInternal().contains(SomeAtBeanComponentA.class.getName())).isTrue();
@@ -115,8 +115,8 @@ class ModulesIntegrationTest {
@Test
public void moduleBListensToModuleA() {
Optional<Module> module = modules.getModuleByName("moduleB");
Module moduleA = modules.getModuleByName("moduleA").orElseThrow(IllegalStateException::new);
Optional<ApplicationModule> module = modules.getModuleByName("moduleB");
ApplicationModule moduleA = modules.getModuleByName("moduleA").orElseThrow(IllegalStateException::new);
assertThat(module).hasValueSatisfying(it -> {
assertThat(it.getDependencies(modules, DependencyType.EVENT_LISTENER)) //
@@ -127,7 +127,7 @@ class ModulesIntegrationTest {
@Test
public void rejectsNotExplicitlyListedDependency() {
Optional<Module> moduleByName = modules.getModuleByName("invalid2");
Optional<ApplicationModule> moduleByName = modules.getModuleByName("invalid2");
assertThat(moduleByName).hasValueSatisfying(it -> {
@@ -147,9 +147,9 @@ class ModulesIntegrationTest {
@Test
void createsModulesFromJavaPackage() {
Modules fromPackage = Modules.of(Application.class.getPackage().getName());
ApplicationModules fromPackage = ApplicationModules.of(Application.class.getPackage().getName());
assertThat(fromPackage.stream().map(Module::getName)) //
.containsExactlyInAnyOrderElementsOf(modules.stream().map(Module::getName).collect(Collectors.toList()));
assertThat(fromPackage.stream().map(ApplicationModule::getName)) //
.containsExactlyInAnyOrderElementsOf(modules.stream().map(ApplicationModule::getName).collect(Collectors.toList()));
}
}

4
spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/TestModuleDetectionStrategy.java
View File

@@ -20,9 +20,9 @@ import java.util.stream.Stream;
/**
* @author Oliver Drotbohm
*/
class TestModuleDetectionStrategy implements ModuleDetectionStrategy {
class TestModuleDetectionStrategy implements ApplicationModuleDetectionStrategy {
private final ModuleDetectionStrategy delegate = ModuleDetectionStrategy.directSubPackage();
private final ApplicationModuleDetectionStrategy delegate = ApplicationModuleDetectionStrategy.directSubPackage();
static boolean used;

2
spring-modulith-integration-test/src/test/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.modulith.model.ModuleDetectionStrategy=\
org.springframework.modulith.model.ApplicationModuleDetectionStrategy=\
org.springframework.modulith.model.TestModuleDetectionStrategy