Merge branch 'hotfix-queue-name-mismatch' into 'master'

Fix tenant-updated queue naming mismatch See merge request redactmanager/search-service!33
Fix tenant-updated queue naming mismatch
2024-10-07 12:26:49 +02:00 · 2024-10-07 12:21:12 +02:00 · 2024-09-30 11:47:58 +02:00 · 2024-09-30 11:36:25 +02:00 · 2024-09-03 13:49:55 +02:00 · 2024-09-03 13:16:04 +02:00
87 changed files with 4403 additions and 1589 deletions
--- a/.gitignore
+++ b/.gitignore
@ -26,3 +26,12 @@
 **/.DS_Store
 **/classpath-data.json
 **/dependencies-and-licenses-overview.txt
+
+
+gradle.properties
+gradlew
+gradlew.bat
+gradle/
+
+**/.gradle
+**/build
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -3,4 +3,21 @@ variables:
 include:
  - project: 'gitlab/gitlab'
    ref: 'main'
-    file: 'ci-templates/maven_java.yml'
+    file: 'ci-templates/gradle_java.yml'
+
+deploy:
+  stage: deploy
+  tags:
+    - dind
+  script:
+    - echo "Building with gradle version ${BUILDVERSION}"
+    - gradle -Pversion=${BUILDVERSION} publish
+    - gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
+    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^release/
+    - if: $CI_COMMIT_TAG
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
--- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
@ -0,0 +1,60 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    pmd
+    checkstyle
+    jacoco
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url = uri("https://nexus.knecon.com/repository/gindev/");
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull();
+            password = providers.gradleProperty("mavenPassword").getOrNull();
+        }
+    }
+}
+
+group = "com.iqser.red.service"
+
+java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
+
+pmd {
+    isConsoleOutput = true
+}
+
+tasks.pmdMain {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
+}
+
+tasks.pmdTest {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/test_pmd.xml")
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+    reports {
+        junitXml.outputLocation.set(layout.buildDirectory.dir("reports/junit"))
+    }
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // tests are required to run before generating the report
+    reports {
+        xml.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
+    }
+}
+
+java {
+    withJavadocJar()
+}
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property
+            name="severity"
+            value="error"/>
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+        <module name="AnnotationLocation"/>
+        <module name="JavadocStyle"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="RedundantModifier"/>
+        <module name="EmptyBlock"/>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="ExplicitInitialization"/>
+        <module name="IllegalInstantiation"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="PackageDeclaration"/>
+        <module name="ParameterAssignment"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="OneStatementPerLine"/>
+        <module name="FinalClass"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="UpperEll"/>
+        <module name="OuterTypeFilename"/>
+    </module>
+    <module name="FileTabCharacter"/>
+    <module name="SuppressWarningsFilter"/>
+</module>
--- a/config/pmd/pmd.xml
+++ b/config/pmd/pmd.xml
@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon ruleset checks the code for bad stuff
+    </description>
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+    </rule>
+
+</ruleset>
--- a/config/pmd/test_pmd.xml
+++ b/config/pmd/test_pmd.xml
@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon test ruleset checks the code for bad stuff
+    </description>
+
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="TestClassWithoutTestCases"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+    </rule>
+
+</ruleset>
--- a/gradle.properties.kts
+++ b/gradle.properties.kts
@ -0,0 +1 @@
+version = 2.0-SNAPSHOT
--- a/pom.xml
+++ b/pom.xml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>search-service</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>2.0-SNAPSHOT</version>
-
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>search-service-v1</module>
-        <module>search-service-image-v1</module>
-    </modules>
-
-</project>
--- a/publish-custom-image.sh
+++ b/publish-custom-image.sh
@ -0,0 +1,15 @@
+#!/bin/bash
+dir=${PWD##*/}
+gradle assemble
+
+# Get the current Git branch
+branch=$(git rev-parse --abbrev-ref HEAD)
+
+# Get the short commit hash (first 5 characters)
+commit_hash=$(git rev-parse --short=5 HEAD)
+
+# Combine branch and commit hash
+buildName="${USER}-${branch}-${commit_hash}"
+
+gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
+echo "nexus.knecon.com:5001/red/${dir}-server-v1:$buildName"
--- a/renovate.json
+++ b/renovate.json
@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}
--- a/search-service-image-v1/pom.xml
+++ b/search-service-image-v1/pom.xml
@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.knecon.fforesight</groupId>
-        <artifactId>platform-docker-dependency</artifactId>
-        <version>0.1.0</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>search-service-image-v1</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-
-    <properties>
-        <service.server>search-service-server-v1</service.server>
-        <platform.jar>${service.server}.jar</platform.jar>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.image.name>${docker.image.prefix}/${service.server}</docker.image.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>download-platform-jar</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <dependency>
-                                        <groupId>${project.groupId}</groupId>
-                                        <artifactId>${service.server}</artifactId>
-                                        <version>${project.version}</version>
-                                        <type>jar</type>
-                                        <overWrite>true</overWrite>
-                                        <destFileName>${platform.jar}</destFileName>
-                                    </dependency>
-                                </artifactItems>
-                                <outputDirectory>${docker.build.directory}</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <configuration>
-                        <images>
-                            <image>
-                                <name>${docker.image.name}</name>
-                                <build>
-                                    <dockerFileDir>${docker.build.directory}</dockerFileDir>
-                                    <args>
-                                        <PLATFORM_JAR>${platform.jar}</PLATFORM_JAR>
-                                    </args>
-                                    <tags>
-                                        <tag>${docker.image.version}</tag>
-                                        <tag>latest</tag>
-                                    </tags>
-                                </build>
-                            </image>
-                        </images>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
--- a/search-service-image-v1/src/main/docker/Dockerfile
+++ b/search-service-image-v1/src/main/docker/Dockerfile
@ -1,7 +0,0 @@
-FROM red/base-image:2.0.0
-
-ARG PLATFORM_JAR
-
-ENV PLATFORM_JAR ${PLATFORM_JAR}
-
-COPY ["${PLATFORM_JAR}", "/"]
--- a/search-service-v1/pom.xml
+++ b/search-service-v1/pom.xml
@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>platform-dependency</artifactId>
-        <groupId>com.iqser.red</groupId>
-        <version>1.13.0</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>search-service-v1</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>search-service-api-v1</module>
-        <module>search-service-server-v1</module>
-    </modules>
-
-    <dependencyManagement>
-
-        <dependencies>
-            <dependency>
-                <groupId>com.iqser.red</groupId>
-                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.20.0</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-        </dependencies>
-
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.0.2155</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.owasp</groupId>
-                    <artifactId>dependency-check-maven</artifactId>
-                    <version>6.3.1</version>
-                    <configuration>
-                        <format>ALL</format>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>prepare-agent</id>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>report</id>
-                            <goals>
-                                <goal>report</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report-aggregate</goal>
-                        </goals>
-                        <phase>verify</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/search-service-v1/search-service-api-v1/build.gradle.kts
+++ b/search-service-v1/search-service-api-v1/build.gradle.kts
@ -0,0 +1,28 @@
+plugins {
+    id("com.iqser.red.service.java-conventions")
+    id("io.freefair.lombok") version "8.4"
+}
+
+description = "search-service-api-v1"
+
+dependencies {
+    implementation("org.springframework:spring-web:6.0.6")
+    testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.5")
+}
+
+publishing {
+    publications {
+        create<MavenPublication>(name) {
+            from(components["java"])
+        }
+    }
+    repositories {
+        maven {
+            url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
+            credentials {
+                username = providers.gradleProperty("mavenUser").getOrNull();
+                password = providers.gradleProperty("mavenPassword").getOrNull();
+            }
+        }
+    }
+}
--- a/search-service-v1/search-service-api-v1/pom.xml
+++ b/search-service-v1/search-service-api-v1/pom.xml
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>search-service-v1</artifactId>
-        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>search-service-api-v1</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-</project>
--- a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedDocument.java
+++ b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedDocument.java
@ -32,7 +32,7 @@ public class MatchedDocument {
    private String fileName;

    @Builder.Default
-    private Map<String, Set<String>> highlights = new HashMap<>();
+    private Map<String, List<String>> highlights = new HashMap<>();

    @Builder.Default
    private Set<String> matchedTerms = new HashSet<>();
--- a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedSection.java
+++ b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedSection.java
@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class MatchedSection {

-    private int sectionNumber;
+    private String sectionNumber;
    private String headline;

    @Builder.Default
--- a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/resources/SearchResource.java
+++ b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/resources/SearchResource.java
@ -3,6 +3,7 @@ package com.iqser.red.service.search.v1.resources;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
@ -17,7 +18,7 @@ public interface SearchResource {

    @ResponseBody
    @ResponseStatus(value = HttpStatus.OK)
-    @GetMapping(value = SEARCH_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = SEARCH_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
    SearchResult getDossierStatus(@RequestBody SearchRequest searchRequest);

 }
--- a/search-service-v1/search-service-api-v1/src/test/java/com/iqser/red/service/search/v1/IdentityTest.java
+++ b/search-service-v1/search-service-api-v1/src/test/java/com/iqser/red/service/search/v1/IdentityTest.java
@ -0,0 +1,17 @@
+package com.iqser.red.service.search.v1;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class IdentityTest {
+
+    @Test
+    public void mockTest() {
+
+        int i = 1;
+        assertThat(i).isEqualTo(1);
+    }
+
+}
+
--- a/search-service-v1/search-service-server-v1/build.gradle.kts
+++ b/search-service-v1/search-service-server-v1/build.gradle.kts
@ -0,0 +1,73 @@
+import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
+
+plugins {
+    application
+    id("com.iqser.red.service.java-conventions")
+    id("org.springframework.boot") version "3.1.5"
+    id("io.spring.dependency-management") version "1.1.3"
+    id("org.sonarqube") version "4.4.1.3373"
+    id("io.freefair.lombok") version "8.4"
+}
+
+description = "search-service-server-v1"
+
+configurations {
+    all {
+        exclude(group = "commons-logging", module = "commons-logging")
+        exclude(group = "org.springframework.boot", module = "spring-boot-starter-log4j2")
+        exclude(group = "com.iqser.red.commons", module = "logging-commons")
+    }
+}
+
+val springBootStarterVersion = "3.1.5"
+
+dependencies {
+    api("com.knecon.fforesight:tenant-commons:0.30.0")
+    api("com.knecon.fforesight:tracing-commons:0.5.0")
+    api("com.knecon.fforesight:lifecycle-commons:0.6.0")
+    api("com.google.guava:guava:31.1-jre")
+    api("com.iqser.red.commons:storage-commons:2.45.0")
+    api(project(":search-service-api-v1"))
+    api("com.iqser.red.service:persistence-service-internal-api-v1:2.576.0-RED10106.0")
+    api("com.iqser.red.commons:spring-commons:2.1.0")
+    api("com.iqser.red.commons:metric-commons:2.1.0")
+    api("com.iqser.red.commons:jackson-commons:2.1.0")
+    api("co.elastic.clients:elasticsearch-java:8.6.2")
+    api("org.opensearch.client:opensearch-rest-client:2.6.0")
+    api("org.opensearch.client:opensearch-java:2.3.0")
+    api("jakarta.json:jakarta.json-api:2.1.1")
+    api("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")
+    api("org.springframework.boot:spring-boot-starter-aop:${springBootStarterVersion}")
+    api("org.springframework.boot:spring-boot-starter-amqp:${springBootStarterVersion}")
+    api("net.logstash.logback:logstash-logback-encoder:7.4")
+    api("ch.qos.logback:logback-classic")
+    testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootStarterVersion}")
+    testImplementation("com.iqser.red.commons:test-commons:2.1.0")
+    testImplementation("org.testcontainers:elasticsearch:1.17.6")
+    testImplementation("org.opensearch:opensearch-testcontainers:2.0.0")
+    testImplementation("org.springframework.amqp:spring-rabbit-test:3.0.2")
+}
+
+tasks.named<BootBuildImage>("bootBuildImage") {
+
+    environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
+    environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
+
+    imageName.set("nexus.knecon.com:5001/red/${project.name}:${project.version}")
+    if (project.hasProperty("buildbootDockerHostNetwork")) {
+        network.set("host")
+    }
+    docker {
+        if (project.hasProperty("buildbootDockerHostNetwork")) {
+            bindHostToBuilder.set(true)
+        }
+        verboseLogging.set(true)
+
+        publishRegistry {
+            username.set(providers.gradleProperty("mavenUser").getOrNull())
+            password.set(providers.gradleProperty("mavenPassword").getOrNull())
+            email.set(providers.gradleProperty("mavenEmail").getOrNull())
+            url.set("https://nexus.knecon.com:5001/")
+        }
+    }
+}
--- a/search-service-v1/search-service-server-v1/pom.xml
+++ b/search-service-v1/search-service-server-v1/pom.xml
@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>search-service-v1</artifactId>
-        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>search-service-server-v1</artifactId>
-
-    <properties>
-        <persistence-service.version>1.356.0</persistence-service.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>storage-commons</artifactId>
-            <version>1.8.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>search-service-api-v1</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-api-v1</artifactId>
-            <version>${persistence-service.version}</version>
-        </dependency>
-
-        <!-- commons -->
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>spring-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>logging-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>metric-commons</artifactId>
-        </dependency>
-        <!-- other external -->
-        <dependency>
-            <!-- this dependency is necessary to work with java8 zoned timestamps -->
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>jackson-commons</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opensearch.client</groupId>
-            <artifactId>opensearch-rest-high-level-client</artifactId>
-            <version>1.2.4</version>
-        </dependency>
-
-        <!-- spring -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>2.3.1.RELEASE</version>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>test-commons</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>1.16.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit-test</artifactId>
-            <version>2.3.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessors>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
-                    </annotationProcessors>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <!-- generate git.properties for exposure in /info -->
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                        <configuration>
-                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                            <gitDescribe>
-                                <tags>true</tags>
-                            </gitDescribe>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>original-jar</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>original</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <!-- repackages the generated jar into a runnable fat-jar and makes it
-                    executable -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <executable>true</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java
@ -2,27 +2,31 @@ package com.iqser.red.service.search.v1.server;

 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;

-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
 import com.iqser.red.service.search.v1.server.client.FileStatusClient;
 import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
 import com.iqser.red.service.search.v1.server.settings.SearchServiceSettings;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.knecon.fforesight.lifecyclecommons.LifecycleAutoconfiguration;
+import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;

 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;

-@Import({DefaultWebMvcConfiguration.class})
+@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class, LifecycleAutoconfiguration.class})
+@Import({StorageAutoConfiguration.class})
@EnableFeignClients(basePackageClasses = FileStatusClient.class)
@EnableConfigurationProperties({ElasticsearchSettings.class, SearchServiceSettings.class})
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
+@EnableAspectJAutoProxy
 public class Application {

    public static void main(String[] args) {
@ -31,14 +35,6 @@ public class Application {
    }


-    @Bean
-    @ConditionalOnMissingBean
-    public ElasticsearchClient elasticsearchClient(ElasticsearchSettings elasticsearchSettings) {
-
-        return new ElasticsearchClient(elasticsearchSettings);
-    }
-
-
    @Bean
    public TimedAspect timedAspect(MeterRegistry registry) {

--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/DossierClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/DossierClient.java
@ -2,7 +2,7 @@ package com.iqser.red.service.search.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.DossierResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.DossierResource;

@FeignClient(name = "DossierResource", url = "${persistence-service.url}")
 public interface DossierClient extends DossierResource {
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java
@ -1,71 +0,0 @@
-package com.iqser.red.service.search.v1.server.client;
-
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.opensearch.client.RestClient;
-import org.opensearch.client.RestClientBuilder;
-import org.opensearch.client.RestHighLevelClient;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
-
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.Delegate;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ElasticsearchClient {
-
-    // Lower timeouts should be set per request.
-    private static final int ABSURD_HIGH_TIMEOUT = 90_000_000;
-
-    private final ElasticsearchSettings settings;
-
-    @Delegate
-    private RestHighLevelClient client;
-
-
-    @PostConstruct
-    public void init() {
-
-        HttpHost[] httpHost = settings.getHosts()
-                .stream()
-                .map(host -> new HttpHost(host, settings.getPort(), settings.getScheme()))
-                .collect(Collectors.toList())
-                .toArray(new HttpHost[settings.getHosts().size()]);
-
-        RestClientBuilder builder = RestClient.builder(httpHost)
-                .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(ABSURD_HIGH_TIMEOUT).setSocketTimeout(ABSURD_HIGH_TIMEOUT));
-
-        if (settings.getUsername() != null && !settings.getUsername().isEmpty()) {
-            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(settings.getUsername(), settings.getPassword()));
-            builder.setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
-        }
-
-        client = new RestHighLevelClient(builder);
-    }
-
-
-    @PreDestroy
-    public void shutdown() {
-
-        try {
-            client.close();
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-    }
-
-}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusClient.java
@ -2,7 +2,7 @@ package com.iqser.red.service.search.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.StatusResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.StatusResource;

@FeignClient(name = "StatusResource", url = "${persistence-service.url}")
 public interface FileStatusClient extends StatusResource {
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusProcessingUpdateClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/FileStatusProcessingUpdateClient.java
@ -2,7 +2,7 @@ package com.iqser.red.service.search.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileStatusProcessingUpdateResource;

@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/IndexInformationClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/IndexInformationClient.java
@ -2,9 +2,9 @@ package com.iqser.red.service.search.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.IndexInformationResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.IndexInformationResource;

@FeignClient(name = "IndexInformationResource", url = "${persistence-service.url}")
 public interface IndexInformationClient extends IndexInformationResource {

-}
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/configuration/MessagingConfiguration.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/configuration/MessagingConfiguration.java
@ -0,0 +1,119 @@
+package com.iqser.red.service.search.v1.server.configuration;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.QueueBuilder;
+import org.springframework.amqp.core.TopicExchange;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+public class MessagingConfiguration {
+
+    public static final String INDEXING_REQUEST_QUEUE_PREFIX = "indexing_request";
+    public static final String INDEXING_REQUEST_EXCHANGE = "indexing_request_exchange";
+    public static final String INDEXING_DLQ = "indexing_error";
+
+    public static final String DELETE_FROM_INDEX_REQUEST_QUEUE_PREFIX = "delete_from_index_request";
+    public static final String DELETE_FROM_INDEX_REQUEST_EXCHANGE = "delete_from_index_request_exchange";
+    public static final String DELETE_FROM_INDEX_DLQ = "delete_from_index_error";
+
+    public static final String X_ERROR_INFO_HEADER = "x-error-message";
+    public static final String X_ERROR_INFO_TIMESTAMP_HEADER = "x-error-message-timestamp";
+
+    @Value("${fforesight.multitenancy.tenant-delete-queue:search-service-tenant-delete}")
+    private String tenantDeleteEventQueueName;
+    @Value("${fforesight.multitenancy.tenant-delete-dlq:search-service-tenant-delete-error}")
+    private String tenantDeleteDLQName;
+
+    @Value("${fforesight.multitenancy.tenant-updated-queue:search-service-tenant-updated}")
+    private String tenantUpdatedEventQueueName;
+    @Value("${fforesight.multitenancy.tenant-updated-dlq:search-service-tenant-updated-error}")
+    private String tenantUpdatedDLQName;
+
+
+    @Bean
+    public DirectExchange indexingRequestExchange() {
+
+        return new DirectExchange(INDEXING_REQUEST_EXCHANGE);
+    }
+
+
+    @Bean
+    public Queue indexingDLQ() {
+
+        return QueueBuilder.durable(INDEXING_DLQ).build();
+    }
+
+
+    @Bean
+    public DirectExchange deleteFromIndexRequestExchange() {
+
+        return new DirectExchange(DELETE_FROM_INDEX_REQUEST_EXCHANGE);
+    }
+
+
+    @Bean
+    public Queue deleteFromIndexDLQ() {
+
+        return QueueBuilder.durable(DELETE_FROM_INDEX_DLQ).build();
+    }
+
+
+    @Bean
+    public Binding tenantExchangeDeleteBinding(@Qualifier("tenantUserManagementTenantDeleteQueue") Queue tenantUserManagementTenantDeleteQueue,
+                                               @Qualifier("tenantExchange") TopicExchange tenantExchange) {
+
+        return BindingBuilder.bind(tenantUserManagementTenantDeleteQueue).to(tenantExchange).with("tenant.delete");
+    }
+
+
+    @Bean("tenantUserManagementTenantDeleteQueue")
+    public Queue tenantDeleteQueue() {
+
+        return QueueBuilder.durable(this.tenantDeleteEventQueueName)
+                .withArgument("x-dead-letter-exchange", "")
+                .withArgument("x-dead-letter-routing-key", this.tenantDeleteDLQName)
+                .build();
+    }
+
+
+    @Bean
+    public Queue tenantDeleteDLQ() {
+
+        return QueueBuilder.durable(this.tenantDeleteDLQName).build();
+    }
+
+
+    @Bean
+    public Binding tenantExchangeUpdatedBinding(@Qualifier("tenantUserManagementTenantUpdatedQueue") Queue tenantUserManagementTenantUpdatedQueue,
+                                                @Qualifier("tenantExchange") TopicExchange tenantExchange) {
+
+        return BindingBuilder.bind(tenantUserManagementTenantUpdatedQueue).to(tenantExchange).with("tenant.updated");
+    }
+
+
+    @Bean("tenantUserManagementTenantUpdatedQueue")
+    public Queue tenantUpdatedQueue() {
+
+        return QueueBuilder.durable(this.tenantUpdatedEventQueueName)
+                .withArgument("x-dead-letter-exchange", "")
+                .withArgument("x-dead-letter-routing-key", this.tenantUpdatedDLQName)
+                .build();
+    }
+
+
+    @Bean
+    public Queue tenantUpdatedDLQ() {
+
+        return QueueBuilder.durable(this.tenantUpdatedDLQName).build();
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/configuration/TenantMessagingConfigurationImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/configuration/TenantMessagingConfigurationImpl.java
@ -0,0 +1,11 @@
+package com.iqser.red.service.search.v1.server.configuration;
+
+import org.springframework.context.annotation.Configuration;
+
+import com.knecon.fforesight.tenantcommons.queue.TenantMessagingConfiguration;
+
+@Configuration
+public class TenantMessagingConfigurationImpl extends TenantMessagingConfiguration {
+
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/exception/IndexException.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/exception/IndexException.java
@ -2,12 +2,31 @@ package com.iqser.red.service.search.v1.server.exception;

 public class IndexException extends RuntimeException {

-    public static final String INDEX_EXISTS_ERROR = "Unable to check, if index exists";
-    public static final String CONTENT_TO_JSON_ERROR = "Could not convert document with id '%s' to JSON!";
-    public static final String DOCUMENT_INDEX_ERROR = "Error during indexing document with id '%s'";
-    public static final String DOCUMENT_DELETE_ERROR = "Error during deleting document with id '%s'";
-    public static final String FAILED_TO_SEARCH = "Error during search";
+    private static final String INDEX_EXISTS_ERROR = "Unable to check, if index exists";
+    private static final String DOCUMENT_INDEX_ERROR = "Error during indexing document with id '%s'";
+    private static final String DOCUMENT_UPDATE_ERROR = "Error during updating document with id '%s'";
+    private static final String DOCUMENT_DELETE_ERROR = "Error during deleting document with id '%s'";
+    private static final String FAILED_TO_SEARCH = "Error during search";

+    public static IndexException indexExists(Throwable cause){
+        return new IndexException(INDEX_EXISTS_ERROR, cause);
+    }
+
+    public static IndexException documentIndexError(String fileId, Throwable cause){
+        return new IndexException(String.format(DOCUMENT_INDEX_ERROR, fileId), cause);
+    }
+
+    public static IndexException documentUpdateError(String fileId, Throwable cause){
+        return new IndexException(String.format(DOCUMENT_UPDATE_ERROR, fileId), cause);
+    }
+
+    public static IndexException documentDeleteError(String fileId, Throwable cause){
+        return new IndexException(String.format(DOCUMENT_DELETE_ERROR, fileId), cause);
+    }
+
+    public static IndexException searchFailed(Throwable cause){
+        return new IndexException(FAILED_TO_SEARCH, cause);
+    }

    public IndexException(String message) {

--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/migration/MigrationStarterService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/migration/MigrationStarterService.java
@ -11,6 +11,8 @@ import com.iqser.red.service.search.v1.model.IndexMessageType;
 import com.iqser.red.service.search.v1.server.queue.IndexingMessageReceiver;
 import com.iqser.red.service.search.v1.server.service.IndexInformationService;
 import com.iqser.red.service.search.v1.server.settings.SearchServiceSettings;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+import com.knecon.fforesight.tenantcommons.TenantsClient;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@ -18,12 +20,14 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@RequiredArgsConstructor
+@SuppressWarnings("PMD")
 public class MigrationStarterService {

    private final ApplicationContext ctx;
    private final IndexInformationService indexInformationService;
    private final IndexingMessageReceiver indexingMessageReceiver;
    private final SearchServiceSettings settings;
+    private final TenantsClient tenantsClient;


    @EventListener(ApplicationReadyEvent.class)
@ -31,12 +35,15 @@ public class MigrationStarterService {

        // This can only run in post upgrade hook, because otherwise the old service is still runnnig.
        if (settings.isMigrateOnly()) {
-            if (indexInformationService.hasIndexChanged()) {
-                log.info("Index has changed and will be closed, dropped, recreated and all files will be indexed");
-                indexingMessageReceiver.receiveIndexingRequest(IndexMessage.builder().messageType(IndexMessageType.DROP).build());
-            }
+            tenantsClient.getTenants().forEach(tenant -> {
+                TenantContext.setTenantId(tenant.getTenantId());
+                if (indexInformationService.hasIndexChanged()) {
+                    log.info("Index has changed and will be closed, dropped, recreated and all files will be indexed");
+                    indexingMessageReceiver.receiveIndexingRequest(IndexMessage.builder().messageType(IndexMessageType.DROP).build());
+                }
+            });
            System.exit(SpringApplication.exit(ctx, () -> 0));
        }
    }

-}
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/Connection.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/Connection.java
@ -0,0 +1,21 @@
+package com.iqser.red.service.search.v1.server.model;
+
+
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@AllArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class Connection {
+
+    @EqualsAndHashCode.Include
+    private String hosts;
+    private SearchConnection searchConnection;
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocument.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocument.java
@ -1,8 +1,8 @@
 package com.iqser.red.service.search.v1.server.model;

 import java.io.Serializable;
-import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;

 import lombok.AccessLevel;
@ -23,7 +23,7 @@ public class IndexDocument implements Serializable {
    private String fileId;
    private String filename;

-    private OffsetDateTime date;
+    private Date date;
    private String assignee;
    private boolean dossierDeleted;
    private boolean dossierArchived;
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexSection.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexSection.java
@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
@SuppressWarnings("serial")
 public class IndexSection implements Serializable {

-    private int sectionNumber;
+    private String sectionNumber;
    private String text;
    private Set<Integer> pages;
    private String headline;
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/SectionText.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/SectionText.java
@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class SectionText {

-    private int sectionNumber;
+    private String sectionNumber;
    private String headline;
    private String text;

--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/Text.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/Text.java
@ -3,14 +3,11 @@ package com.iqser.red.service.search.v1.server.model;
 import java.util.ArrayList;
 import java.util.List;

-import com.dslplatform.json.CompiledJson;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
-@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class Text {
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/DeleteTenantMessageReceiver.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/DeleteTenantMessageReceiver.java
@ -0,0 +1,38 @@
+package com.iqser.red.service.search.v1.server.queue;
+
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.service.IndexDeleteService;
+import com.knecon.fforesight.tenantcommons.model.TenantResponse;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeleteTenantMessageReceiver {
+
+    private final IndexDeleteService indexDeleteService;
+
+    @Value("${fforesight.multitenancy.tenant-delete-queue:tenant-delete-queue}")
+    private String tenantDeleteQueue;
+
+
+    @PostConstruct
+    public void postConstruct() {
+
+        log.info("Listener for tenant-delete started for queue: {}", this.tenantDeleteQueue);
+    }
+
+
+    @RabbitListener(queues = "${fforesight.multitenancy.tenant-delete-queue:tenant-delete-queue}")
+    public void deleteTenant(TenantResponse tenant) {
+
+        indexDeleteService.dropIndex(tenant.getSearchConnection());
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java
@ -1,10 +1,14 @@
 package com.iqser.red.service.search.v1.server.queue;

-import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.DELETE_FROM_INDEX_DLQ;
-import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.DELETE_FROM_INDEX_QUEUE;
-import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.INDEXING_DQL;
-import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.INDEXING_QUEUE;
+import static com.iqser.red.service.search.v1.server.configuration.MessagingConfiguration.DELETE_FROM_INDEX_DLQ;
+import static com.iqser.red.service.search.v1.server.configuration.MessagingConfiguration.INDEXING_DLQ;
+import static com.iqser.red.service.search.v1.server.configuration.MessagingConfiguration.INDEXING_REQUEST_EXCHANGE;
+import static com.iqser.red.service.search.v1.server.configuration.MessagingConfiguration.X_ERROR_INFO_HEADER;
+import static com.iqser.red.service.search.v1.server.configuration.MessagingConfiguration.X_ERROR_INFO_TIMESTAMP_HEADER;

+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.List;

 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
@ -14,10 +18,10 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;

-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel;
 import com.iqser.red.service.search.v1.model.IndexMessage;
 import com.iqser.red.service.search.v1.model.IndexMessageType;
 import com.iqser.red.service.search.v1.server.client.DossierClient;
@ -27,12 +31,12 @@ import com.iqser.red.service.search.v1.server.model.Text;
 import com.iqser.red.service.search.v1.server.service.DocumentDeleteService;
 import com.iqser.red.service.search.v1.server.service.DocumentIndexService;
 import com.iqser.red.service.search.v1.server.service.DocumentUpdateService;
-import com.iqser.red.service.search.v1.server.service.IndexCreatorService;
 import com.iqser.red.service.search.v1.server.service.IndexDeleteService;
+import com.iqser.red.service.search.v1.server.service.IndexDocumentConverterService;
 import com.iqser.red.service.search.v1.server.service.IndexInformationService;
 import com.iqser.red.service.search.v1.server.service.TextStorageService;
+import com.knecon.fforesight.tenantcommons.TenantContext;

-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@ -42,23 +46,27 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class IndexingMessageReceiver {

+    public static final String INDEXING_LISTENER_ID = "indexing-listener";
+    public static final String DELETE_FROM_INDEX_LISTENER_ID = "delete-from-index-listener";
+
    private final ObjectMapper objectMapper;
    private final TextStorageService textStorageService;
-    private final DocumentIndexService documentIndexService;
    private final FileStatusClient fileStatusClient;
    private final DossierClient dossierClient;
    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+    private final RabbitTemplate rabbitTemplate;
+
    private final DocumentDeleteService documentDeleteService;
    private final DocumentUpdateService documentUpdateService;
-    private final IndexCreatorService indexCreatorService;
-    private final RabbitTemplate rabbitTemplate;
+    private final DocumentIndexService documentIndexService;
    private final IndexDeleteService indexDeleteService;
    private final IndexInformationService indexInformationService;
+    private final IndexDocumentConverterService indexDocumentConverterService;


    @SneakyThrows
    @RabbitHandler
-    @RabbitListener(queues = INDEXING_QUEUE)
+    @RabbitListener(id = INDEXING_LISTENER_ID)
    public void receiveIndexingRequest(Message message) {

        var indexRequest = objectMapper.readValue(message.getBody(), IndexMessage.class);
@ -66,11 +74,18 @@ public class IndexingMessageReceiver {
        // This prevents from endless retries oom errors.
        if (message.getMessageProperties().isRedelivered()) {
            throw new AmqpRejectAndDontRequeueException(String.format("Error during last processing of request with dossierId: %s and fileId: %s, do not retry.",
-                    indexRequest.getDossierId(),
-                    indexRequest.getFileId()));
+                                                                      indexRequest.getDossierId(),
+                                                                      indexRequest.getFileId()));
        }

-        receiveIndexingRequest(indexRequest);
+        try {
+            receiveIndexingRequest(indexRequest);
+        } catch (Exception e) {
+            log.warn("An exception occurred in processing the indexing request stage: ", e);
+            message.getMessageProperties().getHeaders().put(X_ERROR_INFO_HEADER, e.getMessage());
+            message.getMessageProperties().getHeaders().put(X_ERROR_INFO_TIMESTAMP_HEADER, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
+            throw e;
+        }
    }


@ -78,35 +93,36 @@ public class IndexingMessageReceiver {

        log.info("Processing indexing request: {}", indexRequest);

+        FileModel fileStatus;
+        Dossier dossier;
        switch (indexRequest.getMessageType()) {
            case INSERT:
-                var fileStatus = fileStatusClient.getFileStatus(indexRequest.getDossierId(), indexRequest.getFileId());
-                var dossier = dossierClient.getDossierById(indexRequest.getDossierId(), true, true);
+                fileStatus = fileStatusClient.getFileStatus(indexRequest.getDossierId(), indexRequest.getFileId());
+                dossier = dossierClient.getDossierById(indexRequest.getDossierId(), true, true);
                indexFile(dossier, fileStatus);
                break;

            case UPDATE:
                fileStatus = fileStatusClient.getFileStatus(indexRequest.getDossierId(), indexRequest.getFileId());
                dossier = dossierClient.getDossierById(indexRequest.getDossierId(), true, true);
-                documentUpdateService.updateDocument(indexRequest.getFileId(),
-                        fileStatus.getAssignee(),
-                        dossier.getSoftDeletedTime() != null,
-                        dossier.getArchivedTime() != null,
-                        fileStatus.getWorkflowStatus().name(),
-                        fileStatus.getFileAttributes());
-                log.info("Successfully updated {}", indexRequest);
+
+                if(documentUpdateService.documentExists(indexRequest.getFileId())) {var indexUpdateDocument = indexDocumentConverterService.convertUpdateDocument(fileStatus.getAssignee(),
+                                                                                              dossier.getSoftDeletedTime() != null,
+                                                                                              dossier.getArchivedTime() != null,
+                                                                                              fileStatus.getWorkflowStatus().name(),
+                                                                                              fileStatus.getFileAttributes());
+
+                    documentUpdateService.updateDocument(indexRequest.getFileId(), indexUpdateDocument);
+                    log.info("Successfully updated {}", indexRequest);
+                } else {
+                    indexFile(dossier, fileStatus);
+                }
                break;

            case DROP:
-                indexDeleteService.closeIndex();
-                indexDeleteService.dropIndex();
-                indexCreatorService.createIndex();
+                indexDeleteService.recreateIndex();
                addAllDocumentsToIndexQueue();
-                try {
-                    indexInformationService.updateIndexInformation();
-                } catch (Exception e) {
-                    log.error("Could not update index information", e);
-                }
+                indexInformationService.updateIndexInformation();
                break;

            default:
@ -117,34 +133,56 @@ public class IndexingMessageReceiver {


    @RabbitHandler
-    @RabbitListener(queues = INDEXING_DQL)
-    public void receiveIndexingRequestDQL(String in) throws JsonProcessingException {
+    @RabbitListener(queues = INDEXING_DLQ)
+    public void receiveIndexingRequestDQL(Message in) throws IOException {
+
+        var indexRequest = objectMapper.readValue(in.getBody(), IndexMessage.class);
+        String errorLog = "Failed to process indexing request:";
+        log.info(errorLog + ": {}", indexRequest);
+        String errorMessage = errorLog + in.getMessageProperties().getHeader(X_ERROR_INFO_HEADER);
+        OffsetDateTime timestamp = in.getMessageProperties().getHeader(X_ERROR_INFO_TIMESTAMP_HEADER);
+        timestamp = timestamp != null ? timestamp : OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
+        fileStatusProcessingUpdateClient.indexingFailed(indexRequest.getDossierId(),
+                                                        indexRequest.getFileId(),
+                                                        new FileErrorInfo(errorMessage, INDEXING_DLQ, "search-service", timestamp));

-        var indexRequest = objectMapper.readValue(in, IndexMessage.class);
-        fileStatusProcessingUpdateClient.indexingFailed(indexRequest.getDossierId(), indexRequest.getFileId());
-        log.info("Failed to process indexing request: {}", indexRequest);
    }


    @RabbitHandler
-    @RabbitListener(queues = DELETE_FROM_INDEX_QUEUE)
-    public void receiveDeleteDocumentRequest(String in) throws JsonProcessingException {
+    @RabbitListener(id = DELETE_FROM_INDEX_LISTENER_ID)
+    public void receiveDeleteDocumentRequest(Message in) throws IOException {

-        var indexRequest = objectMapper.readValue(in, IndexMessage.class);
+        var indexRequest = objectMapper.readValue(in.getBody(), IndexMessage.class);
        log.info("Processing delete document request: {}", indexRequest);
-        documentDeleteService.deleteDocument(indexRequest.getFileId());
-        log.info("Successfully deleted document with dossierId {} and fileId {}", indexRequest.getDossierId(), indexRequest.getFileId());
+        try {
+            documentDeleteService.deleteDocument(indexRequest.getFileId());
+            log.info("Successfully deleted document with dossierId {} and fileId {}", indexRequest.getDossierId(), indexRequest.getFileId());
+        } catch (Exception e) {
+            log.warn("An exception occurred in processing delete document stage: {}", e.getMessage());
+            in.getMessageProperties().getHeaders().put(X_ERROR_INFO_HEADER, e.getMessage());
+            in.getMessageProperties().getHeaders().put(X_ERROR_INFO_TIMESTAMP_HEADER, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
+
+            throw e;
+        }

    }


    @RabbitHandler
    @RabbitListener(queues = DELETE_FROM_INDEX_DLQ)
-    public void receiveDeleteDocumentRequestDLQ(String in) throws JsonProcessingException {
+    public void receiveDeleteDocumentRequestDLQ(Message in) throws IOException {
+
+        var indexRequest = objectMapper.readValue(in.getBody(), IndexMessage.class);
+        String errorLog = "Failed to process delete from index request ";
+        log.info(errorLog + ": {}", indexRequest);
+        String errorMessage = errorLog + in.getMessageProperties().getHeader(X_ERROR_INFO_HEADER);
+        OffsetDateTime timestamp = in.getMessageProperties().getHeader(X_ERROR_INFO_TIMESTAMP_HEADER);
+        timestamp = timestamp != null ? timestamp : OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
+        fileStatusProcessingUpdateClient.indexingFailed(indexRequest.getDossierId(),
+                                                        indexRequest.getFileId(),
+                                                        new FileErrorInfo(errorMessage, INDEXING_DLQ, "search-service", timestamp));

-        var indexRequest = objectMapper.readValue(in, IndexMessage.class);
-        fileStatusProcessingUpdateClient.indexingFailed(indexRequest.getDossierId(), indexRequest.getFileId());
-        log.info("Failed to process delete from index request: {}", indexRequest);
    }


@ -152,16 +190,19 @@ public class IndexingMessageReceiver {

        fileStatusProcessingUpdateClient.indexing(dossier.getId(), file.getId());
        Text text = textStorageService.getText(dossier.getId(), file.getId());
-        documentIndexService.indexDocument(dossier.getDossierTemplateId(),
-                dossier.getId(),
-                file.getId(),
-                file.getFilename(),
-                text,
-                file.getAssignee(),
-                dossier.getSoftDeletedTime() != null,
-                dossier.getArchivedTime() != null,
-                file.getWorkflowStatus(),
-                file.getFileAttributes());
+
+        var indexDocument = indexDocumentConverterService.convert(dossier.getDossierTemplateId(),
+                                                                  dossier.getId(),
+                                                                  file.getId(),
+                                                                  file.getFilename(),
+                                                                  text,
+                                                                  file.getAssignee(),
+                                                                  dossier.getSoftDeletedTime() != null,
+                                                                  dossier.getArchivedTime() != null,
+                                                                  file.getWorkflowStatus(),
+                                                                  file.getFileAttributes());
+
+        documentIndexService.indexDocument(indexDocument);
        fileStatusProcessingUpdateClient.indexingSuccessful(dossier.getId(), file.getId());
        log.info("Successfully indexed dossier {} file {}", dossier.getId(), file.getId());
    }
@ -181,17 +222,14 @@ public class IndexingMessageReceiver {
    private void addFilesToIndexingQueue(String dossierId, List<FileModel> files) {

        for (FileModel file : files) {
-            try {
-                log.info("Will add dossier {} file {} to index queue", dossierId, file.getId());
-                rabbitTemplate.convertAndSend(INDEXING_QUEUE,
-                        objectMapper.writeValueAsString(IndexMessage.builder().messageType(IndexMessageType.INSERT).dossierId(dossierId).fileId(file.getId()).build()),
-                        message -> {
-                            message.getMessageProperties().setPriority(99);
-                            return message;
-                        });
-            } catch (JsonProcessingException e) {
-                throw new RuntimeException(e);
-            }
+            log.info("Will add dossier {} file {} to index queue", dossierId, file.getId());
+            rabbitTemplate.convertAndSend(INDEXING_REQUEST_EXCHANGE,
+                                          TenantContext.getTenantId(),
+                                          IndexMessage.builder().messageType(IndexMessageType.INSERT).dossierId(dossierId).fileId(file.getId()).build(),
+                                          message -> {
+                                              message.getMessageProperties().setPriority(99);
+                                              return message;
+                                          });
        }
    }

--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/MessagingConfiguration.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/MessagingConfiguration.java
@ -1,52 +0,0 @@
-package com.iqser.red.service.search.v1.server.queue;
-
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.core.QueueBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import lombok.RequiredArgsConstructor;
-
-@Configuration
-@RequiredArgsConstructor
-public class MessagingConfiguration {
-
-    public static final String INDEXING_QUEUE = "indexingQueue";
-    public static final String INDEXING_DQL = "indexingDQL";
-
-    public static final String DELETE_FROM_INDEX_QUEUE = "deleteFromIndexQueue";
-    public static final String DELETE_FROM_INDEX_DLQ = "deleteFromIndexDLQ";
-
-
-    @Bean
-    public Queue indexingQueue() {
-
-        return QueueBuilder.durable(INDEXING_QUEUE).withArgument("x-dead-letter-exchange", "").withArgument("x-dead-letter-routing-key", INDEXING_DQL).maxPriority(2).build();
-    }
-
-
-    @Bean
-    public Queue indexingDeadLetterQueue() {
-
-        return QueueBuilder.durable(INDEXING_DQL).build();
-    }
-
-
-    @Bean
-    public Queue deleteFromIndexQueue() {
-
-        return QueueBuilder.durable(DELETE_FROM_INDEX_QUEUE)
-                .withArgument("x-dead-letter-exchange", "")
-                .withArgument("x-dead-letter-routing-key", DELETE_FROM_INDEX_DLQ)
-                .maxPriority(2)
-                .build();
-    }
-
-
-    @Bean
-    public Queue deleteFromIndexDLQ() {
-
-        return QueueBuilder.durable(DELETE_FROM_INDEX_DLQ).build();
-    }
-
-}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/TenantExchangeMessageReceiverImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/TenantExchangeMessageReceiverImpl.java
@ -0,0 +1,74 @@
+package com.iqser.red.service.search.v1.server.queue;
+
+import static com.iqser.red.service.search.v1.server.configuration.MessagingConfiguration.*;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.tenantcommons.TenantProvider;
+import com.knecon.fforesight.tenantcommons.model.TenantCreatedEvent;
+import com.knecon.fforesight.tenantcommons.model.TenantQueueConfiguration;
+import com.knecon.fforesight.tenantcommons.model.TenantResponse;
+import com.knecon.fforesight.tenantcommons.queue.RabbitQueueFromExchangeService;
+import com.knecon.fforesight.tenantcommons.queue.TenantExchangeMessageReceiver;
+
+@Service
+public class TenantExchangeMessageReceiverImpl extends TenantExchangeMessageReceiver {
+
+    public TenantExchangeMessageReceiverImpl(RabbitQueueFromExchangeService rabbitQueueService, TenantProvider tenantProvider) {
+
+        super(rabbitQueueService, tenantProvider);
+    }
+
+
+    @Override
+    protected Set<TenantQueueConfiguration> getTenantQueueConfigs() {
+
+        return Set.of(TenantQueueConfiguration.builder()
+                              .listenerId(IndexingMessageReceiver.INDEXING_LISTENER_ID)
+                              .exchangeName(INDEXING_REQUEST_EXCHANGE)
+                              .queuePrefix(INDEXING_REQUEST_QUEUE_PREFIX)
+                              .dlqName(INDEXING_DLQ)
+                              .arguments(Map.of("x-max-priority", 2))
+                              .build(),
+                      TenantQueueConfiguration.builder()
+                              .listenerId(IndexingMessageReceiver.DELETE_FROM_INDEX_LISTENER_ID)
+                              .exchangeName(DELETE_FROM_INDEX_REQUEST_EXCHANGE)
+                              .queuePrefix(DELETE_FROM_INDEX_REQUEST_QUEUE_PREFIX)
+                              .dlqName(DELETE_FROM_INDEX_DLQ)
+                              .arguments(Map.of("x-max-priority", 2))
+                              .build());
+    }
+
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void onApplicationReady() {
+
+        System.out.println("application ready invoked");
+        super.initializeQueues();
+    }
+
+
+    @RabbitHandler
+    @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantCreatedQueueName()}")
+    public void reactToTenantCreation(TenantCreatedEvent tenantCreatedEvent) {
+
+        super.reactToTenantCreation(tenantCreatedEvent);
+    }
+
+
+    @RabbitHandler
+    @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantDeletedQueueName()}")
+    public void reactToTenantDeletion(TenantResponse tenantResponse) {
+
+        super.reactToTenantDeletion(tenantResponse);
+
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/UpdatedTenantMessageReceiver.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/UpdatedTenantMessageReceiver.java
@ -0,0 +1,48 @@
+package com.iqser.red.service.search.v1.server.queue;
+
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.service.IndexDeleteService;
+import com.iqser.red.service.search.v1.server.service.IndexQueryResult;
+import com.iqser.red.service.search.v1.server.service.IndexQueryService;
+import com.knecon.fforesight.tenantcommons.model.TenantResponse;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class UpdatedTenantMessageReceiver {
+
+    private final IndexQueryService indexQueryService;
+    private final IndexDeleteService indexDeleteService;
+
+    @Value("${fforesight.multitenancy.tenant-updated-queue:search-service-tenant-updated}")
+    private String tenantUpdatedQueue;
+
+
+    @PostConstruct
+    public void postConstruct() {
+
+        log.info("Listener for tenant updated events started for queue: {}", this.tenantUpdatedQueue);
+    }
+
+
+    @RabbitListener(queues = "${fforesight.multitenancy.tenant-updated-queue:search-service-tenant-updated}")
+    public void updateTenant(TenantResponse tenant) {
+
+        String numberOfReplicas = tenant.getSearchConnection().getNumberOfReplicas();
+        String numberOfShards = tenant.getSearchConnection().getNumberOfShards();
+        IndexQueryResult queryResult = indexQueryService.getIndexQueryResult(tenant.getSearchConnection());
+
+        if (queryResult.isIndexFound() && (!numberOfReplicas.equals(queryResult.getNumberOfReplicas()) || !numberOfShards.equals(queryResult.getNumberOfShards()))) {
+            log.info("Number of shards or replicas were changed during tenant update, indices will be recreated");
+            indexDeleteService.recreateIndex(tenant.getSearchConnection());
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentDeleteService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentDeleteService.java
@ -1,38 +1,8 @@
 package com.iqser.red.service.search.v1.server.service;

-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
+public interface DocumentDeleteService {

-import java.io.IOException;
-
-import org.opensearch.action.delete.DeleteRequest;
-import org.opensearch.client.RequestOptions;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
-import com.iqser.red.service.search.v1.server.exception.IndexException;
-import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class DocumentDeleteService {
-
-    private final ElasticsearchClient client;
-    private final ElasticsearchSettings settings;
-
-
-    public void deleteDocument(String fileId) {
-
-        DeleteRequest request = new DeleteRequest(INDEX_NAME).id(fileId).setRefreshPolicy(settings.getRefreshPolicy());
-
-        try {
-            client.delete(request, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            throw new IndexException(String.format(IndexException.DOCUMENT_DELETE_ERROR, fileId), e);
-        }
-    }
+    void deleteDocument(String fileId);

 }

-
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java
@ -1,123 +1,10 @@
 package com.iqser.red.service.search.v1.server.service;

-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
-
-import java.io.IOException;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.opensearch.action.index.IndexRequest;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.common.xcontent.XContentType;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
-import com.iqser.red.service.search.v1.server.exception.IndexException;
 import com.iqser.red.service.search.v1.server.model.IndexDocument;
-import com.iqser.red.service.search.v1.server.model.IndexFileAttribute;
-import com.iqser.red.service.search.v1.server.model.IndexSection;
-import com.iqser.red.service.search.v1.server.model.SectionArea;
-import com.iqser.red.service.search.v1.server.model.SectionText;
-import com.iqser.red.service.search.v1.server.model.Text;
-import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;

-import io.micrometer.core.annotation.Timed;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class DocumentIndexService {
-
-    private final ElasticsearchClient client;
-    private final ElasticsearchSettings settings;
-    private final ObjectMapper objectMapper;
+public interface DocumentIndexService {


-    @Timed("redactmanager_indexDocument")
-    public void indexDocument(String dossierTemplateId,
-                              String dossierId,
-                              String fileId,
-                              String filename,
-                              Text text,
-                              String assignee,
-                              boolean deleted,
-                              boolean archived,
-                              WorkflowStatus workflowStatus,
-                              Map<String, String> fileAttributes) {
-
-        IndexRequest indexRequest = new IndexRequest(INDEX_NAME).id(fileId);
-        indexRequest.setRefreshPolicy(settings.getRefreshPolicy());
-        indexRequest.source(toJson(convert(dossierTemplateId, dossierId, fileId, filename, text, assignee, deleted, archived, workflowStatus, fileAttributes)), XContentType.JSON);
-
-        try {
-            client.index(indexRequest, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            throw new IndexException(String.format(IndexException.DOCUMENT_INDEX_ERROR, fileId), e);
-        }
-    }
-
-
-    public String toJson(IndexDocument indexDocument) {
-
-        try {
-            return objectMapper.writeValueAsString(indexDocument);
-        } catch (JsonProcessingException e) {
-            throw new IndexException(String.format(IndexException.CONTENT_TO_JSON_ERROR, indexDocument.getFileId()), e);
-        }
-    }
-
-
-    private IndexDocument convert(String dossierTemplateId,
-                                  String dossierId,
-                                  String fileId,
-                                  String filename,
-                                  Text text,
-                                  String assignee,
-                                  boolean deleted,
-                                  boolean archived,
-                                  WorkflowStatus workflowStatus,
-                                  Map<String, String> fileAttributes) {
-
-        return IndexDocument.builder()
-                .dossierTemplateId(dossierTemplateId)
-                .dossierId(dossierId)
-                .fileId(fileId)
-                .filename(filename)
-                .sections(text.getSectionTexts().stream().map(this::convert).collect(Collectors.toList()))
-                .date(OffsetDateTime.now())
-                .fileAttributes(convertFileAttributes(fileAttributes))
-                .assignee(assignee)
-                .dossierDeleted(deleted)
-                .dossierArchived(archived)
-                .workflowStatus(workflowStatus.name())
-                .build();
-    }
-
-
-    private List<IndexFileAttribute> convertFileAttributes(Map<String, String> fileAttributes) {
-
-        List<IndexFileAttribute> converted = new ArrayList<>();
-        fileAttributes.entrySet().forEach(entry -> converted.add(new IndexFileAttribute(entry.getKey(), entry.getValue())));
-        return converted;
-    }
-
-
-    private IndexSection convert(SectionText sectionText) {
-
-        return IndexSection.builder()
-                .sectionNumber(sectionText.getSectionNumber())
-                .text(sectionText.getText())
-                .pages(sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()))
-                .headline(sectionText.getHeadline())
-                .build();
-    }
+    void indexDocument(IndexDocument indexDocument);

 }
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java
@ -1,64 +1,10 @@
 package com.iqser.red.service.search.v1.server.service;

-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.opensearch.action.update.UpdateRequest;
-import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.common.xcontent.XContentType;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
 import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate;
-import com.iqser.red.service.search.v1.server.model.IndexFileAttribute;

-import io.micrometer.core.annotation.Timed;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
+public interface DocumentUpdateService {

-@Service
-@RequiredArgsConstructor
-public class DocumentUpdateService {
+    void updateDocument(String fileId, IndexDocumentUpdate indexDocumentUpdate);
+    boolean documentExists(String fileId);

-    private final ObjectMapper objectMapper;
-    private final ElasticsearchClient client;
-
-
-    @SneakyThrows
-    @Timed("redactmanager_updateDocument")
-    public void updateDocument(String fileId, String assignee, boolean deleted, boolean archived, String workflowStatus, Map<String, String> fileAttributes) {
-
-        var indexUpdateRequest = IndexDocumentUpdate.builder()
-                .assignee(assignee)
-                .dossierDeleted(deleted)
-                .dossierArchived(archived)
-                .workflowStatus(workflowStatus)
-                .fileAttributes(convertFileAttributes(fileAttributes))
-                .build();
-
-        UpdateRequest request = new UpdateRequest(INDEX_NAME, fileId);
-        request.doc(objectMapper.writeValueAsString(indexUpdateRequest), XContentType.JSON);
-
-        UpdateResponse updateResponse = client.update(request, RequestOptions.DEFAULT);
-        if (updateResponse.status().getStatus() < 200 || updateResponse.status().getStatus() > 204) {
-            throw new IllegalStateException("Document could not be updated. HTTP error " + updateResponse.status().getStatus());
-        }
-
-    }
-
-
-    private List<IndexFileAttribute> convertFileAttributes(Map<String, String> fileAttributes) {
-
-        List<IndexFileAttribute> converted = new ArrayList<>();
-        if (fileAttributes != null && !fileAttributes.isEmpty()) {
-            fileAttributes.forEach((key, value) -> converted.add(new IndexFileAttribute(key, value)));
-        }
-        return converted;
-    }
-
-}
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java
@ -1,75 +0,0 @@
-package com.iqser.red.service.search.v1.server.service;
-
-import static com.iqser.red.service.search.v1.server.exception.IndexException.INDEX_EXISTS_ERROR;
-
-import java.io.IOException;
-
-import org.opensearch.client.RequestOptions;
-import org.opensearch.client.indices.CreateIndexRequest;
-import org.opensearch.client.indices.CreateIndexResponse;
-import org.opensearch.client.indices.GetIndexRequest;
-import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentType;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
-import com.iqser.red.service.search.v1.server.exception.IndexException;
-import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
-import com.iqser.red.service.search.v1.server.utils.ResourceLoader;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-public class IndexCreatorService {
-
-    public static final String INDEX_NAME = "redaction";
-
-    private final ElasticsearchClient client;
-    private final ElasticsearchSettings settings;
-
-
-    public IndexCreatorService(ElasticsearchClient client, ElasticsearchSettings settings) {
-
-        this.client = client;
-        this.settings = settings;
-
-        if (!indexExists()) {
-            createIndex();
-        }
-    }
-
-
-    public void createIndex() {
-
-        String indexMapping = ResourceLoader.load("index/mapping.json");
-        String indexSettings = ResourceLoader.load("index/settings.json");
-
-        Settings.Builder settingsBuilder = Settings.builder()
-                .loadFromSource(indexSettings, XContentType.JSON)
-                .put("number_of_shards", settings.getNumberOfShards())
-                .put("number_of_replicas", settings.getNumberOfReplicas())
-                .put("index.mapping.nested_objects.limit", settings.getNumberOfNestedObjectLimit());
-
-        CreateIndexRequest createIndexRequest = new CreateIndexRequest(INDEX_NAME).settings(settingsBuilder.build()).mapping(indexMapping, XContentType.JSON);
-
-        try {
-            CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
-            log.info("Successfully created index: {}", response.index());
-        } catch (IOException e) {
-            log.error("Failed to create index.", e);
-        }
-    }
-
-
-    private boolean indexExists() {
-
-        GetIndexRequest getIndexRequest = new GetIndexRequest(INDEX_NAME);
-        try {
-            return client.indices().exists(getIndexRequest, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            throw new IndexException(INDEX_EXISTS_ERROR, e);
-        }
-    }
-
-}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java
@ -1,61 +1,19 @@
 package com.iqser.red.service.search.v1.server.service;

-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;

-import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.opensearch.action.support.master.AcknowledgedResponse;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.client.indices.CloseIndexRequest;
-import org.opensearch.common.unit.TimeValue;
-import org.springframework.stereotype.Service;
+public interface IndexDeleteService {

-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
-import com.iqser.red.service.search.v1.server.exception.IndexException;
+    void recreateIndex();

-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class IndexDeleteService {
-
-    private final ElasticsearchClient client;
+    void recreateIndex(SearchConnection searchConnection);


-    @SneakyThrows
-    public void closeIndex() {
-
-        log.info("Will close index");
-        CloseIndexRequest request = new CloseIndexRequest(INDEX_NAME);
-        request.setTimeout(TimeValue.timeValueMinutes(2));
-        AcknowledgedResponse closeIndexResponse = client.indices().close(request, RequestOptions.DEFAULT);
-
-        if (closeIndexResponse.isAcknowledged()) {
-            log.info("Index is closed");
-        } else {
-            throw new IndexException("Error while closing index");
-        }
-
-    }
+    void closeIndex();


-    @SneakyThrows
-    public void dropIndex() {
+    void dropIndex();

-        log.info("Will drop index");
-        DeleteIndexRequest request = new DeleteIndexRequest(INDEX_NAME);
-        request.timeout(TimeValue.timeValueMinutes(2));
-        request.timeout("2m");
-        AcknowledgedResponse deleteIndexResponse = client.indices().delete(request, RequestOptions.DEFAULT);
+    void dropIndex(SearchConnection searchConnection);

-        if (deleteIndexResponse.isAcknowledged()) {
-            log.info("Index is dropped");
-        } else {
-            throw new IndexException("Error while dropping index");
-        }
-
-    }
-
-}
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDocumentConverterService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDocumentConverterService.java
@ -0,0 +1,84 @@
+package com.iqser.red.service.search.v1.server.service;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
+import com.iqser.red.service.search.v1.server.model.IndexDocument;
+import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate;
+import com.iqser.red.service.search.v1.server.model.IndexFileAttribute;
+import com.iqser.red.service.search.v1.server.model.IndexSection;
+import com.iqser.red.service.search.v1.server.model.SectionArea;
+import com.iqser.red.service.search.v1.server.model.SectionText;
+import com.iqser.red.service.search.v1.server.model.Text;
+
+@Service
+public class IndexDocumentConverterService {
+
+    public IndexDocument convert(String dossierTemplateId,
+                                  String dossierId,
+                                  String fileId,
+                                  String filename,
+                                  Text text,
+                                  String assignee,
+                                  boolean deleted,
+                                  boolean archived,
+                                  WorkflowStatus workflowStatus,
+                                  Map<String, String> fileAttributes) {
+
+        return IndexDocument.builder()
+                .dossierTemplateId(dossierTemplateId)
+                .dossierId(dossierId)
+                .fileId(fileId)
+                .filename(filename)
+                .sections(text.getSectionTexts().stream().map(this::convert).collect(Collectors.toList()))
+                .date(Date.from(OffsetDateTime.now().toInstant()))
+                .fileAttributes(convertFileAttributes(fileAttributes))
+                .assignee(assignee)
+                .dossierDeleted(deleted)
+                .dossierArchived(archived)
+                .workflowStatus(workflowStatus.name())
+                .build();
+    }
+
+
+    public IndexDocumentUpdate convertUpdateDocument(String assignee, boolean deleted, boolean archived, String workflowStatus, Map<String, String> fileAttributes) {
+        return IndexDocumentUpdate.builder()
+                .assignee(assignee)
+                .dossierDeleted(deleted)
+                .dossierArchived(archived)
+                .workflowStatus(workflowStatus)
+                .fileAttributes(convertFileAttributes(fileAttributes))
+                .build();
+    }
+
+
+    private List<IndexFileAttribute> convertFileAttributes(Map<String, String> fileAttributes) {
+
+        List<IndexFileAttribute> converted = new ArrayList<>();
+        if (fileAttributes != null && !fileAttributes.isEmpty()) {
+            fileAttributes.forEach((key, value) -> converted.add(new IndexFileAttribute(key, value)));
+        }
+        return converted;
+    }
+
+    private IndexSection convert(SectionText sectionText) {
+
+        return IndexSection.builder()
+                .sectionNumber(sectionText.getSectionNumber())
+                .text(sectionText.getText())
+                .pages(sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()))
+                .headline(sectionText.getHeadline())
+                .build();
+    }
+
+
+
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexInformationService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexInformationService.java
@ -10,7 +10,7 @@ import org.apache.commons.codec.binary.StringUtils;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;

-import com.iqser.red.service.persistence.service.v1.api.model.index.IndexInformation;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.index.IndexInformation;
 import com.iqser.red.service.search.v1.server.client.IndexInformationClient;

 import lombok.RequiredArgsConstructor;
@ -68,13 +68,13 @@ public class IndexInformationService {
        byte[] buffer = new byte[8192];
        int count;
        MessageDigest digest = MessageDigest.getInstance("SHA-256");
-        BufferedInputStream bis = new BufferedInputStream(new ClassPathResource(PATH_TO_CONFIG).getInputStream());
-        while ((count = bis.read(buffer)) > 0) {
-            digest.update(buffer, 0, count);
-        }
-        bis.close();
+        try (BufferedInputStream bis = new BufferedInputStream(new ClassPathResource(PATH_TO_CONFIG).getInputStream())) {
+            while ((count = bis.read(buffer)) > 0) {
+                digest.update(buffer, 0, count);
+            }

-        return Arrays.toString(digest.digest());
+            return Arrays.toString(digest.digest());
+        }
    }

 }
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexQueryResult.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexQueryResult.java
@ -0,0 +1,17 @@
+package com.iqser.red.service.search.v1.server.service;
+
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class IndexQueryResult {
+
+    boolean indexFound;
+    String numberOfShards;
+    String numberOfReplicas;
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexQueryService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexQueryService.java
@ -0,0 +1,9 @@
+package com.iqser.red.service.search.v1.server.service;
+
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+public interface IndexQueryService {
+
+    IndexQueryResult getIndexQueryResult(SearchConnection searchConnection);
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java
@ -1,313 +1,23 @@
 package com.iqser.red.service.search.v1.server.service;

-import static com.iqser.red.service.search.v1.server.exception.IndexException.FAILED_TO_SEARCH;
-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

-import org.apache.lucene.search.join.ScoreMode;
-import org.opensearch.action.search.SearchRequest;
-import org.opensearch.action.search.SearchResponse;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.common.text.Text;
-import org.opensearch.index.query.BoolQueryBuilder;
-import org.opensearch.index.query.InnerHitBuilder;
-import org.opensearch.index.query.NestedQueryBuilder;
-import org.opensearch.index.query.QueryBuilder;
-import org.opensearch.index.query.QueryBuilders;
-import org.opensearch.search.SearchHit;
-import org.opensearch.search.SearchHits;
-import org.opensearch.search.builder.SearchSourceBuilder;
-import org.opensearch.search.fetch.subphase.FetchSourceContext;
-import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.search.v1.model.MatchedDocument;
-import com.iqser.red.service.search.v1.model.MatchedSection;
 import com.iqser.red.service.search.v1.model.SearchResult;
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
-import com.iqser.red.service.search.v1.server.exception.IndexException;
-import com.iqser.red.service.search.v1.server.model.Query;
-import com.iqser.red.service.search.v1.server.utils.QueryStringConverter;

-import io.micrometer.core.annotation.Timed;
-import io.micrometer.core.instrument.util.StringUtils;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class SearchService {
-
-    private final ElasticsearchClient client;
-
-
-    @Timed("redactmanager_search")
-    public SearchResult search(String queryString,
-                               List<String> dossierTemplateIds,
-                               List<String> dossierIds,
-                               String fileId,
-                               String assignee,
-                               boolean includeDeletedDossiers,
-                               boolean includeArchivedDossiers,
-                               String workflowStatus,
-                               Map<String, String> fileAttributes,
-                               int page,
-                               int pageSize,
-                               boolean returnSections) {
-
-        Query query = QueryStringConverter.convert(queryString);
-
-        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(convertQuery(query,
-                        dossierTemplateIds,
-                        dossierIds,
-                        fileId,
-                        assignee,
-                        includeDeletedDossiers,
-                        includeArchivedDossiers,
-                        workflowStatus,
-                        fileAttributes,
-                        returnSections))
-                .from(getPageOrDefault(page) * getPageSizeOrDefault(pageSize))
-                .size(getPageSizeOrDefault(pageSize))
-                .fetchSource(new String[]{"dossierId", "dossierTemplateId", "dossierDeleted", "dossierArchived", "filename", "fileId", "assignee", "dossierStatus", "workflowStatus", "fileAttributes"},
-                        new String[]{"sections"})
-                .highlighter(new HighlightBuilder().field("sections.text").field("filename").field("fileAttributes.value").highlighterType("fvh"))
-                .trackScores(true);
-
-        SearchRequest request = new SearchRequest(INDEX_NAME).source(searchSourceBuilder);
-
-        SearchResponse response = execute(request);
-
-        return convert(response, query);
-    }
-
-
-    protected SearchResponse execute(SearchRequest searchRequest) {
-
-        try {
-            return client.search(searchRequest, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            throw new IndexException(FAILED_TO_SEARCH, e);
-        }
-    }
-
-
-    private QueryBuilder convertQuery(Query query,
-                                      List<String> dossierTemplateIds,
-                                      List<String> dossierIds,
-                                      String fileId,
-                                      String assignee,
-                                      boolean includeDeletedDossiers,
-                                      boolean includeArchivedDossiers,
-                                      String workflowStatus,
-                                      Map<String, String> fileAttributes,
-                                      boolean returnSections) {
-
-        BoolQueryBuilder entireQuery = QueryBuilders.boolQuery();
-        BoolQueryBuilder sectionsQueries = QueryBuilders.boolQuery();
-
-        for (String must : query.getMusts()) {
-
-            QueryBuilder textPhraseQuery = QueryBuilders.matchPhraseQuery("sections.text", must.toLowerCase(Locale.ROOT)).queryName(must);
-            QueryBuilder filenamePhraseQuery = QueryBuilders.matchPhrasePrefixQuery("filename", must.toLowerCase(Locale.ROOT)).queryName("filename." + must);
-            QueryBuilder fileAttributesPhraseQuery = QueryBuilders.matchPhraseQuery("fileAttributes.value", must.toLowerCase(Locale.ROOT)).queryName("fileAttributes." + must);
-
-            QueryBuilder filenameOrTextMustQuery = QueryBuilders.boolQuery().should(textPhraseQuery).should(filenamePhraseQuery).should(fileAttributesPhraseQuery);
-            entireQuery.must(filenameOrTextMustQuery);
-            sectionsQueries.should(textPhraseQuery);
-        }
-        for (String should : query.getShoulds()) {
-
-            QueryBuilder textTermQuery = QueryBuilders.matchPhraseQuery("sections.text", should.toLowerCase(Locale.ROOT)).queryName(should);
-            QueryBuilder filenameTermQuery = QueryBuilders.matchPhrasePrefixQuery("filename", should.toLowerCase(Locale.ROOT)).queryName("filename." + should);
-            QueryBuilder fileAttributesPhraseQuery = QueryBuilders.matchPhraseQuery("fileAttributes.value", should.toLowerCase(Locale.ROOT)).queryName("fileAttributes." + should);
-            entireQuery.should(textTermQuery);
-            entireQuery.should(filenameTermQuery);
-            entireQuery.should(fileAttributesPhraseQuery);
-            sectionsQueries.should(textTermQuery);
-        }
-
-        if (returnSections) {
-            NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery("sections", sectionsQueries, ScoreMode.Avg)
-                    .innerHit(new InnerHitBuilder().setSize(100)
-                            .setFetchSourceContext(new FetchSourceContext(true,
-                                    new String[]{"sections.headline", "sections.sectionNumber", "sections.pages"},
-                                    new String[]{"sections.text"})));
-            entireQuery.should(nestedQuery);
-        }
-
-        BoolQueryBuilder filterQuery = QueryBuilders.boolQuery();
-
-        if (dossierTemplateIds != null && !dossierTemplateIds.isEmpty()) {
-
-            var dossierTemplateIdQueryBuilder = QueryBuilders.boolQuery();
-
-            for (var dossierTemplateId : dossierTemplateIds) {
-                if (StringUtils.isNotEmpty(dossierTemplateId)) {
-                    dossierTemplateIdQueryBuilder = dossierTemplateIdQueryBuilder.should(QueryBuilders.matchQuery("dossierTemplateId", dossierTemplateId));
-                }
-            }
-
-            filterQuery.must(dossierTemplateIdQueryBuilder);
-        }
-
-        if (dossierIds != null && !dossierIds.isEmpty()) {
-
-            var dossierIdQueryBuilder = QueryBuilders.boolQuery();
-
-            for (var dossierId : dossierIds) {
-                if (StringUtils.isNotEmpty(dossierId)) {
-                    dossierIdQueryBuilder = dossierIdQueryBuilder.should(QueryBuilders.matchQuery("dossierId", dossierId));
-                }
-            }
-
-            filterQuery.must(dossierIdQueryBuilder);
-        }
-
-        if (StringUtils.isNotEmpty(fileId)) {
-            filterQuery.must(QueryBuilders.matchQuery("fileId", fileId));
-        }
-
-        if (StringUtils.isNotEmpty(assignee)) {
-            filterQuery.must(QueryBuilders.matchQuery("assignee", assignee));
-        }
-
-        if (includeArchivedDossiers) {
-            filterQuery.must(QueryBuilders.termsQuery("dossierArchived", true, false));
-        } else {
-            filterQuery.must(QueryBuilders.termsQuery("dossierArchived", false));
-        }
-
-        if (includeDeletedDossiers) {
-            filterQuery.must(QueryBuilders.termsQuery("dossierDeleted", true, false));
-        } else {
-            filterQuery.must(QueryBuilders.termsQuery("dossierDeleted", false));
-        }
-
-        if (StringUtils.isNotEmpty(workflowStatus)) {
-            filterQuery.must(QueryBuilders.matchQuery("workflowStatus", workflowStatus));
-        }
-
-        if (fileAttributes != null && !fileAttributes.isEmpty()) {
-            var fileAttributesQueryBuilder = QueryBuilders.boolQuery();
-
-            for (var fileAttributeKey : fileAttributes.keySet()) {
-                if (StringUtils.isNotEmpty(fileAttributeKey)) {
-                    fileAttributesQueryBuilder.filter(QueryBuilders.boolQuery()
-                            .must(QueryBuilders.matchQuery("fileAttributes.name", fileAttributeKey))
-                            .must(QueryBuilders.matchQuery("fileAttributes.value", fileAttributes.get(fileAttributeKey))));
-                }
-            }
-
-            filterQuery.must(fileAttributesQueryBuilder);
-        }
-
-        return QueryBuilders.boolQuery().filter(filterQuery).must(entireQuery);
-    }
-
-
-    private SearchResult convert(SearchResponse response, Query query) {
-
-        return SearchResult.builder()
-                .matchedDocuments(Arrays.stream(response.getHits().getHits()).map(hit -> convertSearchHit(hit, query)).collect(Collectors.toList()))
-                .maxScore(response.getHits().getMaxScore())
-                .total(response.getHits().getTotalHits().value)
-                .build();
-    }
-
-
-    private MatchedDocument convertSearchHit(SearchHit hit, Query query) {
-
-        Set<String> matchesTerms = Arrays.stream(hit.getMatchedQueries())
-                .map(match -> match.contains("filename.") ? match.replace("filename.", "") : match)
-                .map(match -> match.contains("fileAttributes.") ? match.replace("fileAttributes.", "") : match)
-                .collect(Collectors.toSet());
-
-        Set<String> unmatchedTerms = Stream.concat(query.getMusts().stream(), query.getShoulds().stream()).filter(term -> !matchesTerms.contains(term)).collect(Collectors.toSet());
-
-        MatchedDocument.MatchedDocumentBuilder matchedDocumentBuilder = MatchedDocument.builder()
-                .score(hit.getScore())
-                .dossierId((String) hit.getSourceAsMap().get("dossierId"))
-                .dossierTemplateId((String) hit.getSourceAsMap().get("dossierTemplateId"))
-                .fileId((String) hit.getSourceAsMap().get("fileId"))
-                .dossierStatus((String) hit.getSourceAsMap().get("dossierStatus"))
-                .assignee((String) hit.getSourceAsMap().get("assignee"))
-                .fileAttributes(convertFileAttributes(hit.getSourceAsMap().get("fileAttributes")))
-                .workflowStatus((String) hit.getSourceAsMap().get("workflowStatus"))
-                .fileName((String) hit.getSourceAsMap().get("fileName"))
-                .dossierDeleted((Boolean) hit.getSourceAsMap().get("dossierDeleted"))
-                .dossierArchived((Boolean) hit.getSourceAsMap().get("dossierArchived"))
-                .highlights(hit.getHighlightFields()
-                        .entrySet()
-                        .stream()
-                        .collect(Collectors.toMap(Map.Entry::getKey, e -> Arrays.stream(e.getValue().getFragments()).map(Text::string).collect(Collectors.toSet()))))
-                .matchedTerms(matchesTerms)
-                .unmatchedTerms(unmatchedTerms);
-
-        if (hit.getInnerHits() != null) {
-            SearchHits sectionHits = hit.getInnerHits().get("sections");
-
-            matchedDocumentBuilder.matchedSections(Arrays.stream(sectionHits.getHits()).map(innerHit -> convertInnerHit(innerHit)).collect(Collectors.toList()))
-                    .containsAllMatchedSections(sectionHits.getTotalHits().value == sectionHits.getHits().length);
-        }
-
-        return matchedDocumentBuilder.build();
-
-    }
-
-
-    private Map<String, String> convertFileAttributes(Object fileAttributesSourceMap) {
-
-        Map<String, String> fileAttributes = new HashMap<>();
-
-        if (fileAttributesSourceMap != null) {
-            List<HashMap<String, String>> list = new ObjectMapper().convertValue(fileAttributesSourceMap, ArrayList.class);
-            list.forEach(r -> fileAttributes.put(r.get("name"), r.get("value")));
-        }
-
-        return fileAttributes;
-    }
-
-
-    private MatchedSection convertInnerHit(SearchHit hit) {
-
-        return MatchedSection.builder()
-                .headline((String) hit.getSourceAsMap().get("headline"))
-                .sectionNumber((Integer) hit.getSourceAsMap().get("sectionNumber"))
-                .pages(new HashSet<>((ArrayList<Integer>) hit.getSourceAsMap().get("pages")))
-                .matchedTerms(Arrays.stream(hit.getMatchedQueries()).collect(Collectors.toSet()))
-                .build();
-    }
-
-
-    private int getPageSizeOrDefault(int pageSize) {
-
-        if (pageSize <= 0) {
-            return 10;
-        }
-        return pageSize;
-    }
-
-
-    private int getPageOrDefault(int page) {
-
-        if (page < 0) {
-            return 0;
-        }
-        return page;
-    }
-
-}
+public interface SearchService {
+
+    SearchResult search(String queryString,
+                        List<String> dossierTemplateIds,
+                        List<String> dossierIds,
+                        String fileId,
+                        String assignee,
+                        boolean includeDeletedDossiers,
+                        boolean includeArchivedDossiers,
+                        String workflowStatus,
+                        Map<String, String> fileAttributes,
+                        int page,
+                        int pageSize,
+                        boolean returnSections);
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/TextStorageService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/TextStorageService.java
@ -2,10 +2,11 @@ package com.iqser.red.service.search.v1.server.service;

 import org.springframework.stereotype.Service;

-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.search.v1.server.model.Text;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
+import com.knecon.fforesight.tenantcommons.TenantContext;

 import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
@ -23,7 +24,7 @@ public class TextStorageService {
    public Text getText(String dossierId, String fileId) {

        try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SIMPLIFIED_TEXT), Text.class);
+            return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.SIMPLIFIED_TEXT), Text.class);
        } catch (StorageObjectDoesNotExist e) {
            throw new RuntimeException("Text is not available", e);
        } catch (Exception e) {
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentDeleteServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentDeleteServiceImpl.java
@ -0,0 +1,43 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.io.IOException;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.service.DocumentDeleteService;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
+import co.elastic.clients.elasticsearch._types.Refresh;
+import co.elastic.clients.elasticsearch.core.DeleteRequest;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+public class DocumentDeleteServiceImpl implements DocumentDeleteService {
+
+    private final EsClientCache clientCache;
+    private final ElasticsearchSettings settings;
+
+
+    public void deleteDocument(String fileId) {
+
+        DeleteRequest request = new DeleteRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                .id(fileId)
+                .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy()))
+                .build();
+
+        try {
+            clientCache.getClient().delete(request);
+        } catch (IOException | ElasticsearchException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.documentDeleteError(fileId, e);
+        }
+    }
+
+}
+
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentIndexServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentIndexServiceImpl.java
@ -0,0 +1,45 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.io.IOException;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.model.IndexDocument;
+import com.iqser.red.service.search.v1.server.service.DocumentIndexService;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
+import co.elastic.clients.elasticsearch._types.Refresh;
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+public class DocumentIndexServiceImpl implements DocumentIndexService {
+
+    private final EsClientCache clientCache;
+    private final ElasticsearchSettings settings;
+
+
+    @Timed("redactmanager_indexDocument")
+    public void indexDocument(IndexDocument indexDocument) {
+
+        try {
+            clientCache.getClient()
+                    .index(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                            .id(indexDocument.getFileId())
+                            .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy()))
+                            .document(indexDocument));
+        } catch (IOException | ElasticsearchException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.documentIndexError(indexDocument.getFileId(), e);
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentUpdateServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentUpdateServiceImpl.java
@ -0,0 +1,53 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.io.IOException;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate;
+import com.iqser.red.service.search.v1.server.service.DocumentUpdateService;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
+import co.elastic.clients.elasticsearch._types.Refresh;
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+public class DocumentUpdateServiceImpl implements DocumentUpdateService {
+
+    private final EsClientCache clientCache;
+    private final ElasticsearchSettings settings;
+
+
+    @SneakyThrows
+    @Timed("redactmanager_updateDocument")
+    public void updateDocument(String fileId, IndexDocumentUpdate indexDocumentUpdate) {
+
+        try {
+            clientCache.getClient()
+                    .update(u -> u.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                            .id(fileId)
+                            .doc(indexDocumentUpdate)
+                            .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), IndexDocumentUpdate.class);
+        } catch (IOException | ElasticsearchException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.documentUpdateError(fileId, e);
+        }
+    }
+
+
+    @SneakyThrows
+    @Timed("redactmanager_documentExists")
+    public boolean documentExists(String fileId) {
+
+        return clientCache.getClient().exists(e -> e.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())).id(fileId)).value();
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClient.java
@ -0,0 +1,66 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.util.stream.Collectors;
+
+import lombok.SneakyThrows;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.rest_client.RestClientTransport;
+import lombok.Data;
+import lombok.experimental.Delegate;
+
+@Data
+@SuppressWarnings("PMD")
+public class EsClient {
+
+    // Lower timeouts should be set per request.
+    private static final int ABSURD_HIGH_TIMEOUT = 600_000;
+
+    private SearchConnection searchConnection;
+
+    @Delegate
+    private ElasticsearchClient elasticsearchClient;
+
+
+    public EsClient(SearchConnection searchConnection) {
+
+        HttpHost[] httpHost = searchConnection.getHosts()
+                .stream()
+                .map(host -> new HttpHost(host, searchConnection.getPort(), searchConnection.getScheme()))
+                .toList()
+                .toArray(new HttpHost[searchConnection.getHosts().size()]);
+
+        var builder = RestClient.builder(httpHost)
+                .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(ABSURD_HIGH_TIMEOUT)
+                        .setSocketTimeout(ABSURD_HIGH_TIMEOUT));
+
+        if (searchConnection.getUsername() != null && !searchConnection.getUsername().isEmpty()) {
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(searchConnection.getUsername(), searchConnection.getPassword()));
+            builder.setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+        }
+
+        ElasticsearchTransport transport = new RestClientTransport(builder.build(), new JacksonJsonpMapper());
+
+        this.searchConnection = searchConnection;
+        this.elasticsearchClient = new ElasticsearchClient(transport);
+    }
+
+    @SneakyThrows
+    public void terminate() {
+
+        elasticsearchClient._transport().close();
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClientCache.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClientCache.java
@ -0,0 +1,102 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.cache.RemovalListener;
+import com.knecon.fforesight.tenantcommons.EncryptionDecryptionService;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+import com.knecon.fforesight.tenantcommons.TenantsClient;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+public class EsClientCache {
+
+    private final TenantsClient tenantsClient;
+    private final EncryptionDecryptionService encryptionDecryptionService;
+    private final IndexCreatorServiceImpl indexCreatorService;
+
+    @Value("${multitenancy.client-cache.maximumSize:100}")
+    private Long maximumSize;
+
+    @Value("${multitenancy.client-cache.expireAfterAccess:10}")
+    private Integer expireAfterAccess;
+
+    private LoadingCache<String, EsClient> clients;
+
+
+    @SneakyThrows
+    public void isClientAliveOrTerminate() {
+
+        try {
+            var client = clients.get(TenantContext.getTenantId());
+            try {
+
+                log.info("Checking if client is still alive: {}", client.info());
+            } catch (Exception e) {
+
+                try {
+                    client.terminate();
+                } catch (Exception e2) {
+
+                    log.info("Failed to terminate ES Client");
+                    clients.invalidate(TenantContext.getTenantId());
+                }
+            }
+        }catch (Exception e){
+            log.error("Failed to terminate/invalide client", e);
+        }
+    }
+
+
+    @PostConstruct
+    protected void createCache() {
+
+        clients = CacheBuilder.newBuilder()
+                .maximumSize(maximumSize)
+                .expireAfterAccess(expireAfterAccess, TimeUnit.MINUTES)
+                .removalListener((RemovalListener<String, EsClient>) removal -> {
+                    try {
+                        removal.getValue().terminate();
+                        log.info("Closed elasticsearch client for tenant {}", removal.getKey());
+                    } catch (Exception e) {
+                        log.info("Failed to close elasticsearch client for tenant {}", removal.getKey());
+                    }
+                })
+                .build(new CacheLoader<>() {
+                    public EsClient load(String tenantId) {
+
+                        var tenant = tenantsClient.getTenant(tenantId);
+
+                        if (tenant.getSearchConnection().getPassword() != null) {
+                            tenant.getSearchConnection().setPassword(encryptionDecryptionService.decrypt(tenant.getSearchConnection().getPassword()));
+                        }
+                        var client = new EsClient(tenant.getSearchConnection());
+                        log.info("Initialized elasticsearch client for tenant {}", tenantId);
+                        indexCreatorService.createIndex(client);
+                        return client;
+                    }
+                });
+    }
+
+
+    @SneakyThrows
+    public EsClient getClient() {
+
+        return clients.get(TenantContext.getTenantId());
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexCreatorServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexCreatorServiceImpl.java
@ -0,0 +1,84 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
+import co.elastic.clients.elasticsearch.indices.IndexSettings;
+import co.elastic.clients.elasticsearch.indices.MappingLimitSettingsNestedObjects;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+@SuppressWarnings("PMD")
+public class IndexCreatorServiceImpl {
+
+    private final ElasticsearchSettings settings;
+
+
+    public void createIndex(EsClient esClient) {
+
+        if (!indexExists(esClient)) {
+            try {
+                var response = esClient.indices()
+                        .create(i -> i.index(IndexNameHelper.getSearchIndex(esClient.getSearchConnection().getIndexPrefix()))
+                                .settings(createIndexSettings(esClient))
+                                .mappings(createIndexMapping()));
+                log.info("Successfully created index: {}", response.index());
+            } catch (IOException e) {
+                log.error("Failed to create index.", e);
+            }
+        }
+    }
+
+
+    private boolean indexExists(EsClient esClient) {
+
+        try {
+            var response = esClient.indices().exists(i -> i.index(IndexNameHelper.getSearchIndex(esClient.getSearchConnection().getIndexPrefix())));
+            return response.value();
+        } catch (IOException e) {
+            throw IndexException.indexExists(e);
+        }
+    }
+
+
+    @SneakyThrows
+    private TypeMapping createIndexMapping() {
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource("index/mapping.json");
+
+        try (InputStream is = resource.openStream()) {
+            return new TypeMapping.Builder().withJson(is).build();
+        }
+    }
+
+
+    @SneakyThrows
+    private IndexSettings createIndexSettings(EsClient esClient) {
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource("index/settings.json");
+
+        try (InputStream is = resource.openStream()) {
+            return new IndexSettings.Builder().withJson(is)
+                    .numberOfShards(esClient.getSearchConnection().getNumberOfShards())
+                    .numberOfReplicas(esClient.getSearchConnection().getNumberOfReplicas())
+                    .mapping(m -> m.nestedObjects(MappingLimitSettingsNestedObjects.of(a -> a.limit(settings.getNumberOfNestedObjectLimit()))))
+                    .build();
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexDeleteServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexDeleteServiceImpl.java
@ -0,0 +1,94 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.service.IndexDeleteService;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+public class IndexDeleteServiceImpl implements IndexDeleteService {
+
+    private final EsClientCache clientCache;
+    private final IndexCreatorServiceImpl indexCreatorService;
+
+
+    public void recreateIndex() {
+
+        closeIndex();
+        dropIndex();
+        indexCreatorService.createIndex(clientCache.getClient());
+    }
+
+
+    @Override
+    public void recreateIndex(SearchConnection searchConnection) {
+
+        var client = new EsClient(searchConnection);
+        closeIndex(client, searchConnection.getIndexPrefix());
+        dropIndex(client, searchConnection.getIndexPrefix());
+        indexCreatorService.createIndex(client);
+
+    }
+
+
+    @SneakyThrows
+    public void closeIndex() {
+
+        closeIndex(clientCache.getClient(), clientCache.getClient().getSearchConnection().getIndexPrefix());
+
+    }
+
+
+    @SneakyThrows
+    public void dropIndex() {
+
+        dropIndex(clientCache.getClient(), clientCache.getClient().getSearchConnection().getIndexPrefix());
+    }
+
+
+    public void dropIndex(SearchConnection searchConnection) {
+
+        var client = new EsClient(searchConnection);
+        closeIndex(client, searchConnection.getIndexPrefix());
+        dropIndex(client, searchConnection.getIndexPrefix());
+    }
+
+
+    @SneakyThrows
+    private void closeIndex(EsClient client, String indexPrefix) {
+
+        var closeIndexResponse = client.indices()
+                .close(i -> i.index(IndexNameHelper.getSearchIndex(indexPrefix)).timeout(t -> t.time("2m")));
+        if (closeIndexResponse.acknowledged()) {
+            log.info("Index is closed");
+        } else {
+            throw new IndexException("Error while closing index");
+        }
+    }
+
+
+    @SneakyThrows
+    private void dropIndex(EsClient client, String indexPrefix) {
+
+        log.info("Will drop index");
+        var deleteIndexResponse = client.indices()
+                .delete(i -> i.index(IndexNameHelper.getSearchIndex(indexPrefix)).timeout(t -> t.time("2m")));
+
+        if (deleteIndexResponse.acknowledged()) {
+            log.info("Index is dropped");
+        } else {
+            throw new IndexException("Error while dropping index");
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexQueryServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexQueryServiceImpl.java
@ -0,0 +1,70 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.util.Optional;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.service.IndexQueryService;
+import com.iqser.red.service.search.v1.server.service.IndexQueryResult;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
+import co.elastic.clients.elasticsearch.indices.GetIndicesSettingsResponse;
+import co.elastic.clients.elasticsearch.indices.IndexState;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+@SuppressWarnings("PMD")
+public class IndexQueryServiceImpl implements IndexQueryService {
+
+    @SneakyThrows
+    public IndexQueryResult getIndexQueryResult(SearchConnection searchConnection) {
+
+        IndexQueryResult.IndexQueryResultBuilder builder = IndexQueryResult.builder();
+
+        getIndexState(searchConnection).ifPresent(indexState -> {
+            builder.indexFound(true);
+
+            var indexSettings = indexState.settings();
+            if (indexSettings != null) {
+
+                String replicas = indexSettings.numberOfReplicas();
+                String shards = indexSettings.numberOfShards();
+
+                if (indexSettings.index() != null) {
+
+                    if (replicas == null) {
+                        replicas = indexSettings.index().numberOfReplicas();
+                    }
+                    if (shards == null) {
+                        shards = indexSettings.index().numberOfShards();
+                    }
+                }
+                builder.numberOfReplicas(replicas).numberOfShards(shards);
+            }
+        });
+        return builder.build();
+    }
+
+
+    @SneakyThrows
+    private Optional<IndexState> getIndexState(SearchConnection searchConnection) {
+
+        var esClient = new EsClient(searchConnection);
+        var indexName = IndexNameHelper.getSearchIndex(esClient.getSearchConnection().getIndexPrefix());
+        try {
+            GetIndicesSettingsResponse settings = esClient.indices().getSettings(i -> i.index(indexName));
+            return Optional.ofNullable(settings.get(indexName));
+        } catch (ElasticsearchException elasticsearchException) {
+            return Optional.empty();
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java
@ -0,0 +1,337 @@
+package com.iqser.red.service.search.v1.server.service.elasticsearch;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.search.v1.model.MatchedDocument;
+import com.iqser.red.service.search.v1.model.MatchedSection;
+import com.iqser.red.service.search.v1.model.SearchResult;
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.model.IndexDocument;
+import com.iqser.red.service.search.v1.server.model.Query;
+import com.iqser.red.service.search.v1.server.service.SearchService;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+import com.iqser.red.service.search.v1.server.utils.QueryStringConverter;
+
+import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.query_dsl.ChildScoreMode;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import co.elastic.clients.elasticsearch.core.SearchRequest;
+import co.elastic.clients.elasticsearch.core.SearchResponse;
+import co.elastic.clients.elasticsearch.core.search.HighlightField;
+import co.elastic.clients.elasticsearch.core.search.HighlighterType;
+import co.elastic.clients.elasticsearch.core.search.Hit;
+import co.elastic.clients.elasticsearch.core.search.InnerHitsResult;
+import co.elastic.clients.json.JsonData;
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.util.StringUtils;
+import jakarta.json.JsonObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "elasticsearch")
+public class SearchServiceImpl implements SearchService {
+
+    private final EsClientCache clientCache;
+
+
+    @Timed("redactmanager_search")
+    public SearchResult search(String queryString,
+                               List<String> dossierTemplateIds,
+                               List<String> dossierIds,
+                               String fileId,
+                               String assignee,
+                               boolean includeDeletedDossiers,
+                               boolean includeArchivedDossiers,
+                               String workflowStatus,
+                               Map<String, String> fileAttributes,
+                               int page,
+                               int pageSize,
+                               boolean returnSections) {
+
+        Query query = QueryStringConverter.convert(queryString);
+
+        Map<String, HighlightField> highlightFieldMap = new HashMap<>();
+        highlightFieldMap.put("sections.text", new HighlightField.Builder().build());
+        highlightFieldMap.put("filename", new HighlightField.Builder().build());
+        highlightFieldMap.put("fileAttributes.value", new HighlightField.Builder().build());
+
+        SearchRequest request = new SearchRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                .query(convertQuery(query,
+                        dossierTemplateIds,
+                        dossierIds,
+                        fileId,
+                        assignee,
+                        includeDeletedDossiers,
+                        includeArchivedDossiers,
+                        workflowStatus,
+                        fileAttributes,
+                        returnSections))
+                .from(getPageOrDefault(page) * getPageSizeOrDefault(pageSize))
+                .size(getPageSizeOrDefault(pageSize))
+                .source(s -> s.filter(f -> f.includes("dossierId",
+                        "dossierTemplateId",
+                        "dossierDeleted",
+                        "dossierArchived",
+                        "filename",
+                        "fileId",
+                        "assignee",
+                        "dossierStatus",
+                        "workflowStatus",
+                        "fileAttributes")))
+                .highlight(h -> h.type(HighlighterType.FastVector).fields(highlightFieldMap))
+                .trackScores(true)
+                .build();
+
+        SearchResponse response = execute(request);
+
+        return convert(response, query);
+    }
+
+
+    protected SearchResponse<IndexDocument> execute(SearchRequest searchRequest) {
+
+        try {
+            return clientCache.getClient().search(searchRequest, IndexDocument.class);
+        } catch (IOException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.searchFailed(e);
+        }
+    }
+
+
+    private co.elastic.clients.elasticsearch._types.query_dsl.Query convertQuery(Query query,
+                                                                                 List<String> dossierTemplateIds,
+                                                                                 List<String> dossierIds,
+                                                                                 String fileId,
+                                                                                 String assignee,
+                                                                                 boolean includeDeletedDossiers,
+                                                                                 boolean includeArchivedDossiers,
+                                                                                 String workflowStatus,
+                                                                                 Map<String, String> fileAttributes,
+                                                                                 boolean returnSections) {
+
+        var entireQuery = QueryBuilders.bool();
+        var sectionsQueries = QueryBuilders.bool();
+
+        for (String must : query.getMusts()) {
+
+            var textPhraseQuery = QueryBuilders.matchPhrase(q -> q.field("sections.text").query(must.toLowerCase(Locale.ROOT)).queryName(must));
+            var filenamePhraseQuery = QueryBuilders.matchPhrasePrefix(q -> q.field("filename").query(must.toLowerCase(Locale.ROOT)).queryName("filename." + must));
+            var fileAttributesPhraseQuery = QueryBuilders.matchPhrase(q -> q.field("fileAttributes.value")
+                    .query(must.toLowerCase(Locale.ROOT))
+                    .queryName("fileAttributes." + must));
+
+            var filenameOrTextMustQuery = QueryBuilders.bool().should(textPhraseQuery).should(filenamePhraseQuery).should(fileAttributesPhraseQuery).build()._toQuery();
+            entireQuery.must(filenameOrTextMustQuery);
+            sectionsQueries.should(textPhraseQuery);
+        }
+        for (String should : query.getShoulds()) {
+
+            var textTermQuery = QueryBuilders.matchPhrase(q -> q.field("sections.text").query(should.toLowerCase(Locale.ROOT)).queryName(should));
+            var filenameTermQuery = QueryBuilders.matchPhrasePrefix(q -> q.field("filename").query(should.toLowerCase(Locale.ROOT)).queryName("filename." + should));
+            var fileAttributesPhraseQuery = QueryBuilders.matchPhrase(q -> q.field("fileAttributes.value")
+                    .query(should.toLowerCase(Locale.ROOT))
+                    .queryName("fileAttributes." + should));
+            entireQuery.should(textTermQuery);
+            entireQuery.should(filenameTermQuery);
+            entireQuery.should(fileAttributesPhraseQuery);
+            sectionsQueries.should(textTermQuery);
+        }
+
+        if (returnSections) {
+            var nestedQuery = QueryBuilders.nested(n -> n.scoreMode(ChildScoreMode.Avg)
+                    .queryName("sections")
+                    .query(sectionsQueries.build()._toQuery())
+                    .path("sections")
+                    .innerHits(i -> i.size(100)));
+            entireQuery.should(nestedQuery);
+        }
+
+        var filterQuery = QueryBuilders.bool();
+
+        if (dossierTemplateIds != null && !dossierTemplateIds.isEmpty()) {
+
+            var dossierTemplateIdQueryBuilder = QueryBuilders.bool();
+
+            for (var dossierTemplateId : dossierTemplateIds) {
+                if (StringUtils.isNotEmpty(dossierTemplateId)) {
+                    dossierTemplateIdQueryBuilder = dossierTemplateIdQueryBuilder.should(QueryBuilders.match(q -> q.field("dossierTemplateId").query(dossierTemplateId)));
+                }
+            }
+
+            filterQuery.must(dossierTemplateIdQueryBuilder.build()._toQuery());
+        }
+
+        if (dossierIds != null && !dossierIds.isEmpty()) {
+
+            var dossierIdQueryBuilder = QueryBuilders.bool();
+
+            for (var dossierId : dossierIds) {
+                if (StringUtils.isNotEmpty(dossierId)) {
+                    dossierIdQueryBuilder = dossierIdQueryBuilder.should(QueryBuilders.match(q -> q.field("dossierId").query(dossierId)));
+                }
+            }
+
+            filterQuery.must(dossierIdQueryBuilder.build()._toQuery());
+        }
+
+        if (StringUtils.isNotEmpty(fileId)) {
+            filterQuery.must(QueryBuilders.match(q -> q.field("fileId").query(fileId)));
+        }
+
+        if (StringUtils.isNotEmpty(assignee)) {
+            filterQuery.must(QueryBuilders.match(q -> q.field("assignee").query(assignee)));
+        }
+
+        if (includeArchivedDossiers) {
+            filterQuery.must(QueryBuilders.terms(q -> q.field("dossierArchived")
+                    .terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(true).build(), new FieldValue.Builder().booleanValue(false).build())))));
+        } else {
+            filterQuery.must(QueryBuilders.terms(q -> q.field("dossierArchived").terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(false).build())))));
+        }
+
+        if (includeDeletedDossiers) {
+            filterQuery.must(QueryBuilders.terms(q -> q.field("dossierDeleted")
+                    .terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(true).build(), new FieldValue.Builder().booleanValue(false).build())))));
+        } else {
+            filterQuery.must(QueryBuilders.terms(q -> q.field("dossierDeleted").terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(false).build())))));
+        }
+
+        if (StringUtils.isNotEmpty(workflowStatus)) {
+            filterQuery.must(QueryBuilders.match(q -> q.field("workflowStatus").query(workflowStatus)));
+        }
+
+        if (fileAttributes != null && !fileAttributes.isEmpty()) {
+            var fileAttributesQueryBuilder = QueryBuilders.bool();
+
+            for (var fileAttributeKey : fileAttributes.keySet()) {
+                if (StringUtils.isNotEmpty(fileAttributeKey)) {
+                    fileAttributesQueryBuilder.filter(List.of(QueryBuilders.bool()
+                            .must(QueryBuilders.match(q -> q.field("fileAttributes.name").query(fileAttributeKey)))
+                            .must(QueryBuilders.match(q -> q.field("fileAttributes.value").query(fileAttributes.get(fileAttributeKey))))
+                            .build()
+                            ._toQuery()));
+                }
+            }
+
+            filterQuery.must(fileAttributesQueryBuilder.build()._toQuery());
+        }
+
+        return QueryBuilders.bool().filter(filterQuery.build()._toQuery()).must(entireQuery.build()._toQuery()).build()._toQuery();
+    }
+
+
+    private SearchResult convert(SearchResponse response, Query query) {
+
+        List<Hit> hits = response.hits().hits();
+
+        return SearchResult.builder()
+                .matchedDocuments(hits.stream().map(hit -> convertSearchHit((Hit) hit, query)).collect(Collectors.toList()))
+                .maxScore(response.hits().maxScore().floatValue())
+                .total(response.hits().total().value())
+                .build();
+    }
+
+
+    private MatchedDocument convertSearchHit(Hit hit, Query query) {
+
+        List<String> m = hit.matchedQueries();
+
+        Set<String> matchesTerms = m.stream()
+                .map(match -> match.contains("filename.") ? match.replace("filename.", "") : match)
+                .map(match -> match.contains("fileAttributes.") ? match.replace("fileAttributes.", "") : match)
+                .collect(Collectors.toSet());
+
+        Set<String> unmatchedTerms = Stream.concat(query.getMusts().stream(), query.getShoulds().stream()).filter(term -> !matchesTerms.contains(term)).collect(Collectors.toSet());
+
+        IndexDocument indexDocument = (IndexDocument) hit.source();
+
+        MatchedDocument.MatchedDocumentBuilder matchedDocumentBuilder = MatchedDocument.builder()
+                .score(hit.score().floatValue())
+                .dossierId(indexDocument.getDossierId())
+                .dossierTemplateId(indexDocument.getDossierTemplateId())
+                .fileId(indexDocument.getFileId())
+                .assignee(indexDocument.getAssignee())
+                .fileAttributes(convertFileAttributes(indexDocument.getFileAttributes()))
+                .workflowStatus(indexDocument.getWorkflowStatus())
+                .fileName(indexDocument.getFilename())
+                .dossierDeleted(indexDocument.isDossierDeleted())
+                .dossierArchived(indexDocument.isDossierArchived())
+                .highlights(hit.highlight())
+                .matchedTerms(matchesTerms)
+                .unmatchedTerms(unmatchedTerms);
+
+        if (hit.innerHits() != null && !hit.innerHits().isEmpty()) {
+            InnerHitsResult sectionHits = (InnerHitsResult) hit.innerHits().get("sections");
+            matchedDocumentBuilder.matchedSections(sectionHits.hits().hits().stream().map(innerHit -> convertInnerHit(innerHit)).collect(Collectors.toList()))
+                    .containsAllMatchedSections(sectionHits.hits().total().value() == sectionHits.hits().hits().size());
+        }
+
+        return matchedDocumentBuilder.build();
+
+    }
+
+
+    private Map<String, String> convertFileAttributes(Object fileAttributesSourceMap) {
+
+        Map<String, String> fileAttributes = new HashMap<>();
+
+        if (fileAttributesSourceMap != null) {
+            List<HashMap<String, String>> list = new ObjectMapper().convertValue(fileAttributesSourceMap, ArrayList.class);
+            list.forEach(r -> fileAttributes.put(r.get("name"), r.get("value")));
+        }
+
+        return fileAttributes;
+    }
+
+
+    private MatchedSection convertInnerHit(Hit<JsonData> hit) {
+
+        JsonObject indexSection = hit.source().toJson().asJsonObject();
+
+        var jsonArray = indexSection.getJsonArray("pages");
+        var pages = IntStream.range(0, jsonArray.size()).mapToObj(i -> jsonArray.getInt(i)).collect(Collectors.toSet());
+
+        return MatchedSection.builder()
+                .headline(indexSection.get("headline") != null ? indexSection.getString("headline") : null)
+                .sectionNumber(indexSection.getString("sectionNumber"))
+                .pages(pages)
+                .matchedTerms(hit.matchedQueries().stream().collect(Collectors.toSet()))
+                .build();
+    }
+
+
+    private int getPageSizeOrDefault(int pageSize) {
+
+        if (pageSize <= 0) {
+            return 10;
+        }
+        return pageSize;
+    }
+
+
+    private int getPageOrDefault(int page) {
+
+        if (page < 0) {
+            return 0;
+        }
+        return page;
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentDeleteServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentDeleteServiceImpl.java
@ -0,0 +1,44 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.io.IOException;
+
+import org.opensearch.client.opensearch._types.OpenSearchException;
+import org.opensearch.client.opensearch._types.Refresh;
+import org.opensearch.client.opensearch.core.DeleteRequest;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.service.DocumentDeleteService;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+public class DocumentDeleteServiceImpl implements DocumentDeleteService {
+
+    private final OpensearchClientCache clientCache;
+    private final ElasticsearchSettings settings;
+
+
+    public void deleteDocument(String fileId) {
+
+        DeleteRequest request = new DeleteRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                .id(fileId)
+                .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy()))
+                .build();
+
+        try {
+            clientCache.getClient().delete(request);
+        } catch (IOException | OpenSearchException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.documentDeleteError(fileId, e);
+        }
+    }
+
+}
+
+
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentIndexServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentIndexServiceImpl.java
@ -0,0 +1,44 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.io.IOException;
+
+import org.opensearch.client.opensearch._types.OpenSearchException;
+import org.opensearch.client.opensearch._types.Refresh;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.model.IndexDocument;
+import com.iqser.red.service.search.v1.server.service.DocumentIndexService;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+public class DocumentIndexServiceImpl implements DocumentIndexService {
+
+    private final OpensearchClientCache clientCache;
+    private final ElasticsearchSettings settings;
+
+
+    @Timed("redactmanager_indexDocument")
+    public void indexDocument(IndexDocument indexDocument) {
+
+        try {
+            clientCache.getClient().index(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                    .id(indexDocument.getFileId())
+                    .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy()))
+                    .document(indexDocument));
+        } catch (IOException | OpenSearchException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.documentIndexError(indexDocument.getFileId(), e);
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentUpdateServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentUpdateServiceImpl.java
@ -0,0 +1,53 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.io.IOException;
+
+import org.opensearch.client.opensearch._types.OpenSearchException;
+import org.opensearch.client.opensearch._types.Refresh;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate;
+import com.iqser.red.service.search.v1.server.service.DocumentUpdateService;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+public class DocumentUpdateServiceImpl implements DocumentUpdateService {
+
+    private final OpensearchClientCache clientCache;
+    private final ElasticsearchSettings settings;
+
+
+    @SneakyThrows
+    @Timed("redactmanager_updateDocument")
+    public void updateDocument(String fileId, IndexDocumentUpdate indexDocumentUpdate) {
+
+        try {
+            clientCache.getClient()
+                    .update(u -> u.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                            .id(fileId)
+                            .doc(indexDocumentUpdate)
+                            .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), IndexDocumentUpdate.class);
+        } catch (IOException | OpenSearchException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.documentUpdateError(fileId, e);
+        }
+    }
+
+
+    @SneakyThrows
+    @Timed("redactmanager_documentExists")
+    public boolean documentExists(String fileId) {
+
+        return clientCache.getClient().exists(e -> e.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())).id(fileId)).value();
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexCreatorServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexCreatorServiceImpl.java
@ -0,0 +1,101 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import org.opensearch.client.opensearch.indices.IndexSettings;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+
+import jakarta.json.stream.JsonParser;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+@SuppressWarnings("PMD")
+public class IndexCreatorServiceImpl {
+
+    private final ElasticsearchSettings settings;
+
+
+    public void createIndex(OpensearchClient client) {
+
+        if (!indexExists(client)) {
+
+            try {
+                var response = client.indices()
+                        .create(i -> i.index(IndexNameHelper.getSearchIndex(client.getSearchConnection().getIndexPrefix()))
+                                .settings(createIndexSettings(client))
+                                .mappings(createIndexMapping(client)));
+                log.info("Successfully created index: {}", response.index());
+            } catch (IOException e) {
+                log.error("Failed to create index.", e);
+            }
+        }
+    }
+
+
+    private boolean indexExists(OpensearchClient client) {
+
+        try {
+            var response = client.indices().exists(i -> i.index(IndexNameHelper.getSearchIndex(client.getSearchConnection().getIndexPrefix())));
+            return response.value();
+        } catch (IOException e) {
+            throw IndexException.indexExists(e);
+        }
+    }
+
+
+    @SneakyThrows
+    private TypeMapping createIndexMapping(OpensearchClient client) {
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource("index/mapping.json");
+
+        try (InputStream is = resource.openStream()) {
+
+            JsonpMapper mapper = client._transport().jsonpMapper();
+            JsonParser parser = mapper.jsonProvider().createParser(is);
+
+            return TypeMapping._DESERIALIZER.deserialize(parser, mapper);
+        }
+    }
+
+
+    @SneakyThrows
+    private IndexSettings createIndexSettings(OpensearchClient client) {
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource("index/settings.json");
+
+        try (InputStream is = resource.openStream()) {
+
+            JsonpMapper mapper = client._transport().jsonpMapper();
+            JsonParser parser = mapper.jsonProvider().createParser(is);
+
+            var indexSettingsFromJson = IndexSettings._DESERIALIZER.deserialize(parser, mapper);
+
+            // It is not possible to set "index.mapping.nested_objects.limit", OpenSearch seems to not have this param.
+            // Hopefully they don't hava a limit for this, I was not able to find anything.
+            // As elasticsearch has a limit for this, and we can't set it, it seems this is the only reason for now to have both clients.
+            var indexSettings = new IndexSettings.Builder().index(indexSettingsFromJson.index())
+                    .numberOfReplicas(client.getSearchConnection().getNumberOfReplicas())
+                    .numberOfShards(client.getSearchConnection().getNumberOfShards())
+                    .analysis(indexSettingsFromJson.analysis())
+                    .build();
+
+            return indexSettings;
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexDeleteServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexDeleteServiceImpl.java
@ -0,0 +1,92 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.service.IndexDeleteService;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+public class IndexDeleteServiceImpl implements IndexDeleteService {
+
+    private final OpensearchClientCache clientCache;
+    private final IndexCreatorServiceImpl indexCreatorService;
+
+
+    public void recreateIndex() {
+
+        closeIndex();
+        dropIndex();
+        indexCreatorService.createIndex(clientCache.getClient());
+    }
+
+
+    @Override
+    public void recreateIndex(SearchConnection searchConnection) {
+
+        var client = new OpensearchClient(searchConnection);
+        closeIndex(client, searchConnection.getIndexPrefix());
+        dropIndex(client, searchConnection.getIndexPrefix());
+        indexCreatorService.createIndex(client);
+
+    }
+
+
+    @SneakyThrows
+    public void closeIndex() {
+
+        closeIndex(clientCache.getClient(), clientCache.getClient().getSearchConnection().getIndexPrefix());
+    }
+
+
+    @SneakyThrows
+    public void dropIndex() {
+
+        dropIndex(clientCache.getClient(), clientCache.getClient().getSearchConnection().getIndexPrefix());
+    }
+
+
+    public void dropIndex(SearchConnection searchConnection) {
+
+        var client = new OpensearchClient(searchConnection);
+        closeIndex(client, searchConnection.getIndexPrefix());
+        dropIndex(client, searchConnection.getIndexPrefix());
+    }
+
+
+    @SneakyThrows
+    private void closeIndex(OpensearchClient opensearchClient, String indexPrefix) {
+
+        var closeIndexResponse = opensearchClient.indices()
+                .close(i -> i.index(IndexNameHelper.getSearchIndex(indexPrefix)).timeout(t -> t.time("2m")));
+        if (closeIndexResponse.acknowledged()) {
+            log.info("Index is closed");
+        } else {
+            throw new IndexException("Error while closing index");
+        }
+    }
+
+
+    @SneakyThrows
+    private void dropIndex(OpensearchClient opensearchClient, String indexPrefix) {
+
+        log.info("Will drop index");
+        var deleteIndexResponse = opensearchClient.indices().delete(i -> i.index(IndexNameHelper.getSearchIndex(indexPrefix)).timeout(t -> t.time("2m")));
+
+        if (deleteIndexResponse.acknowledged()) {
+            log.info("Index is dropped");
+        } else {
+            throw new IndexException("Error while dropping index");
+        }
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexQueryServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexQueryServiceImpl.java
@ -0,0 +1,56 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.util.Optional;
+
+import org.opensearch.client.opensearch._types.OpenSearchException;
+import org.opensearch.client.opensearch.indices.GetIndicesSettingsResponse;
+import org.opensearch.client.opensearch.indices.IndexState;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.search.v1.server.service.IndexQueryResult;
+import com.iqser.red.service.search.v1.server.service.IndexQueryService;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+@SuppressWarnings("PMD")
+public class IndexQueryServiceImpl implements IndexQueryService {
+
+    @SneakyThrows
+    public IndexQueryResult getIndexQueryResult(SearchConnection searchConnection) {
+
+        IndexQueryResult.IndexQueryResultBuilder builder = IndexQueryResult.builder();
+
+        Optional<IndexState> optionalIndexState = getIndexState(searchConnection);
+        if (optionalIndexState.isPresent()) {
+            builder.indexFound(true);
+            var indexSettings = optionalIndexState.get().settings();
+            if (indexSettings != null) {
+                builder.numberOfReplicas(indexSettings.numberOfReplicas()).numberOfShards(indexSettings.numberOfShards());
+            }
+
+        }
+        return builder.build();
+    }
+
+    @SneakyThrows
+    private Optional<IndexState> getIndexState(SearchConnection searchConnection) {
+
+        var opensearchClient = new OpensearchClient(searchConnection);
+        var indexName = IndexNameHelper.getSearchIndex(opensearchClient.getSearchConnection().getIndexPrefix());
+        try {
+            GetIndicesSettingsResponse settings = opensearchClient.indices().getSettings(i -> i.index(indexName));
+            return Optional.ofNullable(settings.get(indexName));
+        } catch (OpenSearchException openSearchException) {
+            return Optional.empty();
+        }
+    }
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClient.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClient.java
@ -0,0 +1,62 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+import lombok.Data;
+import lombok.SneakyThrows;
+import lombok.experimental.Delegate;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.opensearch.client.RestClient;
+import org.opensearch.client.json.jackson.JacksonJsonpMapper;
+import org.opensearch.client.opensearch.OpenSearchClient;
+import org.opensearch.client.transport.rest_client.RestClientTransport;
+
+@Data
+@SuppressWarnings("PMD")
+public class OpensearchClient {
+
+    // Lower timeouts should be set per request.
+    private static final int ABSURD_HIGH_TIMEOUT = 600_000;
+
+    private SearchConnection searchConnection;
+
+    @Delegate
+    private OpenSearchClient client;
+
+
+    public OpensearchClient(SearchConnection searchConnection) {
+
+        HttpHost[] httpHost = searchConnection.getHosts()
+                .stream()
+                .map(host -> new HttpHost(host, searchConnection.getPort(), searchConnection.getScheme()))
+                .toList()
+                .toArray(new HttpHost[searchConnection.getHosts().size()]);
+
+        var builder = RestClient.builder(httpHost)
+                .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(0)
+                        .setConnectionRequestTimeout(ABSURD_HIGH_TIMEOUT)
+                        .setSocketTimeout(ABSURD_HIGH_TIMEOUT));
+
+        if (searchConnection.getUsername() != null && !searchConnection.getUsername().isEmpty()) {
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(searchConnection.getUsername(), searchConnection.getPassword()));
+            builder.setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+        }
+
+        var transport = new RestClientTransport(builder.build(), new JacksonJsonpMapper());
+
+        this.searchConnection = searchConnection;
+        this.client = new OpenSearchClient(transport);
+    }
+
+
+    @SneakyThrows
+    public void terminate() {
+
+        client._transport().close();
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClientCache.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClientCache.java
@ -0,0 +1,101 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.cache.RemovalListener;
+import com.knecon.fforesight.tenantcommons.EncryptionDecryptionService;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+import com.knecon.fforesight.tenantcommons.TenantsClient;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+public class OpensearchClientCache {
+
+    private final TenantsClient tenantsClient;
+    private final EncryptionDecryptionService encryptionDecryptionService;
+    private final IndexCreatorServiceImpl indexCreatorService;
+
+    @Value("${multitenancy.client-cache.maximumSize:100}")
+    private Long maximumSize;
+
+    @Value("${multitenancy.client-cache.expireAfterAccess:10}")
+    private Integer expireAfterAccess;
+
+    private LoadingCache<String, OpensearchClient> clients;
+
+
+    @SneakyThrows
+    public void isClientAliveOrTerminate() {
+
+        try {
+            var client = clients.get(TenantContext.getTenantId());
+            try {
+
+                log.info("Checking if client is still alive: {}", client.info());
+            } catch (Exception e) {
+
+                try {
+                    client.terminate();
+                } catch (Exception e2) {
+
+                    log.info("Failed to terminate ES Client");
+                    clients.invalidate(TenantContext.getTenantId());
+                }
+            }
+        }catch (Exception e){
+            log.error("Failed to terminate/invalide client", e);
+        }
+    }
+
+    @PostConstruct
+    protected void createCache() {
+
+        clients = CacheBuilder.newBuilder()
+                .maximumSize(maximumSize)
+                .expireAfterAccess(expireAfterAccess, TimeUnit.MINUTES)
+                .removalListener((RemovalListener<String, OpensearchClient>) removal -> {
+                    try {
+                        removal.getValue().terminate();
+                        log.info("Closed elasticsearch client for tenant {}", removal.getKey());
+                    } catch (Exception e) {
+                        log.info("Failed to close elasticsearch client for tenant {}", removal.getKey());
+                    }
+                })
+                .build(new CacheLoader<>() {
+                    public OpensearchClient load(String tenantId) {
+
+                        var tenant = tenantsClient.getTenant(tenantId);
+
+                        if (tenant.getSearchConnection().getPassword() != null) {
+                            tenant.getSearchConnection().setPassword(encryptionDecryptionService.decrypt(tenant.getSearchConnection().getPassword()));
+                        }
+                        var client = new OpensearchClient(tenant.getSearchConnection());
+                        log.info("Initialized elasticsearch client for tenant {}", tenantId);
+                        indexCreatorService.createIndex(client);
+                        return client;
+                    }
+                });
+    }
+
+
+    @SneakyThrows
+    public OpensearchClient getClient() {
+
+        return clients.get(TenantContext.getTenantId());
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java
@ -0,0 +1,357 @@
+package com.iqser.red.service.search.v1.server.service.opensearch;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.opensearch.client.json.JsonData;
+import org.opensearch.client.opensearch._types.FieldValue;
+import org.opensearch.client.opensearch._types.query_dsl.ChildScoreMode;
+import org.opensearch.client.opensearch._types.query_dsl.QueryBuilders;
+import org.opensearch.client.opensearch.core.SearchRequest;
+import org.opensearch.client.opensearch.core.SearchResponse;
+import org.opensearch.client.opensearch.core.search.BuiltinHighlighterType;
+import org.opensearch.client.opensearch.core.search.HighlightField;
+import org.opensearch.client.opensearch.core.search.HighlighterType;
+import org.opensearch.client.opensearch.core.search.Hit;
+import org.opensearch.client.opensearch.core.search.InnerHitsResult;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.search.v1.model.MatchedDocument;
+import com.iqser.red.service.search.v1.model.MatchedSection;
+import com.iqser.red.service.search.v1.model.SearchResult;
+import com.iqser.red.service.search.v1.server.exception.IndexException;
+import com.iqser.red.service.search.v1.server.model.IndexDocument;
+import com.iqser.red.service.search.v1.server.model.Query;
+import com.iqser.red.service.search.v1.server.service.SearchService;
+import com.iqser.red.service.search.v1.server.utils.IndexNameHelper;
+import com.iqser.red.service.search.v1.server.utils.QueryStringConverter;
+
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.util.StringUtils;
+import jakarta.json.JsonObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "search", name = "backend", havingValue = "opensearch")
+public class SearchServiceImpl implements SearchService {
+
+    private final OpensearchClientCache clientCache;
+
+
+    @Timed("redactmanager_search")
+    public SearchResult search(String queryString,
+                               List<String> dossierTemplateIds,
+                               List<String> dossierIds,
+                               String fileId,
+                               String assignee,
+                               boolean includeDeletedDossiers,
+                               boolean includeArchivedDossiers,
+                               String workflowStatus,
+                               Map<String, String> fileAttributes,
+                               int page,
+                               int pageSize,
+                               boolean returnSections) {
+
+        Query query = QueryStringConverter.convert(queryString);
+
+        Map<String, HighlightField> highlightFieldMap = new HashMap<>();
+        highlightFieldMap.put("sections.text", new HighlightField.Builder().build());
+        highlightFieldMap.put("filename", new HighlightField.Builder().build());
+        highlightFieldMap.put("fileAttributes.value", new HighlightField.Builder().build());
+
+        SearchRequest request = new SearchRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix()))
+                .query(convertQuery(query,
+                        dossierTemplateIds,
+                        dossierIds,
+                        fileId,
+                        assignee,
+                        includeDeletedDossiers,
+                        includeArchivedDossiers,
+                        workflowStatus,
+                        fileAttributes,
+                        returnSections))
+                .from(getPageOrDefault(page) * getPageSizeOrDefault(pageSize))
+                .size(getPageSizeOrDefault(pageSize))
+                .source(s -> s.filter(f -> f.includes("dossierId",
+                        "dossierTemplateId",
+                        "dossierDeleted",
+                        "dossierArchived",
+                        "filename",
+                        "fileId",
+                        "assignee",
+                        "dossierStatus",
+                        "workflowStatus",
+                        "fileAttributes")))
+                .highlight(h -> h.type(HighlighterType.of(b -> b.builtin(BuiltinHighlighterType.FastVector))).fields(highlightFieldMap))
+                .trackScores(true)
+                .build();
+
+        SearchResponse response = execute(request);
+
+        return convert(response, query);
+    }
+
+
+    protected SearchResponse<IndexDocument> execute(SearchRequest searchRequest) {
+
+        try {
+            return clientCache.getClient().search(searchRequest, IndexDocument.class);
+        } catch (IOException e) {
+            clientCache.isClientAliveOrTerminate();
+            throw IndexException.searchFailed(e);
+        }
+    }
+
+
+    private org.opensearch.client.opensearch._types.query_dsl.Query convertQuery(Query query,
+                                                                                 List<String> dossierTemplateIds,
+                                                                                 List<String> dossierIds,
+                                                                                 String fileId,
+                                                                                 String assignee,
+                                                                                 boolean includeDeletedDossiers,
+                                                                                 boolean includeArchivedDossiers,
+                                                                                 String workflowStatus,
+                                                                                 Map<String, String> fileAttributes,
+                                                                                 boolean returnSections) {
+
+        var entireQuery = QueryBuilders.bool();
+        var sectionsQueries = QueryBuilders.bool();
+
+        for (String must : query.getMusts()) {
+
+            var textPhraseQuery = QueryBuilders.matchPhrase().field("sections.text").query(must.toLowerCase(Locale.ROOT)).queryName(must).build()._toQuery();
+            var filenamePhraseQuery = QueryBuilders.matchPhrasePrefix().field("filename").query(must.toLowerCase(Locale.ROOT)).queryName("filename." + must).build()._toQuery();
+            var fileAttributesPhraseQuery = QueryBuilders.matchPhrase()
+                    .field("fileAttributes.value")
+                    .query(must.toLowerCase(Locale.ROOT))
+                    .queryName("fileAttributes." + must)
+                    .build()
+                    ._toQuery();
+
+            var filenameOrTextMustQuery = QueryBuilders.bool().should(textPhraseQuery).should(filenamePhraseQuery).should(fileAttributesPhraseQuery).build()._toQuery();
+            entireQuery.must(filenameOrTextMustQuery);
+            sectionsQueries.should(textPhraseQuery);
+        }
+        for (String should : query.getShoulds()) {
+
+            var textTermQuery = QueryBuilders.matchPhrase().field("sections.text").query(should.toLowerCase(Locale.ROOT)).queryName(should).build()._toQuery();
+            var filenameTermQuery = QueryBuilders.matchPhrasePrefix().field("filename").query(should.toLowerCase(Locale.ROOT)).queryName("filename." + should).build()._toQuery();
+            var fileAttributesPhraseQuery = QueryBuilders.matchPhrase()
+                    .field("fileAttributes.value")
+                    .query(should.toLowerCase(Locale.ROOT))
+                    .queryName("fileAttributes." + should)
+                    .build()
+                    ._toQuery();
+            entireQuery.should(textTermQuery);
+            entireQuery.should(filenameTermQuery);
+            entireQuery.should(fileAttributesPhraseQuery);
+            sectionsQueries.should(textTermQuery);
+        }
+
+        if (returnSections) {
+            var nestedQuery = QueryBuilders.nested()
+                    .scoreMode(ChildScoreMode.Avg)
+                    .queryName("sections")
+                    .query(sectionsQueries.build()._toQuery())
+                    .path("sections")
+                    .innerHits(i -> i.size(100))
+                    .build()
+                    ._toQuery();
+            entireQuery.should(nestedQuery);
+        }
+
+        var filterQuery = QueryBuilders.bool();
+
+        if (dossierTemplateIds != null && !dossierTemplateIds.isEmpty()) {
+
+            var dossierTemplateIdQueryBuilder = QueryBuilders.bool();
+
+            for (var dossierTemplateId : dossierTemplateIds) {
+                if (StringUtils.isNotEmpty(dossierTemplateId)) {
+                    dossierTemplateIdQueryBuilder = dossierTemplateIdQueryBuilder.should(QueryBuilders.match()
+                            .field("dossierTemplateId")
+                            .query(q -> q.stringValue(dossierTemplateId))
+                            .build()
+                            ._toQuery());
+                }
+            }
+
+            filterQuery.must(dossierTemplateIdQueryBuilder.build()._toQuery());
+        }
+
+        if (dossierIds != null && !dossierIds.isEmpty()) {
+
+            var dossierIdQueryBuilder = QueryBuilders.bool();
+
+            for (var dossierId : dossierIds) {
+                if (StringUtils.isNotEmpty(dossierId)) {
+                    dossierIdQueryBuilder = dossierIdQueryBuilder.should(QueryBuilders.match().field("dossierId").query(q -> q.stringValue(dossierId)).build()._toQuery());
+                }
+            }
+
+            filterQuery.must(dossierIdQueryBuilder.build()._toQuery());
+        }
+
+        if (StringUtils.isNotEmpty(fileId)) {
+            filterQuery.must(QueryBuilders.match().field("fileId").query(q -> q.stringValue(fileId)).build()._toQuery());
+        }
+
+        if (StringUtils.isNotEmpty(assignee)) {
+            filterQuery.must(QueryBuilders.match().field("assignee").query(q -> q.stringValue(assignee)).build()._toQuery());
+        }
+
+        if (includeArchivedDossiers) {
+            filterQuery.must(QueryBuilders.terms()
+                    .field("dossierArchived")
+                    .terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(true).build(), new FieldValue.Builder().booleanValue(false).build())))
+                    .build()
+                    ._toQuery());
+        } else {
+            filterQuery.must(QueryBuilders.terms().field("dossierArchived").terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(false).build()))).build()._toQuery());
+        }
+
+        if (includeDeletedDossiers) {
+            filterQuery.must(QueryBuilders.terms()
+                    .field("dossierDeleted")
+                    .terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(true).build(), new FieldValue.Builder().booleanValue(false).build())))
+                    .build()
+                    ._toQuery());
+        } else {
+            filterQuery.must(QueryBuilders.terms().field("dossierDeleted").terms(t -> t.value(List.of(new FieldValue.Builder().booleanValue(false).build()))).build()._toQuery());
+        }
+
+        if (StringUtils.isNotEmpty(workflowStatus)) {
+            filterQuery.must(QueryBuilders.match().field("workflowStatus").query(q -> q.stringValue(workflowStatus)).build()._toQuery());
+        }
+
+        if (fileAttributes != null && !fileAttributes.isEmpty()) {
+            var fileAttributesQueryBuilder = QueryBuilders.bool();
+
+            for (var fileAttributeKey : fileAttributes.keySet()) {
+                if (StringUtils.isNotEmpty(fileAttributeKey)) {
+                    fileAttributesQueryBuilder.filter(List.of(QueryBuilders.bool()
+                            .must(QueryBuilders.match().field("fileAttributes.name").query(q -> q.stringValue(fileAttributeKey)).build()._toQuery())
+                            .must(QueryBuilders.match().field("fileAttributes.value").query(q -> q.stringValue(fileAttributes.get(fileAttributeKey))).build()._toQuery())
+                            .build()
+                            ._toQuery()));
+                }
+            }
+
+            filterQuery.must(fileAttributesQueryBuilder.build()._toQuery());
+        }
+
+        return QueryBuilders.bool().filter(filterQuery.build()._toQuery()).must(entireQuery.build()._toQuery()).build()._toQuery();
+    }
+
+
+    private SearchResult convert(SearchResponse response, Query query) {
+
+        List<Hit> hits = response.hits().hits();
+
+        return SearchResult.builder()
+                .matchedDocuments(hits.stream().map(hit -> convertSearchHit((Hit) hit, query)).collect(Collectors.toList()))
+                .maxScore(response.maxScore() == null ? 0 : response.maxScore().floatValue())
+                .total(response.hits().total().value())
+                .build();
+    }
+
+
+    private MatchedDocument convertSearchHit(Hit hit, Query query) {
+
+        List<String> m = hit.matchedQueries();
+
+        Set<String> matchesTerms = m.stream()
+                .map(match -> match.contains("filename.") ? match.replace("filename.", "") : match)
+                .map(match -> match.contains("fileAttributes.") ? match.replace("fileAttributes.", "") : match)
+                .collect(Collectors.toSet());
+
+        Set<String> unmatchedTerms = Stream.concat(query.getMusts().stream(), query.getShoulds().stream()).filter(term -> !matchesTerms.contains(term)).collect(Collectors.toSet());
+
+        IndexDocument indexDocument = (IndexDocument) hit.source();
+
+        MatchedDocument.MatchedDocumentBuilder matchedDocumentBuilder = MatchedDocument.builder()
+                .score(hit.score().floatValue())
+                .dossierId(indexDocument.getDossierId())
+                .dossierTemplateId(indexDocument.getDossierTemplateId())
+                .fileId(indexDocument.getFileId())
+                .assignee(indexDocument.getAssignee())
+                .fileAttributes(convertFileAttributes(indexDocument.getFileAttributes()))
+                .workflowStatus(indexDocument.getWorkflowStatus())
+                .fileName(indexDocument.getFilename())
+                .dossierDeleted(indexDocument.isDossierDeleted())
+                .dossierArchived(indexDocument.isDossierArchived())
+                .highlights(hit.highlight())
+                .matchedTerms(matchesTerms)
+                .unmatchedTerms(unmatchedTerms);
+
+        if (hit.innerHits() != null && !hit.innerHits().isEmpty()) {
+            InnerHitsResult sectionHits = (InnerHitsResult) hit.innerHits().get("sections");
+            matchedDocumentBuilder.matchedSections(sectionHits.hits().hits().stream().map(innerHit -> convertInnerHit(innerHit)).collect(Collectors.toList()))
+                    .containsAllMatchedSections(sectionHits.hits().total().value() == sectionHits.hits().hits().size());
+        }
+
+        return matchedDocumentBuilder.build();
+
+    }
+
+
+    private Map<String, String> convertFileAttributes(Object fileAttributesSourceMap) {
+
+        Map<String, String> fileAttributes = new HashMap<>();
+
+        if (fileAttributesSourceMap != null) {
+            List<HashMap<String, String>> list = new ObjectMapper().convertValue(fileAttributesSourceMap, ArrayList.class);
+            list.forEach(r -> fileAttributes.put(r.get("name"), r.get("value")));
+        }
+
+        return fileAttributes;
+    }
+
+
+    private MatchedSection convertInnerHit(Hit<JsonData> hit) {
+
+        JsonObject indexSection = hit.source().toJson().asJsonObject();
+
+        var jsonArray = indexSection.getJsonArray("pages");
+        var pages = IntStream.range(0, jsonArray.size()).mapToObj(i -> jsonArray.getInt(i)).collect(Collectors.toSet());
+
+        return MatchedSection.builder()
+                .headline(indexSection.get("headline") != null ? indexSection.getString("headline") : null)
+                .sectionNumber(indexSection.getString("sectionNumber"))
+                .pages(pages)
+                .matchedTerms(hit.matchedQueries().stream().collect(Collectors.toSet()))
+                .build();
+    }
+
+
+    private int getPageSizeOrDefault(int pageSize) {
+
+        if (pageSize <= 0) {
+            return 10;
+        }
+        return pageSize;
+    }
+
+
+    private int getPageOrDefault(int page) {
+
+        if (page < 0) {
+            return 0;
+        }
+        return page;
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java
@ -1,9 +1,5 @@
 package com.iqser.red.service.search.v1.server.settings;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensearch.action.support.WriteRequest;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@ -16,24 +12,11 @@ import lombok.Data;
@ConfigurationProperties("elasticsearch")
 public class ElasticsearchSettings {

-    private List<String> hosts = new ArrayList<>();
-
-    private int port = 9300;
-
-    private String scheme = "http";
-    private String apiKeyAuth;
-
-    private String username;
-
-    private String password;
-
-    private int numberOfShards = 5;
-    private int numberOfReplicas = 1;
    private int numberOfNestedObjectLimit = 100000;

    /**
     * ES refresh policy for write requests to use. Used in tests to wait for completion of write requests.
     */
-    private WriteRequest.RefreshPolicy refreshPolicy = WriteRequest.RefreshPolicy.NONE;
+    private String refreshPolicy = "true";

 }
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java
@ -0,0 +1,16 @@
+package com.iqser.red.service.search.v1.server.utils;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class IndexNameHelper {
+
+    private static final String SEARCH_INDEX = "%s_search";
+
+
+    public String getSearchIndex(String indexPrefix) {
+
+        return String.format(SEARCH_INDEX, indexPrefix);
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/ResourceLoader.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/ResourceLoader.java
@ -1,29 +0,0 @@
-package com.iqser.red.service.search.v1.server.utils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.stream.Collectors;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class ResourceLoader {
-
-    public String load(String classpathPath) {
-
-        URL resource = ResourceLoader.class.getClassLoader().getResource(classpathPath);
-        if (resource == null) {
-            throw new IllegalArgumentException("could not load classpath resource: " + classpathPath);
-        }
-        try (InputStream is = resource.openStream(); InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8); BufferedReader br = new BufferedReader(isr)) {
-            return br.lines().collect(Collectors.joining("\n"));
-        } catch (IOException e) {
-            throw new IllegalArgumentException("could not load classpath resource: " + classpathPath, e);
-        }
-    }
-
-}
--- a/search-service-v1/search-service-server-v1/src/main/resources/application-dev.yml
+++ b/search-service-v1/search-service-server-v1/src/main/resources/application-dev.yml
@ -0,0 +1,5 @@
+server:
+  port: 8099
+
+persistence-service.url: "http://localhost:8085"
+tenant-user-management-service.url: "http://localhost:8091/tenant-user-management/internal"
--- a/search-service-v1/search-service-server-v1/src/main/resources/application.yml
+++ b/search-service-v1/search-service-server-v1/src/main/resources/application.yml
@ -2,11 +2,28 @@ info:
  description: Search Service Server V1

 persistence-service.url: "http://persistence-service-v1:8080"
+tenant-user-management-service.url: "http://tenant-user-management-service:8080/internal"
+
+fforesight:
+  tenants.remote: true
+  tenant-exchange.name: 'tenants-exchange'
+
+logging.pattern.level: "%5p [${spring.application.name},%X{traceId:-},%X{spanId:-}]"
+
+logging.type: ${LOGGING_TYPE:CONSOLE}
+kubernetes.namespace: ${NAMESPACE:default}
+project.version: 1.0-SNAPSHOT
+

 server:
  port: 8080

+lifecycle:
+  base-package: com.iqser.red.service.search
+
 spring:
+  application:
+    name: search-service
  main:
    allow-circular-references: true # FIXME
  profiles:
@ -33,19 +50,11 @@ management:
    health.enabled: true
  endpoints.web.exposure.include: prometheus, health
  metrics.export.prometheus.enabled: ${monitoring.enabled:false}
+  tracing:
+    enabled: ${TRACING_ENABLED:false}
+    sampling:
+      probability: ${TRACING_PROBABILITY:1.0}
+  otlp:
+    tracing:
+      endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces}

-elasticsearch:
-  hosts:
-    - ${elasticsearch.cluster.hosts}
-  port: ${elasticsearch.cluster.port:9200}
-  scheme: ${elasticsearch.cluster.scheme:http}
-  username: ${elasticsearch.cluster.username}
-  password: ${elasticsearch.cluster.password}
-  apiKeyAuth: ${elasticsearch.cluster.apikey}
-
-storage:
-  signer-type: 'AWSS3V4SignerType'
-  bucket-name: 'redaction'
-  region: 'us-east-1'
-  endpoint: 'https://s3.amazonaws.com'
-  backend: 's3'
--- a/search-service-v1/search-service-server-v1/src/main/resources/logback-spring.xml
+++ b/search-service-v1/search-service-server-v1/src/main/resources/logback-spring.xml
@ -0,0 +1,17 @@
+<configuration>
+
+    <springProperty scope="configuration" name="logType" source="logging.type"/>
+    <springProperty scope="context" name="application.name" source="spring.application.name"/>
+    <springProperty scope="context" name="version" source="project.version"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
+    <appender name="JSON" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="${logType}"/>
+    </root>
+
+</configuration>
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
@ -1,81 +1,112 @@
 package com.iqser.red.service.search.v1.server.service;

-import org.junit.runner.RunWith;
+import static org.mockito.Mockito.when;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.utility.DockerImageName;

+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.search.v1.server.Application;
-import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
-import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
+import com.iqser.red.storage.commons.utils.FileSystemBackedStorageService;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+import com.knecon.fforesight.tenantcommons.TenantsClient;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+import com.knecon.fforesight.tenantcommons.model.TenantResponse;

@ComponentScan
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {AbstractElasticsearchIntegrationTest.WAIT_FOR_WRITE_REQUESTS})
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {AbstractElasticsearchIntegrationTest.WAIT_FOR_WRITE_REQUESTS, AbstractElasticsearchIntegrationTest.SEARCH_BACKEND})
@ContextConfiguration(initializers = {AbstractElasticsearchIntegrationTest.Initializer.class})
@EnableFeignClients(basePackageClasses = AbstractElasticsearchIntegrationTest.TestConfiguration.class)
@DirtiesContext
+@AutoConfigureObservability
+@SuppressWarnings("PMD")
 public abstract class AbstractElasticsearchIntegrationTest {

-    public static final String WAIT_FOR_WRITE_REQUESTS = "elasticsearch.refreshPolicy=IMMEDIATE";
+    public static final String WAIT_FOR_WRITE_REQUESTS = "elasticsearch.refreshPolicy=wait_for";
+    public static final String SEARCH_BACKEND = "search.backend=elasticsearch";
+
+    @MockBean
+    private TenantsClient tenantsClient;
+
+    @MockBean
+    private RabbitAdmin rabbitAdmin;
+
+    @MockBean
+    private RabbitListenerEndpointRegistry rabbitListenerEndpointRegistry;
+
+    private static int port;
+
+
+    @BeforeEach
+    public void setupOptimize() {
+
+        TenantContext.setTenantId("redaction");
+        when(tenantsClient.getTenant("redaction")).thenReturn(TenantResponse.builder()
+                                                                      .searchConnection(SearchConnection.builder()
+                                                                                                .hosts(Set.of("localhost"))
+                                                                                                .port(port)
+                                                                                                .scheme("http")
+                                                                                                .numberOfShards("1")
+                                                                                                .numberOfReplicas("5")
+                                                                                                .indexPrefix("indexprefix")
+                                                                                                .build())
+                                                                      .build());
+    }
+

    static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {

        public void initialize(ConfigurableApplicationContext configurableApplicationContext) {

-            var esContainer = new ElasticsearchContainer(DockerImageName.parse("elasticsearch:7.17.2").asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"));
+            var esContainer = new ElasticsearchContainer(DockerImageName.parse("elasticsearch:8.6.2").asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"));
+            esContainer.getEnvMap().put("xpack.security.enabled", "false");
            esContainer.start();

-            String esHost = esContainer.getHttpHostAddress();
-//            String host = esHost.substring(0, esHost.indexOf(':'));
-            int port = Integer.parseInt(esHost.substring(esHost.indexOf(':') + 1));
-
-            TestPropertyValues.of(
-//                    "elasticsearch.cluster.hosts[0]=" + host,
-                    "elasticsearch.port=" + port).applyTo(configurableApplicationContext.getEnvironment());
+            var esHost = esContainer.getHttpHostAddress();
+            port = Integer.parseInt(esHost.substring(esHost.lastIndexOf(':') + 1));
        }

    }

-    @Autowired
-    protected IndexCreatorService indexCreationService;
-
    @Autowired
    protected StorageService storageService;

    @Configuration
-    @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class})
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @ComponentScan(excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = StorageAutoConfiguration.class)})
    public static class TestConfiguration {

-        @Bean
-        public IndexCreatorService indexCreationService(ElasticsearchClient elasticsearchClient, ElasticsearchSettings elasticsearchSettings) {
-
-            return new IndexCreatorService(elasticsearchClient, elasticsearchSettings);
-
-        }
-
-
        @Bean
        @Primary
-        public StorageService inmemoryStorage() {
+        public StorageService inmemoryStorage(ObjectMapper objectMapper) {

-            return new FileSystemBackedStorageService();
+            return new FileSystemBackedStorageService(objectMapper);
        }

    }
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractOpensearchIntegrationTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractOpensearchIntegrationTest.java
@ -0,0 +1,104 @@
+package com.iqser.red.service.search.v1.server.service;
+
+import static org.mockito.Mockito.when;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.opensearch.testcontainers.OpensearchContainer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Primary;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.testcontainers.utility.DockerImageName;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.search.v1.server.Application;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;
+import com.iqser.red.storage.commons.utils.FileSystemBackedStorageService;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+import com.knecon.fforesight.tenantcommons.TenantsClient;
+import com.knecon.fforesight.tenantcommons.model.SearchConnection;
+import com.knecon.fforesight.tenantcommons.model.TenantResponse;
+
+@ComponentScan
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {AbstractOpensearchIntegrationTest.WAIT_FOR_WRITE_REQUESTS, AbstractOpensearchIntegrationTest.SEARCH_BACKEND})
+@ContextConfiguration(initializers = {AbstractOpensearchIntegrationTest.Initializer.class})
+@EnableFeignClients(basePackageClasses = AbstractOpensearchIntegrationTest.TestConfiguration.class)
+@DirtiesContext
+@SuppressWarnings("PMD")
+public abstract class AbstractOpensearchIntegrationTest {
+
+    public static final String WAIT_FOR_WRITE_REQUESTS = "elasticsearch.refreshPolicy=wait_for";
+    public static final String SEARCH_BACKEND = "search.backend=opensearch";
+
+    @MockBean
+    private TenantsClient tenantsClient;
+
+    private static int port;
+
+
+    @BeforeEach
+    public void setupOptimize() {
+
+        TenantContext.setTenantId("redaction");
+        when(tenantsClient.getTenant("redaction")).thenReturn(TenantResponse.builder()
+                .searchConnection(SearchConnection.builder()
+                        .hosts(Set.of("localhost"))
+                        .port(port)
+                        .scheme("http")
+                        .numberOfShards("1")
+                        .numberOfReplicas("5")
+                        .indexPrefix("indexprefix")
+                        .build())
+                .build());
+    }
+
+
+    static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+        public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
+
+            var esContainer = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:2.6.0"));
+
+            esContainer.start();
+
+            String esHost = esContainer.getHttpHostAddress();
+            port = Integer.parseInt(esHost.substring(esHost.lastIndexOf(':') + 1));
+        }
+
+    }
+
+    @Autowired
+    protected StorageService storageService;
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @ComponentScan(excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = StorageAutoConfiguration.class)})
+    public static class TestConfiguration {
+
+        @Bean
+        @Primary
+        public StorageService inmemoryStorage(ObjectMapper objectMapper) {
+
+            return new FileSystemBackedStorageService(objectMapper);
+        }
+
+    }
+
+}
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/ElasticsearchTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/ElasticsearchTest.java
@ -6,15 +6,17 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
-import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
+import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.iqser.red.service.search.v1.model.MatchedDocument;
 import com.iqser.red.service.search.v1.model.SearchResult;
 import com.iqser.red.service.search.v1.server.client.DossierClient;
@ -25,7 +27,7 @@ import com.iqser.red.service.search.v1.server.model.Text;

 import lombok.SneakyThrows;

-public class SearchTest extends AbstractElasticsearchIntegrationTest {
+public class ElasticsearchTest extends AbstractElasticsearchIntegrationTest {

    @Autowired
    private ObjectMapper objectMapper;
@ -63,9 +65,37 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
    @MockBean
    private IndexInformationService indexInformationService;

+    @Autowired
+    private IndexDocumentConverterService indexDocumentConverterService;
+
    private final long UPDATE_TIMER = 1500;


+    @Test
+    @SneakyThrows
+    public void testSimpleSectionsQuery() {
+
+        ClassPathResource textResource = new ClassPathResource("files/crafted document.json");
+        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
+
+        indexDocument("template1",
+                "dossierId1",
+                "fileId1",
+                "crafted document.pdf",
+                text,
+                "UserId",
+                false,
+                false,
+                WorkflowStatus.NEW,
+                null);
+
+
+        SearchResult result = searchService.search("Cyberdyne", null, null, null, null, false, false, null, null, 0, 10, true);
+        assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
+
+    }
+
+
    @Test
    @SneakyThrows
    public void testSearchFileAttribute() {
@ -73,7 +103,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -83,7 +113,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
                false,
                WorkflowStatus.NEW,
                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-2.pdf",
@ -108,7 +138,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -148,7 +178,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -158,7 +188,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
                false,
                WorkflowStatus.NEW,
                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-2.pdf",
@ -180,14 +210,14 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 3
-        documentUpdateService.updateDocument("fileId1", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("F2Key", "F2Value"));
+        updateDocument("fileId1", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("F2Key", "F2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, "UserId2", false, false, WorkflowStatus.NEW.name(), Map.of("F2Key", "F2Value"), 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 4
-        documentUpdateService.updateDocument("fileId2", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("F2Key", "F2Value"));
+        updateDocument("fileId2", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("F2Key", "F2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("F2Key", "F2Value"), 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(2);
@ -206,7 +236,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -216,7 +246,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
                false,
                WorkflowStatus.NEW,
                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-2.pdf",
@ -233,7 +263,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 2
-        documentUpdateService.updateDocument("fileId1", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
+        updateDocument("fileId1", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, "UserId2", false, false, null, null, 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(2);
@ -252,7 +282,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -262,7 +292,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
                false,
                WorkflowStatus.NEW,
                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-2.pdf",
@ -284,7 +314,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 3
-        documentUpdateService.updateDocument("fileId1", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
+        updateDocument("fileId1", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, WorkflowStatus.APPROVED.name(), null, 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -296,7 +326,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 5
-        documentUpdateService.updateDocument("fileId2", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
+        updateDocument("fileId2", "UserId2", false, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, WorkflowStatus.APPROVED.name(), null, 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(2);
@ -315,7 +345,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -325,7 +355,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
                false,
                WorkflowStatus.NEW,
                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-2.pdf",
@ -355,7 +385,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 3
-        documentUpdateService.updateDocument("fileId1", "UserId2", false, true, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
+        updateDocument("fileId1", "UserId2", false, true, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, null, null, 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -368,7 +398,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId2");

        // Act & Assert 5
-        documentUpdateService.updateDocument("fileId2", "UserId2", true, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
+        updateDocument("fileId2", "UserId2", true, false, WorkflowStatus.APPROVED.name(), Map.of("U2Key", "U2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, null, null, 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(0);
@ -389,7 +419,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
+        indexDocument("template1",
                "dossierId1",
                "fileId1",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-1.pdf",
@ -399,7 +429,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
                false,
                WorkflowStatus.NEW,
                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06-2.pdf",
@ -433,7 +463,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().size()).isEqualTo(0);

        // Act & Assert 6
-        documentUpdateService.updateDocument("fileId1", "UserId", false, false, WorkflowStatus.NEW.name(), Map.of("F1Key", "F1ValueNEW"));
+        updateDocument("fileId1", "UserId", false, false, WorkflowStatus.NEW.name(), Map.of("F1Key", "F1ValueNEW"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, null, Map.of("F1Key", "F1Value"), 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(0);
@ -444,14 +474,14 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId1");

        // Act & Assert 8
-        documentUpdateService.updateDocument("fileId1", "UserId", false, false, WorkflowStatus.NEW.name(), Map.of("F1Key", "F1Value", "F2Key", "F2Value"));
+        updateDocument("fileId1", "UserId", false, false, WorkflowStatus.NEW.name(), Map.of("F1Key", "F1Value", "F2Key", "F2Value"));
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, null, Map.of("F1Key", "F1Value", "F2Key", "F2Value"), 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
        assertThat(result.getMatchedDocuments().stream().map(MatchedDocument::getFileId)).contains("fileId1");

        // Act & Assert 9
-        documentUpdateService.updateDocument("fileId1", "UserId", false, false, WorkflowStatus.NEW.name(), null);
+        updateDocument("fileId1", "UserId", false, false, WorkflowStatus.NEW.name(), null);
        Thread.sleep(UPDATE_TIMER);
        result = searchService.search("S-Metolachlor", null, null, null, null, false, false, null, Map.of("F1Key", "F1Value"), 0, 10, false);
        assertThat(result.getMatchedDocuments().size()).isEqualTo(0);
@ -467,17 +497,8 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        ClassPathResource textResource2 = new ClassPathResource("files/Text2.json");
        Text text2 = objectMapper.readValue(textResource2.getInputStream(), Text.class);

-        documentIndexService.indexDocument("template1",
-                "dossierId1",
-                "fileId1",
-                "Single Study - Oral (Gavage) Mouse.pdf",
-                text,
-                "UserId",
-                false,
-                false,
-                WorkflowStatus.NEW,
-                Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template2",
+        indexDocument("template1", "dossierId1", "fileId1", "Single Study - Oral (Gavage) Mouse.pdf", text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template2",
                "dossierId2",
                "fileId2",
                "S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf",
@ -524,7 +545,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke-skywalker-42.pdf";
        String searchString = "szedhsegkekhglghserlkghrsdvkerxyfdbvkrdjgh";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 1, 10, true);
@ -544,7 +565,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke-skywalker-42.pdf";
        String searchString = fileName;
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -566,7 +587,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke-blankwalker 42.pdf";
        String searchString = fileName;
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -589,7 +610,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke.pdf";
        String searchString = "luke";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -611,7 +632,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "1 Abamectin_prr.pdf";
        String searchString = "Abamectin";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -633,7 +654,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "1 Abamectin_prr.pdf";
        String searchString = "prr";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -655,7 +676,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "1 Abamectin_prr.pdf";
        String searchString = "1";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -677,7 +698,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "1 Abamectin_prr.pdf";
        String searchString = "1 Abamectin_prr.pdf";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -698,7 +719,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "1 Abamectin_prr.pdf";
        String searchString = "1 Abamectin";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -719,7 +740,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "1 Abamectin_prr.pdf";
        String searchString = "_prr.pdf";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -738,8 +759,8 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        String fileName = "116 IDD0000261308.pdf";
        String filename2 = "115 IDD0000261308.pdf";
        String searchString = "\"116 IDD\"";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId2", filename2, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId2", filename2, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);

@ -747,6 +768,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0);
    }

+
    @Test
    public void testFilenameWithNumbersMatch() throws IOException {

@ -754,7 +776,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "VV-733382.pdf";
        String searchString = "733382";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);

@ -773,7 +795,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "LUKE.pdf";
        String searchString = "luke";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -795,7 +817,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke.pdf";
        String searchString = "luke.pdf";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -817,7 +839,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "Äpfel.pdf";
        String searchString = "äpfel";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -839,7 +861,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "Äpfel.pdf";
        String searchString = "äpfel.pdf";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -861,7 +883,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke-skywalker-42.pdf";
        String searchString = "luke";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -883,7 +905,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke-skywalker-42.pdf";
        String searchString = "luke-skywalker-42";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -906,7 +928,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        String fileName = "luke-skywalker-42.pdf";
        String matchedString = fileName;
        String searchString = "\"" + matchedString + "\"";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -929,7 +951,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        String fileName = "luke-skywalker-42.pdf";
        String matchedString = "luke";
        String searchString = "\"" + matchedString + "\"";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -952,7 +974,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        String fileName = "luke-skywalker-42.pdf";
        String matchedString = "luke-skywalker-42";
        String searchString = "\"luke-skywalker-42\"";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -975,7 +997,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        String fileName = "luke-blankwalker 42.pdf";
        String matchedString = fileName;
        String searchString = "\"" + matchedString + "\"";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -997,7 +1019,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
        String fileName = "luke-skywalker-42.pdf";
        String searchString = "14C]-SDS-46851";
-        documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));
+        indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value"));

        // Act
        SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true);
@ -1010,4 +1032,37 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest {
        assertThat(StringUtils.contains(result.getMatchedDocuments().get(0).getHighlights().get("sections.text").toArray()[0].toString(), searchString)).isTrue();
    }

+
+    private void indexDocument(String dossierTemplateId,
+                               String dossierId,
+                               String fileId,
+                               String filename,
+                               Text text,
+                               String assignee,
+                               boolean deleted,
+                               boolean archived,
+                               WorkflowStatus workflowStatus,
+                               Map<String, String> fileAttributes) {
+
+        var indexDocument = indexDocumentConverterService.convert(dossierTemplateId,
+                dossierId,
+                fileId,
+                filename,
+                text,
+                assignee,
+                deleted,
+                archived,
+                workflowStatus,
+                fileAttributes);
+        documentIndexService.indexDocument(indexDocument);
+    }
+
+
+    public void updateDocument(String fileId, String assignee, boolean deleted, boolean archived, String workflowStatus, Map<String, String> fileAttributes) {
+
+        var updateDocument = indexDocumentConverterService.convertUpdateDocument(assignee, deleted, archived, workflowStatus, fileAttributes);
+        documentUpdateService.updateDocument(fileId, updateDocument);
+
+    }
+
 }
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java
@ -1,127 +0,0 @@
-package com.iqser.red.service.search.v1.server.service;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.io.IOUtils;
-import org.springframework.core.io.InputStreamResource;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.commons.jackson.ObjectMapperFactory;
-import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
-import com.iqser.red.storage.commons.service.StorageService;
-
-import lombok.SneakyThrows;
-
-public class FileSystemBackedStorageService implements StorageService {
-
-    private final Map<String, File> dataMap = new HashMap<>();
-
-
-    public FileSystemBackedStorageService() {
-
-    }
-
-
-    @SneakyThrows
-    @Override
-    public InputStreamResource getObject(String objectId) {
-
-        var res = dataMap.get(objectId);
-        if (res == null) {
-            throw new StorageObjectDoesNotExist(new RuntimeException());
-        }
-        return new InputStreamResource(new FileInputStream(res));
-
-    }
-
-
-    @Override
-    public void deleteObject(String objectId) {
-
-        dataMap.remove(objectId);
-    }
-
-
-    @Override
-    public boolean objectExists(String objectId) {
-
-        return dataMap.containsKey(objectId);
-    }
-
-
-    @Override
-    public void init() {
-
-    }
-
-
-    @Override
-    @SneakyThrows
-    public <T> void storeJSONObject(String objectId, T any) {
-
-        File tempFile = File.createTempFile("test", ".tmp");
-        getMapper().writeValue(new FileOutputStream(tempFile), any);
-        dataMap.put(objectId, tempFile);
-    }
-
-
-    private ObjectMapper getMapper() {
-
-        return ObjectMapperFactory.create();
-    }
-
-
-    @Override
-    @SneakyThrows
-    public <T> T readJSONObject(String objectId, Class<T> clazz) {
-
-        if (dataMap.get(objectId) == null || !dataMap.get(objectId).exists()) {
-            throw new StorageObjectDoesNotExist("Stored object not found");
-        }
-        return getMapper().readValue(new FileInputStream(dataMap.get(objectId)), clazz);
-    }
-
-
-    public List<String> listPaths() {
-
-        return new ArrayList<>(dataMap.keySet());
-    }
-
-
-    public List<String> listFilePaths() {
-
-        return dataMap.values().stream().map(File::getAbsolutePath).collect(Collectors.toList());
-    }
-
-
-    @Override
-    @SneakyThrows
-    public void storeObject(String objectId, InputStream stream) {
-
-        File tempFile = File.createTempFile("test", ".tmp");
-
-        try (var fileOutputStream = new FileOutputStream(tempFile)) {
-            IOUtils.copy(stream, fileOutputStream);
-        }
-
-        dataMap.put(objectId, tempFile);
-    }
-
-
-    public void clearStorage() {
-
-        this.dataMap.forEach((k, v) -> {
-            v.delete();
-        });
-        this.dataMap.clear();
-    }
-
-}
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java
@ -2,12 +2,12 @@ package com.iqser.red.service.search.v1.server.service;

 import static org.mockito.Mockito.when;

-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;

-import com.iqser.red.service.persistence.service.v1.api.model.index.IndexInformation;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.index.IndexInformation;
 import com.iqser.red.service.search.v1.server.client.FileStatusClient;
 import com.iqser.red.service.search.v1.server.client.IndexInformationClient;
 import com.iqser.red.service.search.v1.server.queue.IndexingMessageReceiver;
@ -37,7 +37,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest {

        // Assert
        System.out.println(hash);
-        Assert.assertNotNull(hash);
+        Assertions.assertNotNull(hash);

    }

@ -50,7 +50,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest {
        when(indexInformationClient.getIndexInformation()).thenReturn(indexInformation);

        // Act and Assert
-        Assert.assertTrue(indexInformationService.hasIndexChanged());
+        Assertions.assertTrue(indexInformationService.hasIndexChanged());
    }


@ -63,7 +63,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest {
        when(indexInformationClient.getIndexInformation()).thenReturn(indexInformation);

        // Act and Assert
-        Assert.assertFalse(indexInformationService.hasIndexChanged());
+        Assertions.assertFalse(indexInformationService.hasIndexChanged());
    }


@ -74,7 +74,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest {
        when(indexInformationClient.getIndexInformation()).thenReturn(null);

        // Act and Assert
-        Assert.assertTrue(indexInformationService.hasIndexChanged());
+        Assertions.assertTrue(indexInformationService.hasIndexChanged());
    }

 }
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java
@ -2,17 +2,19 @@ package com.iqser.red.service.search.v1.server.service;

 import static org.mockito.Mockito.when;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.iqser.red.service.search.v1.model.IndexMessage;
 import com.iqser.red.service.search.v1.model.IndexMessageType;
 import com.iqser.red.service.search.v1.model.SearchRequest;
@ -24,6 +26,7 @@ import com.iqser.red.service.search.v1.server.controller.SearchController;
 import com.iqser.red.service.search.v1.server.model.Text;
 import com.iqser.red.service.search.v1.server.queue.IndexingMessageReceiver;
 import com.iqser.red.service.search.v1.server.service.utils.MetricValidationUtils;
+import com.knecon.fforesight.tenantcommons.TenantContext;

 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import lombok.SneakyThrows;
@ -66,7 +69,7 @@ public class MetricsIntegrationTest extends AbstractElasticsearchIntegrationTest

        ClassPathResource textResource = new ClassPathResource("files/Text2.json");
        Text text = objectMapper.readValue(textResource.getInputStream(), Text.class);
-        storageService.storeJSONObject(TextStorageService.StorageIdUtils.getStorageId("1", "1", FileType.SIMPLIFIED_TEXT), text);
+        storageService.storeJSONObject(TenantContext.getTenantId(), TextStorageService.StorageIdUtils.getStorageId("1", "1", FileType.SIMPLIFIED_TEXT), text);

        IndexMessage indexRequest = new IndexMessage();
        indexRequest.setDossierId("1");
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/OpensearchTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/OpensearchTest.java
--- a/search-service-v1/search-service-server-v1/src/test/resources/application.yml
+++ b/search-service-v1/search-service-server-v1/src/test/resources/application.yml
@ -1,23 +1,24 @@
+
 ribbon:
  ConnectTimeout: 600000
  ReadTimeout: 600000

+logging.type: ${LOGGING_TYPE:CONSOLE}
+
 logging.level.root: INFO

+
+fforesight:
+  tenant-exchange:
+    name: 'tenants-exchange'
+
 spring:
  main:
    allow-bean-definition-overriding: true
    allow-circular-references: true # FIXME

 storage:
-  signer-type: 'AWSS3V4SignerType'
-  bucket-name: 'redaction'
-  region: 'us-east-1'
-  endpoint: 'https://s3.amazonaws.com'
  backend: 's3'
-elasticsearch:
-  hosts:
-    - 'localhost'

 management:
  endpoint:
@ -28,3 +29,8 @@ management:
  metrics.export.prometheus.enabled: true

 persistence-service.url: 'http://mock.url'
+
+server:
+  port: 19547
+
+POD_NAME: search-service
--- a/search-service-v1/search-service-server-v1/src/test/resources/files/crafted
+++ b/search-service-v1/search-service-server-v1/src/test/resources/files/crafted
@ -0,0 +1,205 @@
+{
+  "numberOfPages": 9,
+  "sectionTexts": [
+    {
+      "sectionNumber": "1",
+      "text": "Rule 0: Expand CBI Authors with firstname initials F. Lastname, J. Doe, M. Mustermann Lastname M., Doe J. Mustermann M."
+    },
+    {
+      "sectionNumber": "2",
+      "text": "Rule 1/2: Redact CBI Authors based on Dict Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No David Ksenia Max Mustermann Ranya Eikenboom Charalampos Schenk Tanja Schmitt ← should not be annotated, not in Dictionary"
+    },
+    {
+      "sectionNumber": "3",
+      "text": "Rule 3/4: Redact (not) CBI Add/ress based on Dict Dont Redact (mark as skipped) when Vertebrate Study is No Redact when Vertebrate Study is Yes Warnsveld, 7232 CX Warnsveld, Netherlands, NL Institut Industries, 33 Rue Jean Baffier, 18000 Bourges, France, FR 4-6 Chem. des Varennes, 18300 Saint-Satur, France, FR Lesdo Industries, Chäppelisträssli, 6078 Lungern, Switzerland Shlissel'burgskaya Ulitsa, Nizhny Novgorod Oblast, Russia, 603034, RU Karl Johans Gate 11, 0154 Oslo, Norway, NOR ← should not be annotated, not in Dictionary"
+    },
+    {
+      "sectionNumber": "4",
+      "text": "Rule 5: Do not redact genitive CBI_authors (Entries based on Dict) Expand to Hint Clarissa’s Donut ← not added to Dict, should be not annotated Simpson's Tower ← added to Authors-Dict, should be annotated"
+    },
+    {
+      "sectionNumber": "5",
+      "text": "Reference No Author(s) Year Title Laboratory"
+    },
+    {
+      "sectionNumber": "6",
+      "text": "BR2 /2 Michael N. 1998 The role of physical education in the school system. Weyland Industries"
+    },
+    {
+      "sectionNumber": "7",
+      "text": "BR3 /5 Funnarie B. 2001 It should be illegal to produce and sell tobacco Authentic Diagnostics"
+    },
+    {
+      "sectionNumber": "8",
+      "text": "ZZ/12 Feuer A. 1989 Social media is the real cause of teenage depression. Tyrell Corporation"
+    },
+    {
+      "sectionNumber": "10",
+      "text": "Rule 6-11 (Authors Table) Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No"
+    },
+    {
+      "sectionNumber": "11",
+      "text": "Rule 12/13: Redact/Hint if CTL or BL was found Redact when Vertebrate Study is Yes Hint when Vertebrate Study is No CTL/without dictionary entry CTL without Slash BL/without dictionary entry BL without Slash CTL/with dictionary entry 1234 with Slash CTL with dictionary entry 5678 without Slash BL/with dictionary entry 1234 with Slash BL with dictionary entry 5678 without Slash"
+    },
+    {
+      "sectionNumber": "12",
+      "text": "Rule 14/15: Redact and add recommendation for et al. Redact Term “Desiree”, “Melanie” and add to Recommendation CBI Authors if Vertebrate Study is Yes & No Lorem ipsum dolor sit amet, consectetur adipiscing elit Desiree et al sed do eiusmod tempor incididunt ut labore et dolore magna aliqua Melanie et al. Reference No 12345 Lorem ipsum."
+    },
+    {
+      "sectionNumber": "13",
+      "text": "Rule 16/17: Add recommendation for Addresses in Test Organism/Animals sections Recommend only if Vertebrate Study is Yes, else do nothing Lorem ipsum dolor sit Species: Mouse; Source: Stark Industries"
+    },
+    {
+      "sectionNumber": "14",
+      "text": "Rule 16/17 (additional) negative Test; missing first Key Nothing should happen because of missing first/second keyword according to the rules Dont redact here because of missing first key; Source: Omni Consumer Products Dont redact here because missing first keyword; Source Resources Development Administration"
+    },
+    {
+      "sectionNumber": "15",
+      "text": "Rule 16/17 (additional) negative Test; missing second Key Dont redact here because of missing second key; Species: Mouse; Omni Consumer Products Dont redact here because missing second keyword; Species: Mouse, Resources Development Administration"
+    },
+    {
+      "sectionNumber": "16",
+      "text": "Rule 18: Do not redact Names and Addresses if Published Information found Do not redact Names and Addresses if Published Information found Lorem ipsum dolor sit amet Oxford University Press in voluptate velit esse cillum. Iakovos Geiger, Julian Ritter, Asya Lyon, Carina Madsen, Alexandra Häusler, Hanke Mendel, Ranya Eikenboom. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Min Kwok, Jun K., Tu Wong, Qiang Suen, Zhou Mah, Ning Liu, Lei W. Huang, Ru X. Wu"
+    },
+    {
+      "sectionNumber": "17",
+      "text": "Rule 19/20: Redacted PII Personal Identification Information based on Dict Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No Naka-27 Aomachi, Nomi, Ishikawa 923-1101, Japan, JP Sude Halide Nurullah Özgür U. Reyhan B. Rahim C. J. Alfred Xinyi Y. Tao Clara Siegfried ← not added to Dict, should be not annotated"
+    },
+    {
+      "sectionNumber": "18",
+      "text": "Rule 21/22: Redact Emails by RegEx Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No Duis aute irure dolor in library@outlook.com reprehenderit in voluptate gordonjcp@msn.com velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint dinther@comcast.net occaecat cupidatat non proident, sunt in kawasaki@me.com culpa qui officia deserunt mollit anim id est laborum."
+    },
+    {
+      "sectionNumber": "19",
+      "text": "Description Text Contact Point"
+    },
+    {
+      "sectionNumber": "20",
+      "text": "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum Contact Point dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Contact point: Central Research Industry Phone: +49 2113 2311 563 Fax: +49 2113 2311 560 Tel.: +81 764770164 Tel: +81 6653 44563 E-mail: Seriknowmobil@co.uk Email: maximiliamschmitt@arcor.de e-mail: maximiliamschmitt@t-online.de E-mail address: example@mail.com Contact: Maximiliam Schmitt Telephone number: +27414328992 Telephone No: +274 1432 8991 Fax number: +274 1432 8990 Telephone: +274 34223331 Phone No. +274 1432 8933 Contact: 493 1223 4592 European contact: European Central Institute Alternative contact: Emilia Lockhart Alternative contact: Cyberdyne Systems Tower Defense 121a Hong Kong, BT District"
+    },
+    {
+      "sectionNumber": "22",
+      "text": "Rule 23/24: Redact contact information (contains \"Contact point:\") Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No “Contact-Information was found should be appears”"
+    },
+    {
+      "sectionNumber": "23",
+      "text": "Description Text Applicant"
+    },
+    {
+      "sectionNumber": "24",
+      "text": "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum Contact Point dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Contact point: Central Research Industry Phone: +49 2113 2311 563 Fax: +49 2113 2311 560 Tel.: +81 764770164 Tel: +81 6653 44563 E-mail: Seriknowmobil@co.uk Email: maximiliamschmitt@arcor.de e-mail: maximiliamschmitt@t-online.de E-mail address: example@mail.com Contact: Maximiliam Schmitt Telephone number: +27414328992 Telephone No: +274 1432 8991 Fax number: +274 1432 8990 Telephone: +274 34223331 Phone No. +274 1432 8933 Contact: 493 1223 4592 European contact: European Central Institute Alternative contact: Emilia Lockhart Alternative contact: Cyberdyne Systems Tower Defense 121a Hong Kong, BT District"
+    },
+    {
+      "sectionNumber": "26",
+      "text": "Rule 25/26: Redact contact information (contains \"Applicant\" as Headline or Text) Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No “Applicant Information was found should be appears” Applicant Name: Soylent Corporation Contact point: Riddley Scott Address: 359-21 Huam-dong Yongsan-gu Seoul, South Korea Phone: +82 122 34188 Fax: +82 122 34180 E-mail: food-industry@korea.com Contact: This is a special case, everything between this and the next keyword should be redacted Tel.: +275 5678 1234 132 fsdfdfre frefref"
+    },
+    {
+      "sectionNumber": "27",
+      "text": "Rule 27/28: Redact contact Information (contains Producer) Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No “Producer was found” should be appears Producer of the plant production Name: Umbrella Corporation Contact: Jill Valentine Address: 359-21 Huam-dong Yongsan-gu Seoul, South Korea Phone: +82 122 34188 Fax: +82 122 34180 E-mail: pharma-industry@korea.com"
+    },
+    {
+      "sectionNumber": "28",
+      "text": "Rule 29/30/31/32: If Text contains \"AUTHORS:\" and \"COMPLETION DATES\" but not \"STUDY COMPLETION DATES\", then Redact between both Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No Study Report___ AUTHOR(S): Dr. Alan Grant COMPLETION DATE: 02 December 1997"
+    },
+    {
+      "sectionNumber": "29",
+      "text": "Rule 29/30/31/32: (additional) negative Test for Study completion dates No Redaction should be appears here Study Report___ AUTHOR(S): Dr. Alan Grant STUDY COMPLETION DATE: 02 December 1997"
+    },
+    {
+      "sectionNumber": "30",
+      "text": "Rule 33/34: If Text contains \"Performing Lab\" and \"Lab Project ID\", then Redact everything between Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No Study Report___ PERFORMING LABORATORY: Umbrella Corporation LABORATORY PROJECT ID: Number 20201/33991/ERZAT/21"
+    },
+    {
+      "sectionNumber": "31",
+      "text": "Rule 35/36/37/38: ?? Tba"
+    },
+    {
+      "sectionNumber": "32",
+      "text": "Rule 39: Purity Hint Add Purity as Hint when Percent-Numbers is there Test Item: Soda Purity: 45% ← should be Hint Purity: <45% ← should be Hint Purity: >45% ← should be Hint Purity: 101% ← should ne be Hint because >100 % is not possible Purity: =>45% ← should be not Hint because additional symbols Purity: =<45% ← should be not Hint because additional symbols Purity: aa 45% ← should be not Hint because additional symbols Purity: 45% aa ← should be not Hint because additional symbols Purity: aa45% ← should be not Hint because additional symbols Purity: 45%aa ← should be not Hint because additional symbols Product-Code: EAK-L443 purity: 99% ← not Hint because case sensitive purity: >99% ← not Hint because case sensitive purity: <99% ← not Hint because case sensitive Supplier: GreenForce"
+    },
+    {
+      "sectionNumber": "33",
+      "text": "Rule 40: Ignore Dossier-Redaction if Confidentiality is not set Dont redact Dossier-Redaction if Confidentiality is not set in file attributes Excepteur sint occaecat cupidatat non proident, myDossierRedaction sunt in culpa qui officia deserunt mollit anim id est laborum."
+    },
+    {
+      "sectionNumber": "34",
+      "text": "Rule 41/42: Redact Signatures Redact when Vertebrate Study is Yes Redact when Vertebrate Study is No __________________________ __________________________ Signed by: Dilara Sonnenschein Signed by: Tobias Müller"
+    },
+    {
+      "sectionNumber": "35.1.1.3",
+      "text": "Rule 43: Redact Logo Redact Logo only if Vertebrate Study is Yes, else do nothing (skipped)"
+    },
+    {
+      "sectionNumber": "36",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "37",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "38",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "39",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "40",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "41",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "42",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "43",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "44",
+      "text": "This is a Page-Header"
+    },
+    {
+      "sectionNumber": "45",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "46",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "47",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "48",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "49",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "50",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "51",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "52",
+      "text": "This is a Page-Footer"
+    },
+    {
+      "sectionNumber": "53",
+      "text": "This is a Page-Footer"
+    }
+  ]
+}
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -0,0 +1,5 @@
+rootProject.name = "search-service"
+include(":search-service-api-v1")
+include(":search-service-server-v1")
+project(":search-service-api-v1").projectDir = file("search-service-v1/search-service-api-v1")
+project(":search-service-server-v1").projectDir = file("search-service-v1/search-service-server-v1")
Author	SHA1	Message	Date
Maverick Studer	f2e8020c9b	Merge branch 'hotfix-queue-name-mismatch' into 'master' Fix tenant-updated queue naming mismatch See merge request redactmanager/search-service!33	2024-10-07 12:26:49 +02:00
maverickstuder	e7f84c28d6	Fix tenant-updated queue naming mismatch	2024-10-07 12:21:12 +02:00
Dominique Eifländer	779acf6202	Merge branch 'update-psv-fp' into 'master' Update persistence-service version See merge request redactmanager/search-service!32	2024-09-30 11:47:58 +02:00
maverickstuder	ff626afe78	Update persistence-service version	2024-09-30 11:36:25 +02:00
Maverick Studer	ebf13d3be1	Merge branch 'update-tc' into 'master' Update tenant-commons for dlq fix See merge request redactmanager/search-service!30	2024-09-03 13:49:55 +02:00
maverickstuder	0693ddf197	Update tenant-commons for dlq fix	2024-09-03 13:16:04 +02:00
Maverick Studer	c6d0361678	Merge branch 'tenants-retry' into 'master' Tenants retry logic and queue renames See merge request redactmanager/search-service!29	2024-08-29 13:46:47 +02:00
Maverick Studer	380b62333c	Tenants retry logic and queue renames	2024-08-29 13:46:46 +02:00
Maverick Studer	f7a549c1a3	Merge branch 'RED-9331' into 'master' RED-9331: Explore possibilities for fair upload / analysis processing per tenant Closes RED-9331 See merge request redactmanager/search-service!27	2024-08-27 09:26:16 +02:00
Maverick Studer	55e0386e31	RED-9331: Explore possibilities for fair upload / analysis processing per tenant	2024-08-27 09:26:16 +02:00
Maverick Studer	599ed66773	Merge branch 'RED-9872' into 'master' RED-9872: Tenant Management issues Closes RED-9872 See merge request redactmanager/search-service!28	2024-08-15 09:44:49 +02:00
Maverick Studer	8e717a5067	RED-9872: Tenant Management issues	2024-08-15 09:44:49 +02:00
Andrei Isvoran	0a7b6cddb2	Merge branch 'RED-9489' into 'master' RED-9489 - Implement graceful shutdown Closes RED-9489 See merge request redactmanager/search-service!26	2024-07-04 13:05:40 +02:00
Andrei Isvoran	87b585c354	RED-9489 - Implement graceful shutdown	2024-07-04 13:44:13 +03:00
Maverick Studer	43bb08e301	Merge branch 'RED-9374' into 'master' RED-9374: Ner Entities are at wrong locations Closes RED-9374 See merge request redactmanager/search-service!25	2024-06-18 16:30:48 +02:00
Maverick Studer	d116d99db7	RED-9374: Ner Entities are at wrong locations	2024-06-18 16:30:48 +02:00
Timo Bejan	e0fb825cf7	Merge branch 'hotfix-es-client-close' into 'master' hotfix es client close/jvm error See merge request redactmanager/search-service!24	2024-04-05 14:14:37 +02:00
Timo Bejan	18abdedaf8	aligned timeouts with cache expire time	2024-03-28 16:30:13 +02:00
Timo Bejan	fe28c1463a	hotfix es client close/jvm error	2024-03-28 16:07:10 +02:00
Dominique Eifländer	2157751b3e	Merge branch 'RED-8171' into 'master' RED-8171: Traces do not stop at @Async Closes RED-8171 See merge request redactmanager/search-service!23	2024-02-02 14:04:39 +01:00
Dominique Eifländer	74f971757c	RED-8171: Traces do not stop at @Async	2024-02-02 13:47:55 +01:00
Timo Bejan	79be8e272b	Merge branch 'RED-8085' into 'master' Fixed PMD after main changes RED-8085 Closes RED-8085 See merge request redactmanager/search-service!22	2024-01-30 05:46:55 +01:00
Timo Bejan	d10b5b26e8	Fixed PMD after main changes RED-8085	2024-01-30 12:31:32 +08:00
Timo Bejan	fd1cb84ebb	Merge branch 'RED-8085' into 'master' RED-8085 pmd checkup/cleanup Closes RED-8085 See merge request redactmanager/search-service!21	2024-01-29 10:32:06 +01:00
Timo Bejan	7abf08e13b	RED-8085 pmd checkup/cleanup	2024-01-29 10:32:05 +01:00
Yannik Hampe	1cef042c1e	Merge branch 'RED-7128' into 'master' RED-6668: Handle delete tenant events Closes RED-7128 See merge request redactmanager/search-service!20	2024-01-26 09:29:56 +01:00
yhampe	4296abab94	RED-6668: introduce delete tenant endpoint: fixed missing value in test configuration	2024-01-26 08:51:19 +01:00
yhampe	3f7373f55d	RED-6668: introduce delete tenant endpoint: fixed topic exchange code	2024-01-25 09:51:00 +01:00
Dominique Eifländer	496c6a1da8	RED-7128: Handle delete tenant events	2024-01-22 15:15:23 +01:00
Dominique Eifländer	2234a5dbd8	Merge branch 'RED-1137' into 'master' RED-1137: Do not observe actuator endpoints Closes RED-1137 See merge request redactmanager/search-service!19	2023-12-20 14:31:42 +01:00
Dominique Eifländer	03c6248b84	RED-1137: Do not observe actuator endpoints	2023-12-20 14:15:09 +01:00
Dominique Eifländer	e59012ba4b	Merge branch 'RED-5223' into 'master' RED-5223: Use tracing-commons from fforesight Closes RED-5223 See merge request redactmanager/search-service!18	2023-12-13 17:08:05 +01:00
Dominique Eifländer	e931522014	RED-5223: Use tracing-commons from fforesight	2023-12-13 16:59:24 +01:00
Dominique Eifländer	c877eea3cc	Merge branch 'RED-5223' into 'master' RED-5223: Enabled tracing, upgrade spring, use logstash-logback-encoder for json logs Closes RED-5223 See merge request redactmanager/search-service!16	2023-12-12 10:44:35 +01:00
Dominique Eifländer	dd53eeff93	RED-5223: Enabled tracing, upgrade spring, use logstash-logback-encoder for json logs	2023-12-12 10:30:22 +01:00
Andrei Isvoran	a41a584499	Merge branch 'RED-7715' into 'master' RED-7715 - Add log4j config to enable switching between json/line logs Closes RED-7715 See merge request redactmanager/search-service!15	2023-12-06 12:40:36 +01:00
Andrei Isvoran	9d6da4e7a3	RED-7715 - Add log4j config to enable switching between json/line logs	2023-12-06 11:33:31 +02:00
Andrei Isvoran	25c90d1312	Merge branch 'RED-7407' into 'master' RED-7407 - Migrating from maven to gradle Closes RED-7407 See merge request redactmanager/search-service!9	2023-11-06 15:52:15 +01:00
Andrei Isvoran	36e2ce5196	RED-7407 - Migrating from maven to gradle	2023-11-06 16:40:11 +02:00
Andrei Isvoran	bb92e423f1	Merge branch 'RED-7407' into 'master' RED-7407 - Migrating from maven to gradle Closes RED-7407 See merge request redactmanager/search-service!8	2023-11-06 15:06:22 +01:00
Andrei Isvoran	2a96ba5477	RED-7407 - Migrating from maven to gradle	2023-11-06 14:07:35 +02:00
Ali Oezyetimoglu	d4a77d3f70	Merge branch 'RED-7175' into 'master' RED-7175: adapted index name to corresponding places to make it available for search index Closes RED-7175 See merge request redactmanager/search-service!7	2023-09-07 10:36:29 +02:00
Ali Oezyetimoglu	982846c0c3	RED-7175: changed index name to index prefix	2023-09-06 19:51:11 +02:00
Ali Oezyetimoglu	731aa80b69	RED-7175: changed index name to index prefix	2023-09-06 18:55:10 +02:00
Ali Oezyetimoglu	9ee4c8cd91	RED-7175: adapted index name to corresponding places to make it available for search index	2023-09-04 18:18:44 +02:00
Andrei Isvoran	e24dfe7fbe	Merge branch 'RED-6864' into 'master' RED-6864 Upgrade search-service to new storage Closes RED-6864 See merge request redactmanager/search-service!6	2023-08-17 08:54:11 +02:00
Andrei Isvoran	bf9540a986	RED-6864 Upgrade search-service to new storage	2023-08-16 16:00:02 +03:00
Andrei Isvoran	0c66b4e505	RED-7290 - Update platform-commons-dependency	2023-08-04 09:49:20 +03:00
Timo Bejan	64cbe4aaf9	Update pom.xml	2023-07-27 08:51:16 +02:00
Kevin Tumma	01ab04ece7	Merge branch 'renovate/configure' into 'master' Configure Renovate See merge request redactmanager/search-service!5	2023-07-17 13:54:42 +02:00
Kevin Tumma	1c21f72a08	Add renovate.json	2023-07-14 09:09:13 +00:00
Timo Bejan	bd690d6cc9	Merge branch 'RED-6686-2' into 'master' RED-6686 tenant commons update Closes RED-6686 See merge request redactmanager/search-service!4	2023-06-27 23:09:56 +02:00
Timo Bejan	c44bd014d3	RED-6686 tenant commons update	2023-06-27 23:46:18 +03:00
Timo Bejan	60842f58d0	Merge branch 'RED-6686' into 'master' RED-6686 Extract Tenant and user-management code into a separate service. See merge request redactmanager/search-service!1	2023-06-26 21:58:38 +02:00
Timo Bejan	ec56f833ff	RED-6686 Extract Tenant and user-management code into a separate service.	2023-06-26 21:58:38 +02:00
Dominique Eifländer	ee5cf2ff5a	Merge branch 'RED-6072-timestamp' into 'master' RED-6072 - As Operation I want to see why files are in an ERROR state Closes RED-6072 See merge request redactmanager/search-service!3	2023-06-15 14:12:59 +02:00
Corina Olariu	665d27085a	RED-6072 - As Operation I want to see why files are in an ERROR state - added the timestamp to fileErrorInfo when informing of error	2023-06-15 14:46:47 +03:00
Dominique Eifländer	ee698a9647	Merge branch 'RED-6876' into 'master' RED-6876: Fixed not correct initialized index Closes RED-6876 See merge request redactmanager/search-service!2	2023-06-14 11:00:20 +02:00
deiflaender	28ab0dc8cc	RED-6876: Fixed not correct initialized index	2023-06-14 10:50:54 +02:00
Christoph Schabert	da080f9671	Update file pom.xml	2023-05-31 15:51:01 +02:00
Christoph Schabert	4ae80fdffc	Update 6 files - /bamboo-specs/src/main/java/buildjob/PlanSpec.java - /bamboo-specs/src/main/resources/scripts/build-java.sh - /bamboo-specs/src/main/resources/scripts/sonar-java.sh - /bamboo-specs/src/test/java/buildjob/PlanSpecTest.java - /bamboo-specs/pom.xml - /.gitlab-ci.yml	2023-05-31 15:50:04 +02:00
Corina Olariu	c144f26099	Pull request #83 : RED-6072 Merge in RED/search-service from RED-6072 to master * commit 'eba029928e38ccd1d9dbd6eed4879ed39b7ab999': RED-6072 - As Operation I want to see why files are in an ERROR state - reformat in one line RED-6072 - As Operation I want to see why files are in an ERROR state - update the indexing failed with error information - in case of exception the reason is caught and added tot the message received from the queue RED-6072 - As Operation I want to see why files are in an ERROR state - update from iqser to knecon	2023-05-25 14:42:08 +02:00
devplant	eba029928e	RED-6072 - As Operation I want to see why files are in an ERROR state - reformat in one line	2023-05-25 15:19:59 +03:00
devplant	6b58e8b894	RED-6072 - As Operation I want to see why files are in an ERROR state - update the indexing failed with error information - in case of exception the reason is caught and added tot the message received from the queue	2023-05-25 11:29:04 +03:00
devplant	c72c881e6e	RED-6072 - As Operation I want to see why files are in an ERROR state - update from iqser to knecon	2023-05-25 11:13:35 +03:00
Dominique Eiflaender	f518d4ff9c	Pull request #82 : RED-6665: Added missing StorageAutoConfiguration Merge in RED/search-service from RED-6665 to master * commit '65ccdb825756072b558b9cc13cfc04d10adc9be4': RED-6665: Added missing StorageAutoConfiguration	2023-04-24 11:32:30 +02:00
deiflaender	65ccdb8257	RED-6665: Added missing StorageAutoConfiguration	2023-04-24 11:26:05 +02:00
Dominique Eiflaender	4fcd310a66	Pull request #81 : RED-6665: Added index to search request Merge in RED/search-service from RED-6665 to master * commit 'be1b0eb27d632955787c209389c57890959419ec': RED-6665: Added index to search request	2023-04-24 10:23:41 +02:00
deiflaender	be1b0eb27d	RED-6665: Added index to search request	2023-04-24 10:13:51 +02:00
Corina Olariu	b09132d5bf	Pull request #80 : RED-5694 Merge in RED/search-service from RED-5694 to master * commit '173428771b0ada963e10f0c9348e17f951e28bb8': RED-5694 - Upgrade spring-boot to 3.0 - remove versions already defined in spring boot - add missing PostConstruct annotation RED-5694 - Upgrade spring-boot to 3.0 - remove commented code RED-5694 - Upgrade spring-boot to 3.0 - update platform-dependency - update other dependencies versions to the latest	2023-04-06 12:39:15 +02:00
devplant	173428771b	RED-5694 - Upgrade spring-boot to 3.0 - remove versions already defined in spring boot - add missing PostConstruct annotation	2023-04-06 13:31:32 +03:00
devplant	b1b42ce0d7	RED-5694 - Upgrade spring-boot to 3.0 - remove commented code	2023-04-05 20:19:53 +03:00
devplant	afd40a7cd7	RED-5694 - Upgrade spring-boot to 3.0 - update platform-dependency - update other dependencies versions to the latest	2023-04-05 18:27:32 +03:00
Dominique Eiflaender	8e8ad7b9e7	Pull request #79 : RED-6224: Reimplemented client cache logic Merge in RED/search-service from RED-6224 to master * commit '5da599bc9be258c5e91443debf88abba8a9c0c6e': RED-6224: Reimplemented client cache logic	2023-04-04 13:45:02 +02:00
deiflaender	5da599bc9b	RED-6224: Reimplemented client cache logic	2023-04-04 11:53:41 +02:00
Dominique Eiflaender	0471b7f52c	Pull request #78 : RED-4515: Fixed wrong logic in removallistener of client caches Merge in RED/search-service from RED-4515 to master * commit '487f6c31903da3de22e420b308987d8edb186231': RED-4515: Fixed wrong logic in removallistener of client caches	2023-04-03 11:23:38 +02:00
deiflaender	487f6c3190	RED-4515: Fixed wrong logic in removallistener of client caches	2023-04-03 09:05:01 +02:00
Timo Bejan	325050fca6	Pull request #77 : RED-6162 - bumped version Merge in RED/search-service from RED-6162 to master * commit '56e693db376037ea046ddff37d5ff93506cb9e89': RED-6162 - bumped version RED-6162 - bumped version	2023-03-10 15:07:48 +01:00
Timo Bejan	56e693db37	RED-6162 - bumped version	2023-03-10 15:58:37 +02:00
Dominique Eiflaender	b3c4e014c8	Pull request #76 : RED-4645: Multitenancy for storage Merge in RED/search-service from RED-4645 to master * commit '64e0c20334221f7319be1260c8e40c1c954d614a': RED-4645: Multitenancy for storage	2023-03-10 14:53:57 +01:00
Timo Bejan	e822f64f58	RED-6162 - bumped version	2023-03-10 15:51:17 +02:00
deiflaender	64e0c20334	RED-4645: Multitenancy for storage	2023-03-10 13:17:14 +01:00
Timo Bejan	b9922bd48e	Pull request #75 : RED-6162 Redaction Gateway - Persistence Service Merge Updates Merge in RED/search-service from RED-6162 to master * commit '5a43ce421aefe2e909559ce85177ef37417cd95c': RED-6162 - persistence update - identity test RED-6162 - persistence update - updated internal API	2023-03-10 11:27:23 +01:00
Timo Bejan	5a43ce421a	RED-6162 - persistence update - identity test	2023-03-10 11:10:15 +02:00
Timo Bejan	aa297096ed	RED-6162 - persistence update - updated internal API	2023-03-10 11:10:13 +02:00
Dominique Eiflaender	b89a04cd3c	Pull request #74 : RED-4646: Multitenacy for elasticsearch and opensearch Merge in RED/search-service from RED-4646 to master * commit '27c636fb36a2e2e82029aff5c3aca9fb7401d40e': RED-4646: Added request interceptor that sends x-tenant-id on each client call RED-4646: Removed default tenant RED-4646: Run migration for all tenants RED-4646: Multitenacy for elasticsearch and opensearch	2023-03-09 16:18:48 +01:00
deiflaender	27c636fb36	RED-4646: Added request interceptor that sends x-tenant-id on each client call	2023-03-09 15:56:21 +01:00
deiflaender	7b00edc2d3	RED-4646: Removed default tenant	2023-03-09 12:48:43 +01:00
deiflaender	ee102be366	RED-4646: Run migration for all tenants	2023-03-09 12:29:29 +01:00
deiflaender	d59e61424f	RED-4646: Multitenacy for elasticsearch and opensearch	2023-03-09 12:13:33 +01:00
Dominique Eiflaender	8e497256c6	Pull request #73 : RED-5669: Fixed startup test error Merge in RED/search-service from RED-5669 to master * commit '0a0b5a984219bbbdf904fd36f84947c062503cf6': RED-5669: Fixed startup test error	2023-03-06 13:19:05 +01:00
deiflaender	0a0b5a9842	RED-5669: Fixed startup test error	2023-03-06 13:03:19 +01:00
Dominique Eiflaender	3f6abf730d	Pull request #72 : RED-5669 Merge in RED/search-service from RED-5669 to master * commit '0deb73e31878f707ae090baf040843c25e372a09': RED-5669: Fixed pr findings 2 RED-5669: Fixed pr findings RED-5669: Removed unneeded code RED-5669: Support both elasticsearch and opensearch RED-5669: Changed tests to run with elasticsearch 8.6.0 RED-5669: Adapted service to new elasticseach api	2023-03-06 09:21:50 +01:00
deiflaender	0deb73e318	RED-5669: Fixed pr findings 2	2023-03-06 09:15:41 +01:00
deiflaender	2f91ccf538	RED-5669: Fixed pr findings	2023-03-03 16:09:59 +01:00
deiflaender	426ca8f133	RED-5669: Removed unneeded code	2023-03-03 14:57:23 +01:00
deiflaender	aa22906ade	RED-5669: Support both elasticsearch and opensearch	2023-03-03 14:50:30 +01:00
deiflaender	b754a1abc5	RED-5669: Changed tests to run with elasticsearch 8.6.0	2023-03-03 14:42:39 +01:00
deiflaender	41fbdaca71	RED-5669: Adapted service to new elasticseach api	2023-03-03 14:42:39 +01:00
Corina Olariu	b2c013ece4	Pull request #70 : RED-4988 Merge in RED/search-service from RED-4988 to master * commit 'b36248fff440cd1e6fcc5245d0afa686620bb78a': RED-4988 Check jacoco version in poms and update to a current compatible version - uodate junit tests from 4 to 5 RED-4988 Check jacoco version in poms and update to a current compatible version - update platform-dependency, platform-commons-dependency	2023-03-02 09:30:08 +01:00
Shamel Hussain	8b8dc7c7b5	Pull request #71 : RED-5718: Update base image version to allow using random user ids Merge in RED/search-service from shussain/Dockerfile-1677589868999 to master * commit '7742c2bbadf48dfdfa5a51ebeb45516ee99acd68': RED-5718: Update base image version to allow using random user ids	2023-02-28 14:57:11 +01:00
Shamel Hussain	7742c2bbad	RED-5718: Update base image version to allow using random user ids	2023-02-28 14:11:15 +01:00
devplant	b36248fff4	RED-4988 Check jacoco version in poms and update to a current compatible version - uodate junit tests from 4 to 5	2023-02-28 11:54:35 +02:00
devplant	292fc63873	RED-4988 Check jacoco version in poms and update to a current compatible version - update platform-dependency, platform-commons-dependency	2023-02-27 17:12:59 +02:00