From 179ac6d9adeac54cae94390bf2fe93512217386f Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Mon, 9 Sep 2024 11:33:31 +0300 Subject: [PATCH] RED-9986 - Add component rules path to be scanned for Javadoc generation --- .../build.gradle.kts | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts index ffc4d45a..a79200a6 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -131,18 +131,19 @@ tasks.named("bootBuildImage") { } } -fun parseDroolsImports(droolsFilePath: String): List { - +fun parseDroolsImports(vararg droolsFilePaths: String): List { val imports = mutableListOf() val importPattern = Regex("^import\\s+(com\\.iqser\\.red\\.service\\.redaction\\.v1\\.[\\w.]+);") val desiredPrefix = "com.iqser.red.service.redaction.v1" - File(droolsFilePath).forEachLine { line -> - importPattern.find(line)?.let { matchResult -> - val importPath = matchResult.groupValues[1].trim() - if (importPath.startsWith(desiredPrefix)) { - val formattedPath = importPath.replace('.', '/') - imports.add("$formattedPath.java") + droolsFilePaths.forEach { filePath -> + File(filePath).forEachLine { line -> + importPattern.find(line)?.let { matchResult -> + val importPath = matchResult.groupValues[1].trim() + if (importPath.startsWith(desiredPrefix)) { + val formattedPath = importPath.replace('.', '/') + imports.add("$formattedPath.java") + } } } } @@ -150,7 +151,11 @@ fun parseDroolsImports(droolsFilePath: String): List { return imports } -val droolsImports = parseDroolsImports("redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl") +// Combine imports from both drools files +val droolsImports = parseDroolsImports( + "redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl", + "redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl" +) tasks.register("generateJavaDoc", Javadoc::class) {