diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileDeletionService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileDeletionService.java
index 69e71184d..fd18a5f66 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileDeletionService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileDeletionService.java
@@ -20,7 +20,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
import com.iqser.red.service.persistence.service.v1.api.shared.mongo.service.ComponentLogMongoService;
import com.iqser.red.service.search.v1.model.IndexMessageType;
-import groovy.transform.Field;
import jakarta.transaction.Transactional;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -44,7 +43,6 @@ public class FileDeletionService {
FileStatusPersistenceService fileStatusPersistenceService;
FileManagementStorageService fileManagementStorageService;
IndexingService indexingService;
- ComponentLogService componentLogService;
ComponentLogMongoService componentLogMongoService;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml
deleted file mode 100644
index f222c6905..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/1-initial-database.changelog-with-validation.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/1-initial-database.changelog-with-validation.xml
deleted file mode 100644
index c988f71a2..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/1-initial-database.changelog-with-validation.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-
-
-
-
-
-
- {
- validator: {
- $jsonSchema: {
- bsonType: "object",
- required: ["entryId", "entityLogId", "type", "entryType", "state", "value", "reason", "matchedRule", "legalBasis", "containingNodeId", "closestHeadline", "section",
- "positions", "textBefore", "textAfter", "startOffset", "endOffset", "imageHasTransparency", "dictionaryEntry", "dossierDictionaryEntry", "excluded", "changes",
- "manualChanges", "engines", "reference", "importedRedactionIntersections", "numberOfComments"],
- properties: {
- entryId: {
- bsonType: "string",
- description: "The Entry ID"
- },
- entityLogId: {
- bsonType: "string",
- description: "The Entity Log ID"
- },
- type: {
- bsonType: "string",
- description: "The Type"
- },
- entryType: {
- bsonType: "string",
- description: "The Entry Type"
- },
- state: {
- bsonType: "string",
- description: "The Entry State"
- },
- value: {
- bsonType: "string",
- description: "The Value"
- },
- reason: {
- bsonType: "string",
- description: "The Reason"
- },
- matchedRule: {
- bsonType: "string",
- description: "The Matched Rule"
- },
- legalBasis: {
- bsonType: "string",
- description: "The Legal Basis"
- },
- containingNodeId: {
- bsonType: "array",
- items: {
- bsonType: "int",
- description: "The Containing Node ID"
- }
- },
- closestHeadline: {
- bsonType: "string",
- description: "The Closest Headline"
- },
- section: {
- bsonType: "string",
- description: "The Section"
- },
- positions: {
- bsonType: "array",
- description: "The Positions",
- items: {
- bsonType: "object"
- }
- },
- textBefore: {
- bsonType: "string",
- description: "Text before the entry"
- },
- textAfter: {
- bsonType: "string",
- description: "Text after the entry"
- },
- startOffset: {
- bsonType: "int",
- description: "Start offset of the entry"
- },
- endOffset: {
- bsonType: "int",
- description: "End offset of the entry"
- },
- imageHasTransparency: {
- bsonType: "bool",
- description: "Whether the image has transparency"
- },
- dictionaryEntry: {
- bsonType: "bool",
- description: "Whether it's a dictionary entry"
- },
- dossierDictionaryEntry: {
- bsonType: "bool",
- description: "Whether it's a dossier dictionary entry"
- },
- excluded: {
- bsonType: "bool",
- description: "Whether it's excluded"
- },
- changes: {
- bsonType: "array",
- description: "The Changes",
- items: {
- bsonType: "object"
- }
- },
- manualChanges: {
- bsonType: "array",
- description: "The Manual Changes",
- items: {
- bsonType: "object"
- }
- },
- engines: {
- bsonType: "array",
- description: "The Engines",
- items: {
- bsonType: "string"
- }
- },
- reference: {
- bsonType: "array",
- description: "The Reference",
- items: {
- bsonType: "string"
- }
- },
- importedRedactionIntersections: {
- bsonType: "array",
- description: "The Imported Redaction Intersections",
- items: {
- bsonType: "string"
- }
- },
- numberOfComments: {
- bsonType: "int",
- description: "The Number of Comments"
- }
- }
- }
- },
- validationAction: "warn",
- validationLevel: "strict"
- }
-
-
-
-
-
- {
- validator: {
- $jsonSchema: {
- bsonType: "object",
- required: ["dossierId", "fileId", "analysisVersion", "analysisNumber", "entityLogEntryDocument", "legalBasis"],
- properties: {
- dossierId: {
- bsonType: "string",
- description: "The Dossier ID"
- },
- fileId: {
- bsonType: "string",
- description: "The File ID"
- },
- analysisVersion: {
- bsonType: "long",
- description: "The Analysis Version"
- },
- analysisNumber: {
- bsonType: "int",
- description: "The Analysis Number"
- },
- entityLogEntryDocument: {
- bsonType: "array",
- description: "The Entity Log Entry Documents",
- items: {
- bsonType: "objectId"
- }
- },
- legalBasis: {
- bsonType: "array",
- description: "The Legal Basis",
- items: {
- bsonType: "object"
- }
- },
- dictionaryVersion: {
- bsonType: "long",
- description: "The Dictionary Version"
- },
- dossierDictionaryVersion: {
- bsonType: "long",
- description: "The Dossier Dictionary Version"
- },
- rulesVersion: {
- bsonType: "long",
- description: "The Rules Version"
- },
- legalBasisVersion: {
- bsonType: "long",
- description: "The Legal Basis Version"
- }
- }
- }
- },
- validationAction: "warn",
- validationLevel: "strict"
- }
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/1-initial-database.changelog.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/1-initial-database.changelog.xml
deleted file mode 100644
index c8e1cbce6..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/1-initial-database.changelog.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml
deleted file mode 100644
index 6667d00ce..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
- {
- "entityLogId": 1,
- }
-
-
- {name: "entityLogId_index"}
-
-
-
-
-
- {
- "entityLogId": 1,
- "positions.pageNumber": 1
- }
-
-
- {name: "entityLogId_positionsPageNumber_index"}
-
-
-
-
-
- {
- "entityLogId": 1,
- "containingNodeId": 1
- }
-
-
- {name: "entityLogId_containingNodeId_index"}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/3-add-page-paragraph-idx.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/3-add-page-paragraph-idx.xml
deleted file mode 100644
index a4a643a6f..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/3-add-page-paragraph-idx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- {
- update: "entity-log-entries",
- updates: [
- {
- q: {},
- u: { $set: { "paragraphPageIdx": -1 } },
- multi: true
- }
- ]
- }
-
-
-
-
-
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/4-create-component-entities.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/4-create-component-entities.xml
deleted file mode 100644
index e7a90d68a..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/4-create-component-entities.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
- {
- "validator": {
- "$jsonSchema": {
- "bsonType": "object",
- "required": ["id", "dossierId", "fileId", "analysisNumber", "componentRulesVersion", "components"],
- "properties": {
- "id": {
- "bsonType": "string",
- "description": "must be a string and is required"
- },
- "dossierId": {
- "bsonType": "string",
- "description": "must be a string and is required"
- },
- "fileId": {
- "bsonType": "string",
- "description": "must be a string and is required"
- },
- "analysisNumber": {
- "bsonType": "int",
- "description": "must be an integer and is required"
- },
- "componentRulesVersion": {
- "bsonType": "long",
- "description": "must be a long and is required"
- },
- "components": {
- "bsonType": "array",
- "items": {
- "bsonType": "objectId",
- "description": "must be an array of objectIds"
- },
- "description": "must be an array and is required"
- }
- }
- }
- },
- "validationLevel": "strict",
- "validationAction": "error"
- }
-
-
-
-
-
- {
- "validator": {
- "$jsonSchema": {
- "bsonType": "object",
- "required": ["id", "componentLogId", "name", "overrideValues", "values", "overridden"],
- "properties": {
- "id": {
- "bsonType": "string",
- "description": "must be a string and is required"
- },
- "componentLogId": {
- "bsonType": "string",
- "description": "must be a string and is required"
- },
- "name": {
- "bsonType": "string",
- "description": "must be a string and is required"
- },
- "overrideValues": {
- "bsonType": "array",
- "items": {
- "bsonType": "object"
- },
- "description": "must be an array of objects and is required"
- },
- "values": {
- "bsonType": "array",
- "items": {
- "bsonType": "object"
- },
- "description": "must be an array of objects and is required"
- },
- "overridden": {
- "bsonType": "bool",
- "description": "must be a boolean and is required"
- }
- }
- }
- },
- "validationLevel": "strict",
- "validationAction": "warn"
- }
-
-
-
-
-
-
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/5-add-duplicate-text-ranges.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/5-add-duplicate-text-ranges.xml
deleted file mode 100644
index bdf2ca0ba..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/5-add-duplicate-text-ranges.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- {
- update: "entity-log-entries",
- updates: [
- {
- q: {},
- u: { $set: { "duplicatedTextRanges": [] } },
- multi: true
- }
- ]
- }
-
-
-
-
-
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/6-rename-component-collections.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/6-rename-component-collections.xml
deleted file mode 100644
index 28b782b1b..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/6-rename-component-collections.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
- {
- "renameCollection": "${databaseName}.component-logs",
- "to": "${databaseName}.old-component-logs"
- }
-
-
-
-
-
- {
- "renameCollection": "${databaseName}.component-log-entries",
- "to": "${databaseName}.old-component-log-entries"
- }
-
-
-
-
-
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/example-create-indices-for-entries.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/example-create-indices-for-entries.xml
deleted file mode 100644
index d32c50108..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/example-create-indices-for-entries.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
- {
- "entityLogId": 1,
- }
-
-
- {name: "entityLogId_index"}
-
-
-
-
-
- {
- "entityLogId": 1,
- "positions.pageNumber": 1
- }
-
-
- {name: "entityLogId_positionsPageNumber_index"}
-
-
-
-
-
- {
- "entityLogId": 1,
- "changes.analysisNumber": -1
- }
-
-
- {name: "entityLogId_changesAnalysisNumber_index"}
-
-
-
-
-
- {
- "entityLogId": 1,
- "containingNodeId": 1
- }
-
-
- {name: "entityLogId_containingNodeId_index"}
-
-
-
-
-
- {
- "id": 1,
- "containingNodeId": 1
- }
-
-
- {name: "id_containingNodeId_index"}
-
-
-
-
-
- {
- "entityLogId": 1,
- "type": 1
- }
-
-
- {name: "entityLogId_type_index"}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/example-remove-entry-number-of-comments.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/example-remove-entry-number-of-comments.xml
deleted file mode 100644
index 9665c17b0..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/example-remove-entry-number-of-comments.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- {
- update: "entity-log-entries",
- updates: [
- {
- q: {},
- u: { $unset: { "numberOfComments": "" } },
- multi: true
- }
- ]
- }
-
-
-
-
-
-
\ No newline at end of file
diff --git a/persistence-service-v1/persistence-service-shared-mongo-v1/build.gradle.kts b/persistence-service-v1/persistence-service-shared-mongo-v1/build.gradle.kts
index 7feff854d..86fcd5d03 100644
--- a/persistence-service-v1/persistence-service-shared-mongo-v1/build.gradle.kts
+++ b/persistence-service-v1/persistence-service-shared-mongo-v1/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
api("com.google.guava:guava:31.1-jre")
api("com.knecon.fforesight:mongo-database-commons:0.16.0") {
exclude(group = "com.knecon.fforesight", module = "tenant-commons")
+ exclude(group = "org.liquibase.ext", module = "liquibase-mongodb")
}
api("com.knecon.fforesight:tenant-commons:0.31.0-RED10196.0")
api("org.springframework.boot:spring-boot-starter-data-mongodb:${springBootStarterVersion}")