From ecd57e17a2e836e6ffb1bc6f038e71fe6cf25fda Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Mon, 9 Sep 2024 10:13:57 +0200 Subject: [PATCH] RED-9986 - Add component rules path to be scanned for Javadoc generation --- .../build.gradle.kts | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 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 94d35138..87c4b538 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -145,18 +145,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") + } } } } @@ -164,7 +165,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) { @@ -178,8 +183,6 @@ tasks.register("generateJavaDoc", Javadoc::class) { options.memberLevel = JavadocMemberLevel.PUBLIC (options as StandardJavadocDocletOptions).apply { - header = "Redaction Service ${project.version}" - footer = "Redaction Service ${project.version}" title = "API Documentation for Redaction Service ${project.version}" } }