Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Potential fix for failing pipeline

Browse Source
This commit is contained in:
maverickstuder 2025-01-20 13:29:01 +01:00
parent b48f448c24
commit 5a6746c5b2
4 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redaction-service-v1/document/build.gradle.kts
View File

@ -9,7 +9,9 @@ description = "redaction-service-document"
group = "com.knecon.fforesight" group = "com.knecon.fforesight"
dependencies { dependencies {
implementation("com.iqser.red.service:persistence-service-internal-api-v1:${rootProject.extra.get("persistenceServiceVersion")}") implementation("com.iqser.red.service:persistence-service-internal-api-v1:${rootProject.extra.get("persistenceServiceVersion")}") {
exclude(group = "com.knecon.fforesight", module = "document")
}
api("com.google.protobuf:protobuf-java-util:4.28.3") api("com.google.protobuf:protobuf-java-util:4.28.3")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")

4
redaction-service-v1/redaction-service-api-v1/build.gradle.kts
View File

@ -8,7 +8,9 @@ val persistenceServiceVersion = rootProject.extra.get("persistenceServiceVersion
dependencies { dependencies {
implementation("org.springframework:spring-web:6.0.12") implementation("org.springframework:spring-web:6.0.12")
implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") {
exclude(group = "com.knecon.fforesight", module = "document")
}
} }
publishing { publishing {

62
redaction-service-v1/redaction-service-server-v1/build.gradle.kts
View File

@ -37,9 +37,11 @@ dependencies {
implementation(project(":document")) implementation(project(":document"))
implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") { implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") {
exclude(group = "org.springframework.boot") exclude(group = "org.springframework.boot")
exclude(group = "com.knecon.fforesight", module = "document")
} }
implementation("com.iqser.red.service:persistence-service-shared-mongo-v1:${persistenceServiceVersion}") { implementation("com.iqser.red.service:persistence-service-shared-mongo-v1:${persistenceServiceVersion}") {
exclude(group = "com.knecon.fforesight", module = "tenant-commons") exclude(group = "com.knecon.fforesight", module = "tenant-commons")
exclude(group = "com.knecon.fforesight", module = "document")
} }
implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}") implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}")
implementation("com.knecon.fforesight:llm-service-api:${llmServiceVersion}") implementation("com.knecon.fforesight:llm-service-api:${llmServiceVersion}")
@ -150,44 +152,44 @@ tasks.named<BootBuildImage>("bootBuildImage") {
} }
} }
fun parseDroolsImports(vararg droolsFilePaths: String): List<String> { //fun parseDroolsImports(vararg droolsFilePaths: String): List<String> {
val imports = mutableListOf<String>() // val imports = mutableListOf<String>()
val importPattern = Regex("^import\\s+(com\\.iqser\\.red\\.service\\.redaction\\.v1\\.[\\w.]+);") // val importPattern = Regex("^import\\s+(com\\.iqser\\.red\\.service\\.redaction\\.v1\\.[\\w.]+);")
val desiredPrefix = "com.iqser.red.service.redaction.v1" // val desiredPrefix = "com.iqser.red.service.redaction.v1"
//
droolsFilePaths.forEach { filePath -> // droolsFilePaths.forEach { filePath ->
File(filePath).forEachLine { line -> // File(filePath).forEachLine { line ->
importPattern.find(line)?.let { matchResult -> // importPattern.find(line)?.let { matchResult ->
val importPath = matchResult.groupValues[1].trim() // val importPath = matchResult.groupValues[1].trim()
if (importPath.startsWith(desiredPrefix)) { // if (importPath.startsWith(desiredPrefix)) {
val formattedPath = importPath.replace('.', '/') // val formattedPath = importPath.replace('.', '/')
imports.add("$formattedPath.java") // imports.add("$formattedPath.java")
} // }
} // }
} // }
} // }
//
return imports // return imports
} //}
// Combine imports from both drools files // Combine imports from both drools files
val droolsImports = parseDroolsImports( //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/all_rules_documine.drl",
"redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl" // "redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl"
) //)
tasks.register("generateJavaDoc", Javadoc::class) { tasks.register("generateJavaDoc", Javadoc::class) {
dependsOn("compileJava") dependsOn("compileJava")
dependsOn("delombok") dependsOn("delombok")
classpath = project.sourceSets["main"].runtimeClasspath classpath = project.sourceSets["main"].runtimeClasspath
val documentFiles = fileTree("${project(":document").layout.buildDirectory.get()}/generated/sources/delombok/java/main") { // val documentFiles = fileTree("${project(":document").layout.buildDirectory.get()}/generated/sources/delombok/java/main") {
include(droolsImports) // include(droolsImports)
} // }
val mainFiles = fileTree("${layout.buildDirectory.get()}/generated/sources/delombok/java/main") { // val mainFiles = fileTree("${layout.buildDirectory.get()}/generated/sources/delombok/java/main") {
include(droolsImports) // include(droolsImports)
} // }
source = documentFiles + mainFiles // source = documentFiles + mainFiles
setDestinationDir(file(project.findProperty("javadocDestinationDir")?.toString() ?: "javadoc")) setDestinationDir(file(project.findProperty("javadocDestinationDir")?.toString() ?: "javadoc"))

2
redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta

@ -1 +1 @@
Subproject commit 5705cc0782605fdca5dfff134b436f7143c9e421 Subproject commit 57e6e0dd3c08a3a65ec59b5dfb70f0f77ebcc7c7