RED-9742: fix document import

buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts

@@ -11,6 +11,8 @@ group = "com.iqser.red.service"
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.targetCompatibility = JavaVersion.VERSION_17
 
+val persistenceServiceVersion by rootProject.extra { "2.612.0-RED10072.1" }
+
 pmd {
     isConsoleOutput = true
 }
@@ -65,3 +67,13 @@ repositories {
         }
     }
 }
+
+allprojects {
+    tasks.withType<Javadoc> {
+        options {
+            this as StandardJavadocDocletOptions
+            addBooleanOption("Xdoclint:none", true)
+            addStringOption("Xmaxwarns", "1")
+        }
+    }
+}

redaction-service-v1/document/build.gradle.kts

@@ -4,13 +4,12 @@ plugins {
 }
 
 description = "redaction-service-document"
-val persistenceServiceVersion = "2.612.0-RED10072.1"
-val layoutParserVersion = "newNode"
+
 
 group = "com.knecon.fforesight"
 
 dependencies {
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:${rootProject.extra.get("persistenceServiceVersion")}")
     api("com.google.protobuf:protobuf-java-util:4.28.3")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")

redaction-service-v1/redaction-service-server-v1/build.gradle.kts

@@ -16,7 +16,7 @@ val layoutParserVersion = "0.193.0"
 val jacksonVersion = "2.15.2"
 val droolsVersion = "9.44.0.Final"
 val pdfBoxVersion = "3.0.0"
-val persistenceServiceVersion = "2.651.0-RED9472.0"
+val persistenceServiceVersion = "2.641.0"
 val llmServiceVersion = "1.20.0-RED10072.2"
 val springBootStarterVersion = "3.1.5"
 val springCloudVersion = "4.0.4"
@@ -31,21 +31,18 @@ configurations {
     }
 }
 
-configurations.all {
-    resolutionStrategy {
-        force("com.google.protobuf:protobuf-java:4.27.1")
-    }
-}
-
 dependencies {
-    implementation(project(":document"))
-    implementation(project(":redaction-service-api-v1")) { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") }
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") { exclude(group = "org.springframework.boot") }
-    implementation("com.iqser.red.service:persistence-service-shared-mongo-v1:${persistenceServiceVersion}")
-    {
-        exclude(group = "com.knecon.fforesight", module = "tenant-commons")
-    }
 
+    implementation(project(":redaction-service-api-v1")) { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") }
+    implementation(project(":document"))
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") {
+        exclude(group = "org.springframework.boot")
+        exclude(group = "com.knecon.fforesight", module = "document")
+    }
+    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 = "document")
+    }
     implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}")
     implementation("com.knecon.fforesight:llm-service-api:${llmServiceVersion}")
     implementation("com.iqser.red.commons:spring-commons:6.2.0")
@@ -62,16 +59,14 @@ dependencies {
 
     implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
-    implementation("org.ahocorasick:ahocorasick:0.6.3")
+    implementation("org.ahocorasick:ahocorasick:0.9.0")
     implementation("com.hankcs:aho-corasick-double-array-trie:1.2.2")
     implementation("com.github.roklenarcic:aho-corasick:1.2")
-
     implementation("org.javassist:javassist:3.29.2-GA")
 
     implementation("org.drools:drools-engine:${droolsVersion}")
     implementation("org.drools:drools-mvel:${droolsVersion}")
     implementation("org.kie:kie-spring:7.74.1.Final")
-    implementation("com.google.protobuf:protobuf-java:4.27.1")
 
     implementation("org.locationtech.jts:jts-core:1.19.0")
 
@@ -85,9 +80,11 @@ dependencies {
     implementation("org.apache.tomcat:tomcat-websocket:${tomcatVersion}")
     implementation("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 
+    implementation("org.liquibase:liquibase-core:4.29.2") // Needed to be set explicit, otherwise spring dependency management sets it to 4.20.0
+    implementation("org.liquibase.ext:liquibase-mongodb:4.29.2")
+
     implementation("net.logstash.logback:logstash-logback-encoder:7.4")
     api("ch.qos.logback:logback-classic")
-    api("com.knecon.fforesight:swagger-commons:0.7.0")
 
     implementation("org.reflections:reflections:0.10.2")
 
@@ -104,10 +101,8 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootStarterVersion}")
     testImplementation("com.knecon.fforesight:viewer-doc-processor:${layoutParserVersion}")
     testImplementation("com.knecon.fforesight:layoutparser-service-processor:${layoutParserVersion}") {
-        exclude(
-            group = "com.iqser.red.service",
-            module = "persistence-service-shared-api-v1"
-        )
+        exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1")
+        exclude(group = "com.knecon.fforesight", module = "document")
     }
     testImplementation("com.pdftron:PDFNet:10.11.0")
 }
@@ -131,9 +126,9 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
     environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
     environment.put(
-        "BPE_APPEND_JAVA_TOOL_OPTIONS",
-        "-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 -Dkie.repository.project.cache.size=50 -Dkie.repository.project.versions.cache.size=5"
+        "BPE_APPEND_JAVA_TOOL_OPTIONS", "-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 -Dkie.repository.project.cache.size=50 -Dkie.repository.project.versions.cache.size=5"
     )
+    environment.put("BPE_DEFAULT_LANG", "en_US.utf8") // java.text.Normalizer does not care for file.encoding
 
     imageName.set("nexus.knecon.com:5001/red/${project.name}")// must build image with same name always, otherwise the builder will not know which image to use as cache. DO NOT CHANGE!
     if (project.hasProperty("buildbootDockerHostNetwork")) {
@@ -188,13 +183,19 @@ tasks.register("generateJavaDoc", Javadoc::class) {
     dependsOn("compileJava")
     dependsOn("delombok")
     classpath = project.sourceSets["main"].runtimeClasspath
-    source = fileTree("${buildDir}/generated/sources/delombok/java/main") {
+    val documentFiles = fileTree("${project(":document").layout.buildDirectory.get()}/generated/sources/delombok/java/main") {
         include(droolsImports)
     }
-    destinationDir = file(project.findProperty("javadocDestinationDir")?.toString() ?: "")
+    val mainFiles = fileTree("${layout.buildDirectory.get()}/generated/sources/delombok/java/main") {
+        include(droolsImports)
+    }
+    source = documentFiles + mainFiles
+
+    setDestinationDir(file(project.findProperty("javadocDestinationDir")?.toString() ?: ""))
 
     options.memberLevel = JavadocMemberLevel.PUBLIC
     (options as StandardJavadocDocletOptions).apply {
         title = "API Documentation for Redaction Service ${project.version}"
     }
 }
+

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityCreationService.java

@@ -1477,11 +1477,9 @@ public class EntityCreationService {
 
     private void addListenerToEntity(TextEntity textEntity) {
 
-        if(kieSessionUpdater != null) {
+        if (kieSessionUpdater != null) {
             textEntity.addEntityEventListener(kieSessionUpdater);
         }
     }
 
-
-
 }