Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity
2,465 Commits 136 Branches 2,987 Tags
Commit Graph

2465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Corina Olariu
85d12f9355 RED-7256 - Overlapping annotation color from imported redaction and resized redaction 
- fix merge from master
 2023-12-20 11:14:30 +02:00
Corina Olariu
2948ae1c10 Merge branch 'master' into RED-7256-npe 
# Conflicts:
#	persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
 2023-12-20 11:07:11 +02:00
Dominique Eifländer
f2352413e1 Merge branch 'RED-8034' into 'master' 
RED-8034: Always load entityLog from persistence-service because excluded...

Closes RED-8034

See merge request redactmanager/persistence-service!275
2.282.0 		2023-12-19 16:48:07 +01:00
Dominique Eifländer
f568cf2eec RED-8034: Always load entityLog from persistence-service because excluded pages are calculated there 2023-12-19 16:34:09 +01:00
Dominique Eifländer
822a55a8f8 Merge branch 'RED-7784-changes' into 'master' 
RED-7784 - Don't update changes dateTime on every merge.

Closes RED-7784

See merge request redactmanager/persistence-service!274
2.281.0 		2023-12-19 16:22:32 +01:00
Andrei Isvoran
b5794f7fdf RED-7784 - Don't update changes dateTime on every merge. 2023-12-19 17:14:49 +02:00
Andrei Isvoran
4c9ffd5f64 Merge branch 'RED-8043' into 'master' 
RED-8043 - Refactor entity log merge & don't send surrounding analysis request for dictionary adds

Closes RED-8043

See merge request redactmanager/persistence-service!271
2.280.0 		2023-12-19 16:06:39 +01:00
Andrei Isvoran
f71976e595 RED-8043 - Refactor entity log merge & don't send surrounding analysis request for dictionary adds 2023-12-19 16:06:39 +01:00
Dominique Eifländer
d62746484e Merge branch 'RED-8034' into 'master' 
RED-8034: Exclude entries from entitylog for exluded pages without analyse

Closes RED-8034

See merge request redactmanager/persistence-service!273
2.279.0 		2023-12-19 13:52:11 +01:00
Dominique Eifländer
995ff6b725 RED-8034: Exclude entries from entitylog for exluded pages without analyse 2023-12-19 13:40:32 +01:00
Corina Olariu
6e7dadd0cf RED-7256 - Overlapping annotation color from imported redaction and resized redaction 
- fix immutable map
 2023-12-19 14:17:15 +02:00
Corina Olariu
705dd42333 RED-7256 - Overlapping annotation color from imported redaction and resized redaction 
- fix the NPE aldo for legalBasis changes
 2023-12-19 13:50:38 +02:00
Corina Olariu
85737653f7 RED-7256 - Overlapping annotation color from imported redaction and resized redaction 
- use Strings from guave for empty or null and set empty value in case of null value
 2023-12-19 12:50:21 +02:00
Dominique Eifländer
7257bdb159 Merge branch 'RED-5246' into 'master' 
RED-5246: updated ACLBeanConfiguration to use CustomAclPermissionEvaluator and...

Closes RED-5246

See merge request redactmanager/persistence-service!272
2.278.0 		2023-12-19 11:29:24 +01:00
Ali Oezyetimoglu
7172ae55d6 RED-5246: updated ACLBeanConfiguration to use CustomAclPermissionEvaluator and also changed to custom NotFoundException 2023-12-19 11:22:11 +01:00
Corina Olariu
36755e5958 RED-7256 - Overlapping annotation color from imported redaction and resized redaction 
- fix NPE which is caused by the null value in case of resize imported redaction
 2023-12-15 11:17:29 +02:00
Andrei Isvoran
b0f40a080c Merge branch 'RED-8043' into 'master' 
RED-8043 - Refactor EntityLog merge mechanism

Closes RED-8043

See merge request redactmanager/persistence-service!269
2.277.0 		2023-12-14 15:06:32 +01:00
Andrei Isvoran
8c854900cc RED-8043 - Refactor EntityLog merge mechanism 2023-12-14 15:06:32 +01:00
Yannik Hampe
464d5e2ef3 Merge branch 'RED-8078' into 'master' 
RED-8078: Removing an entity type should trigger complete reanalysis

Closes RED-8078

See merge request redactmanager/persistence-service!267
 2023-12-14 14:07:35 +01:00
Dominique Eifländer
31893ba442 Merge branch 'cycleHotfix' into 'master' 
Cycle hotfix

See merge request redactmanager/persistence-service!268
2.276.0 		2023-12-14 14:04:39 +01:00
Dominique Eifländer
56038f13b9 hotfix: Fixed old versions in project, because of cycling dependencies 2023-12-14 13:50:50 +01:00
yhampe
95afc6cd14 Merge remote-tracking branch 'origin/RED-8078' into RED-8078 2023-12-14 13:48:10 +01:00
yhampe
c6d330f1df RED-8078: Removing an entity type should trigger complete reanalysis 
added parameter to include deleted dictionary types
 2023-12-14 13:48:00 +01:00
yhampe
9c0db2a5fe RED-8078: Removing an entity type should trigger complete reanalysis 
added parameter to include deleted dictionary types
 2023-12-14 11:49:40 +01:00
Dominique Eifländer
36e76b0273 RED-5223: Added tracing for scheduled analysis, and add fileId on upload to trace 2023-12-14 11:28:14 +01:00
Dominique Eifländer
6a61033441 Merge branch 'RED-6661-fixes' into 'master' 
migration for uncompressed azure blobs

Closes RED-6661

See merge request redactmanager/persistence-service!264
 2023-12-14 09:28:26 +01:00
Timo Bejan
a62f642c28 migration for uncompressed azure blobs 2023-12-13 16:21:38 +02:00
Dominique Eifländer
cf44dbff03 Merge branch 'RED-5223' into 'master' 
RED-5223: Use tracing-commons from fforesight

Closes RED-5223

See merge request redactmanager/persistence-service!265
2.275.0 		2023-12-13 14:59:49 +01:00
Dominique Eifländer
56db92bf39 RED-5223: Use tracing-commons from fforesight 2023-12-13 14:50:37 +01:00
Dominique Eifländer
8f629914bd Merge branch 'RED-5223' into 'master' 
RED-5223: Fixed not working tracing when comes from queue, upgraded ocr service

Closes RED-5223

See merge request redactmanager/persistence-service!263
2.274.0 		2023-12-12 15:13:19 +01:00
Dominique Eifländer
9e3191dabd RED-5223: Fixed not working tracing when comes from queue, upgraded ocr service 2023-12-12 15:05:18 +01:00
Dominique Eifländer
7d3a7452a9 Merge branch 'RED-7834' into 'master' 
RED-7834: fix migration issues

Closes RED-7834

See merge request redactmanager/persistence-service!262
2.273.0 		2023-12-12 13:58:06 +01:00
Kilian Schüttler
cdf37fd486 RED-7834: fix migration issues 2023-12-12 13:58:05 +01:00
Timo Bejan
3b8b397fe5 Merge branch 'RED-7834' into 'master' 
RED-7834: fix migration issues

Closes RED-7834

See merge request redactmanager/persistence-service!261
 2023-12-11 15:46:32 +01:00
Kilian Schüttler
87f841d9dd RED-7834: fix migration issues 2023-12-11 15:46:32 +01:00
Andrei Isvoran
4653cba097 Merge branch 'RED-8057' into 'master' 
RED-8057 - Fix issue with adding dict based manual redactions with no position specified

Closes RED-8057

See merge request redactmanager/persistence-service!259
2.272.0 		2023-12-08 16:21:02 +01:00
Andrei Isvoran
9b8e6a0e84 RED-8057 - Fix issue with adding dict based manual redactions with no position specified 2023-12-08 16:21:02 +01:00
Dominique Eifländer
ea81708227 Merge branch 'RED-1137' into 'master' 
RED-1137: Enabled tracing, enabled traceId/spanId in Json logging, send custom...

Closes RED-1137

See merge request redactmanager/persistence-service!256
2.271.0 		2023-12-08 13:46:41 +01:00
Dominique Eifländer
c1540943a4 RED-1137: Enabled tracing, enabled traceId/spanId in Json logging, send custom attributes for namespace and version 2023-12-08 13:40:11 +01:00
Andrei Isvoran
6f5f148731 Merge branch 'RED-7404-deploy' into 'master' 
RED-7404 - Add missing deploy stage

Closes RED-7404

See merge request redactmanager/persistence-service!257
2.270.0 		2023-12-08 12:22:12 +01:00
Andrei Isvoran
0a4096401c RED-7404 - Add missing deploy stage 2023-12-08 13:19:30 +02:00
Andrei Isvoran
430f118206 Merge branch 'RED-7404' into 'master' 
RED-7404 - Add publishing for all modules

Closes RED-7404

See merge request redactmanager/persistence-service!254
2.269.0 		2023-12-08 11:27:47 +01:00
Andrei Isvoran
77d1e6ed4c RED-7404 - Add publishing for all modules 2023-12-08 11:27:46 +01:00
Timo Bejan
f8157e4448 Merge branch 'RED-6661' into 'master' 
Por change for local dev

Closes RED-6661

See merge request redactmanager/persistence-service!255
2.268.0 		2023-12-07 00:24:42 +01:00
Timo Bejan
05db55adca Por change for local dev 2023-12-07 01:13:45 +02:00
Andrei Isvoran
7508e7667e Merge branch 'RED-8043' into 'master' 
RED-8043 - Add new MessageType and queue

Closes RED-8043

See merge request redactmanager/persistence-service!253
2.267.0 		2023-12-06 14:49:58 +01:00
Andrei Isvoran
5c215f3a47 RED-8043 - Add new MessageType and queue 2023-12-06 14:49:57 +01:00
Andrei Isvoran
ba21282b1c Merge branch 'RED-7715' into 'master' 
RED-7715 - Modify log4j config to enable switching between console and json based on env var

Closes RED-7715

See merge request redactmanager/persistence-service!251
2.266.0 		2023-12-06 09:30:37 +01:00
Andrei Isvoran
170cc61000 RED-7715 - Modify log4j config to enable switching between console and json based on env var 2023-12-06 09:30:37 +01:00
Andrei Isvoran
f77ec53282 Merge branch 'RED-7404-fix-jsonprimitive' into 'master' 
RED-7404 - Add lombok.config

Closes RED-7404

See merge request redactmanager/persistence-service!243
2.265.0 		2023-12-04 17:50:39 +01:00