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

14
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java
View File

@@ -24,8 +24,8 @@ import org.aopalliance.intercept.MethodInvocation;
import org.springframework.aop.ProxyMethodInvocation;
import org.springframework.aop.framework.Advised;
import org.springframework.modulith.model.FormatableJavaClass;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModule;
import org.springframework.modulith.model.ApplicationModules;
import org.springframework.modulith.model.SpringBean;
import com.tngtech.archunit.core.domain.JavaClass;
@@ -33,7 +33,7 @@ import com.tngtech.archunit.core.domain.JavaClass;
@RequiredArgsConstructor
class DefaultObservedModule implements ObservedModule {
private final Module module;
private final ApplicationModule module;
/*
* (non-Javadoc)
@@ -106,7 +106,7 @@ class DefaultObservedModule implements ObservedModule {
* @see org.springframework.modulith.observability.ObservedModule#isObservedModule(org.springframework.modulith.model.Module)
*/
@Override
public boolean isObservedModule(Module module) {
public boolean isObservedModule(ApplicationModule module) {
return this.module.equals(module);
}
@@ -114,7 +114,7 @@ class DefaultObservedModule implements ObservedModule {
* (non-Javadoc)
* @see org.springframework.modulith.observability.ObservedModule#getInterceptionConfiguration(java.lang.Class, org.springframework.modulith.model.Modules)
*/
public ObservedModuleType getObservedModuleType(Class<?> type, Modules modules) {
public ObservedModuleType getObservedModuleType(Class<?> type, ApplicationModules modules) {
return module.getSpringBeans().stream()
.filter(it -> it.getFullyQualifiedTypeName().equals(type.getName()))
@@ -125,11 +125,11 @@ class DefaultObservedModule implements ObservedModule {
.orElse(null);
}
private static String toString(Method method, Module module) {
private static String toString(Method method, ApplicationModule module) {
return toString(method.getDeclaringClass(), method, module);
}
private static String toString(Class<?> type, Method method, Module module) {
private static String toString(Class<?> type, Method method, ApplicationModule module) {
String typeName = module.getType(type.getName())
.map(FormatableJavaClass::of)

4
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java
View File

@@ -24,7 +24,7 @@ import java.util.function.Supplier;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.PayloadApplicationEvent;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.ApplicationModule;
/**
* @author Oliver Drotbohm
@@ -54,7 +54,7 @@ public class ModuleEventListener implements ApplicationListener<ApplicationEvent
return;
}
Module moduleByType = modules.get()
ApplicationModule moduleByType = modules.get()
.getModuleByType(payloadType.getSimpleName())
.orElse(null);

4
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java
View File

@@ -31,7 +31,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.StaticMethodMatcher;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModules;
/**
* @author Oliver Drotbohm
@@ -65,7 +65,7 @@ public class ModuleTracingBeanPostProcessor extends ModuleTracingSupport impleme
return bean;
}
Modules modules = getModules();
ApplicationModules modules = getModules();
return modules.getModuleByType(type.getName())
.map(DefaultObservedModule::new)

6
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java
View File

@@ -22,7 +22,7 @@ import org.springframework.aop.Advisor;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModules;
import org.springframework.util.Assert;
/**
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
*/
class ModuleTracingSupport implements BeanClassLoaderAware {
private final Supplier<Modules> modules;
private final Supplier<ApplicationModules> modules;
private final ApplicationRuntime context;
private ClassLoader classLoader;
@@ -51,7 +51,7 @@ class ModuleTracingSupport implements BeanClassLoaderAware {
this.classLoader = classLoader;
}
protected final Modules getModules() {
protected final ApplicationModules getModules() {
try {
return modules.get();

14
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModulesRuntime.java
View File

@@ -23,20 +23,20 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.function.Supplier;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModules;
/**
* Bootstrap type to make sure we only bootstrap the initialization of a {@link Modules} instance per application class
* Bootstrap type to make sure we only bootstrap the initialization of a {@link ApplicationModules} instance per application class
* once.
*
* @author Oliver Drotbohm
*/
@RequiredArgsConstructor
public class ModulesRuntime implements Supplier<Modules> {
public class ModulesRuntime implements Supplier<ApplicationModules> {
private static final Map<String, ModulesRuntime> MODULES = new HashMap<>();
private final Supplier<Modules> modules;
private final Supplier<ApplicationModules> modules;
private final ApplicationRuntime runtime;
/*
@@ -44,7 +44,7 @@ public class ModulesRuntime implements Supplier<Modules> {
* @see java.util.function.Supplier#get()
*/
@Override
public Modules get() {
public ApplicationModules get() {
return modules.get();
}
@@ -57,13 +57,13 @@ public class ModulesRuntime implements Supplier<Modules> {
return MODULES.computeIfAbsent(runtime.getId(), it -> {
Class<?> mainClass = runtime.getMainApplicationClass();
Future<Modules> modules = Executors.newFixedThreadPool(1).submit(() -> Modules.of(mainClass));
Future<ApplicationModules> modules = Executors.newFixedThreadPool(1).submit(() -> ApplicationModules.of(mainClass));
return new ModulesRuntime(toSupplier(modules), runtime);
});
}
private static Supplier<Modules> toSupplier(Future<Modules> modules) {
private static Supplier<ApplicationModules> toSupplier(Future<ApplicationModules> modules) {
return () -> {
try {

10
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModule.java
View File

@@ -18,8 +18,8 @@ package org.springframework.modulith.observability;
import java.lang.reflect.Method;
import org.aopalliance.intercept.MethodInvocation;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModule;
import org.springframework.modulith.model.ApplicationModules;
import com.tngtech.archunit.core.domain.JavaClass;
@@ -48,14 +48,14 @@ interface ObservedModule {
*/
boolean exposes(JavaClass type);
boolean isObservedModule(Module module);
boolean isObservedModule(ApplicationModule module);
/**
* Returns the {@link ObservedModuleType} for the given type and {@link Modules}.
* Returns the {@link ObservedModuleType} for the given type and {@link ApplicationModules}.
*
* @param type
* @param modules
* @return
*/
ObservedModuleType getObservedModuleType(Class<?> type, Modules modules);
ObservedModuleType getObservedModuleType(Class<?> type, ApplicationModules modules);
}

4
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ObservedModuleType.java
View File

@@ -23,7 +23,7 @@ import java.util.stream.Stream;
import org.springframework.modulith.model.ArchitecturallyEvidentType;
import org.springframework.modulith.model.ArchitecturallyEvidentType.ReferenceMethod;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModules;
/**
* Represents a type in an {@link ObservedModule}.
@@ -33,7 +33,7 @@ import org.springframework.modulith.model.Modules;
@RequiredArgsConstructor
public class ObservedModuleType {
private final Modules modules;
private final ApplicationModules modules;
private final ObservedModule module;
private final ArchitecturallyEvidentType type;

10
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java
View File

@@ -28,8 +28,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.data.rest.webmvc.BasePathAwareController;
import org.springframework.data.rest.webmvc.RootResourceInformation;
import org.springframework.modulith.model.Module;
import org.springframework.modulith.model.Modules;
import org.springframework.modulith.model.ApplicationModule;
import org.springframework.modulith.model.ApplicationModules;
/**
* @author Oliver Drotbohm
@@ -69,7 +69,7 @@ public class SpringDataRestModuleTracingBeanPostProcessor extends ModuleTracingS
@RequiredArgsConstructor
private static class DataRestControllerInterceptor implements MethodInterceptor {
private final Modules modules;
private final ApplicationModules modules;
private final Tracer tracer;
/*
@@ -79,7 +79,7 @@ public class SpringDataRestModuleTracingBeanPostProcessor extends ModuleTracingS
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
Module module = getModuleFrom(invocation.getArguments());
ApplicationModule module = getModuleFrom(invocation.getArguments());
if (module == null) {
return invocation.proceed();
@@ -90,7 +90,7 @@ public class SpringDataRestModuleTracingBeanPostProcessor extends ModuleTracingS
return ModuleEntryInterceptor.of(observed, tracer).invoke(invocation);
}
private Module getModuleFrom(Object[] arguments) {
private ApplicationModule getModuleFrom(Object[] arguments) {
for (Object argument : arguments) {