Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ dependencies {
testImplementation 'org.springframework.boot:spring-boot-starter-websocket-test'
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
testImplementation libs.spring.modulith.starter.test
testImplementation libs.archunit.junit5
}

bootRun {
Expand Down
14 changes: 14 additions & 0 deletions app/src/test/java/ai/javaclaw/ModularityTests.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package ai.javaclaw;

import org.junit.jupiter.api.Test;
import org.springframework.modulith.core.ApplicationModules;

class ModularityTests {

ApplicationModules modules = ApplicationModules.of(JavaClawApplication.class);

@Test
void verifiesModularStructure() {
modules.verify();
}
}
56 changes: 56 additions & 0 deletions app/src/test/java/ai/javaclaw/ModuleBoundaryArchTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package ai.javaclaw;

import com.tngtech.archunit.core.importer.ImportOption;
import com.tngtech.archunit.junit.AnalyzeClasses;
import com.tngtech.archunit.junit.ArchTest;
import com.tngtech.archunit.lang.ArchRule;

import java.util.stream.Stream;

import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;

@AnalyzeClasses(packages = "ai.javaclaw", importOptions = ImportOption.DoNotIncludeTests.class)
class ModuleBoundaryArchTest {

private static final String[] CORE_PACKAGES = {
Comment thread
MarcosLM11 marked this conversation as resolved.
"ai.javaclaw.agent..", "ai.javaclaw.tasks..", "ai.javaclaw.configuration..", "ai.javaclaw.files.."
};

private static final String[] PLUGIN_PACKAGES = {
"ai.javaclaw.channels.*..", "ai.javaclaw.tools.*.."
};

private static final String[] PROVIDER_PACKAGES = {
"ai.javaclaw.providers.."
};
Comment thread
MarcosLM11 marked this conversation as resolved.

@ArchTest
static final ArchRule channelPluginsAreIndependent =
slices().matching("..channels.(*)..").should().notDependOnEachOther();

@ArchTest
static final ArchRule toolPluginsAreIndependent =
slices().matching("..tools.(*)..").should().notDependOnEachOther();

@ArchTest
static final ArchRule llmProvidersAreIndependent =
slices().matching("..providers.(*)..").should().notDependOnEachOther();

@ArchTest
static final ArchRule providersDoNotDependOnPlugins =
noClasses().that().resideInAnyPackage(PROVIDER_PACKAGES)
.should().dependOnClassesThat().resideInAnyPackage(PLUGIN_PACKAGES);

@ArchTest
static final ArchRule pluginsDoNotDependOnProviders =
noClasses().that().resideInAnyPackage(PLUGIN_PACKAGES)
.should().dependOnClassesThat().resideInAnyPackage(PROVIDER_PACKAGES);

@ArchTest
static final ArchRule coreDoesNotDependOnPluginsOrProviders =
noClasses().that().resideInAnyPackage(CORE_PACKAGES)
.should().dependOnClassesThat().resideInAnyPackage(
Stream.concat(Stream.of(PLUGIN_PACKAGES), Stream.of(PROVIDER_PACKAGES))
.toArray(String[]::new));
}
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ spring-boot = "4.0.6"
spring-ai = "2.0.0"
telegrambots = "9.5.0"
commonmark = "0.28.0"
archunit = "1.4.2"

[libraries]
bom-spring-boot = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
bom-spring-ai = { module = "org.springframework.ai:spring-ai-bom", version.ref = "spring-ai" }
bom-spring-modulith = { module = "org.springframework.modulith:spring-modulith-bom", version = "2.0.6" }
spring-ai-agent-utils = { module = "org.springaicommunity:spring-ai-agent-utils", version = "0.9.0" }
spring-ai-lucene = { module = "org.apache.lucene:lucene-core", version = "9.12.3" }
spring-modulith-starter-test = { module = "org.springframework.modulith:spring-modulith-starter-test" }
archunit-junit5 = { module = "com.tngtech.archunit:archunit-junit5", version.ref = "archunit" }

netty-resolver-dns-native-macos = { module = "io.netty:netty-resolver-dns-native-macos", version = "4.2.12.Final" }
jobrunr-spring-starter = { module = "org.jobrunr:jobrunr-spring-boot-4-starter", version = "8.6.1" }
Expand Down
Loading