这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: dependency tree traversing #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 13, 2024
Merged

fix: dependency tree traversing #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39cc89c
fix(validations): change dependency tree traverse
gabheadz Jun 11, 2024
8eabad0
fix(validations): upgrade search, add spring-web to rest-mvc entrypoint
gabheadz Jun 12, 2024
eafdf66
fix(validations): add spring-web dependency to webflux entrypoints us…
gabheadz Jun 13, 2024
e1d6454
fix(validations): code formating
gabheadz Jun 13, 2024
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
8 changes: 6 additions & 2 deletions src/main/java/co/com/bancolombia/factory/entrypoints/EntryPointRestMvc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static co.com.bancolombia.Constants.APP_SERVICE;
import static co.com.bancolombia.utils.Utils.buildImplementationFromProject;
import static co.com.bancolombia.utils.Utils.buildTestImplementation;

import co.com.bancolombia.exceptions.CleanException;
import co.com.bancolombia.factory.ModuleBuilder;
Expand All @@ -15,8 +16,11 @@ public class EntryPointRestMvc implements ModuleFactory {
public void buildModule(ModuleBuilder builder) throws IOException, CleanException {
builder.setupFromTemplate("entry-point/rest-mvc");
builder.appendToSettings("api-rest", "infrastructure/entry-points");
String dependency = buildImplementationFromProject(":api-rest");
builder.appendDependencyToModule(APP_SERVICE, dependency);
builder.appendDependencyToModule(APP_SERVICE, buildImplementationFromProject(":api-rest"));
// to run archunit validations
builder.appendDependencyToModule(
APP_SERVICE, buildTestImplementation("org.springframework:spring-web"));

if (Boolean.TRUE.equals(builder.getBooleanParam("include-swagger"))) {
builder.addParam("module", "api-rest");
builder.setupFromTemplate("entry-point/swagger");
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/co/com/bancolombia/factory/entrypoints/EntryPointWebflux.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static co.com.bancolombia.Constants.APP_SERVICE;
import static co.com.bancolombia.utils.Utils.buildImplementationFromProject;
import static co.com.bancolombia.utils.Utils.buildTestImplementation;

import co.com.bancolombia.exceptions.CleanException;
import co.com.bancolombia.factory.ModuleBuilder;
Expand All @@ -18,6 +19,9 @@ public void buildModule(ModuleBuilder builder) throws IOException, CleanExceptio
builder.setupFromTemplate("entry-point/rest-webflux/router-functions");
} else {
builder.setupFromTemplate("entry-point/rest-webflux");
// to run archunit validations
builder.appendDependencyToModule(
APP_SERVICE, buildTestImplementation("org.springframework:spring-web"));
if (Boolean.TRUE.equals(builder.getBooleanParam("include-swagger"))) {
builder.addParam("module", "reactive-web");
builder.setupFromTemplate("entry-point/swagger");
Expand Down
20 changes: 6 additions & 14 deletions ...main/java/co/com/bancolombia/factory/validations/architecture/ArchitectureValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
import co.com.bancolombia.factory.ModuleBuilder;
import co.com.bancolombia.utils.FileUtils;
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ResolvedDependency;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ArchitectureValidation {
Expand Down Expand Up @@ -41,21 +38,16 @@ private static String toOSPath(String os, File projectDir) {
}

private static void prepareParams(Project project, Project appService, ModuleBuilder builder) {
Map<String, Boolean> deps = new ConcurrentHashMap<>();
appService.getConfigurations().stream()
.filter(Configuration::isCanBeResolved)
.flatMap(c -> c.getResolvedConfiguration().getFirstLevelModuleDependencies().stream())
.forEach(dependency -> fillDependencyTree(deps, dependency));
boolean hasSpringWeb = deps.containsKey("org.springframework:spring-web");
boolean hasSpringWeb =
appService.getConfigurations().stream()
.map(Configuration::getIncoming)
.flatMap(d -> d.getDependencies().stream())
.map(d -> d.getGroup() + ":" + d.getName())
.anyMatch(dep -> dep.equals("org.springframework:spring-web"));
project.getLogger().debug("hasSpringWeb: {}", hasSpringWeb);
builder.addParam("hasSpringWeb", hasSpringWeb);
}

private static void fillDependencyTree(Map<String, Boolean> deps, ResolvedDependency dependency) {
deps.put(dependency.getModuleGroup() + ":" + dependency.getName(), true);
dependency.getChildren().forEach(dep -> fillDependencyTree(deps, dep));
}

@SneakyThrows
private static void generateArchUnitFiles(
Project project, Project appService, ModuleBuilder builder) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/co/com/bancolombia/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ public static String buildImplementation(String dependency) {
return "implementation '" + dependency + "'";
}

public static String buildTestImplementation(String dependency) {
return "testImplementation '" + dependency + "'";
}

public static String addModule(String settings, String include, String module, String baseDir) {
String toAppend = include.replace("module", module).replace("baseDir", baseDir);
if (settings.contains(toAppend)) {
Expand Down