From 2f3f00bd71abbf368349f1d23952e5e6a6af7b64 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 21 Apr 2020 10:47:04 +0200 Subject: [PATCH] DATAJDBC-318 - Adapting DependencyTests. Without this change we see cyclic dependencies between modules (i.e. subpackages). The following subpackages had a cycle: repository.query and repository.query.parser PartTreeJdbcQuery and JdbcQueryCreator(repository.query from jdbc) depend on PartTree (repository.query.parser) AbstractQueryCreator (repository.query.parser) depends on ParameterAccessor (repository.query from commons) This change changes the definition of a module, bundling all the modules above into one module (repository). Alternative changes that should fix the problem: 1. Move ParameterAccessor to a different (probably new package) 2. Move AbstractQueryCreator to a different (probably new package) 3. org.springframework.data.jdbc.repository.query to e.g. org.springframework.data.jdbc.repository.query.jdbc Original pull request: #209. --- .../springframework/data/jdbc/degraph/DependencyTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java index fdebafa5..165c789b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java @@ -57,8 +57,8 @@ public class DependencyTests { } }) // exclude test code .withSlicing("sub-modules", // sub-modules are defined by any of the following pattern. - "org.springframework.data.jdbc.(**).*", // - "org.springframework.data.(**).*") // + "org.springframework.data.jdbc.(*).**", // + "org.springframework.data.(*).**") // .printTo("degraph-across-modules.graphml"), // writes a graphml to this location JCheck.violationFree()); }