Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity
575 Commits 109 Branches 2,256 Tags
Commit Graph

575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thierry Göckel
695564d162 Fix style 
Fix style.

Fix style.

Fix style and naming

Fix style, naming and field modifier

Fix style and remove warning suppression
 2020-08-10 19:04:49 +02:00
Cheng Zhu
81048dcc9f Pull request #21: Cleaned up dictionaries 
Merge in RED/redaction-service from cleanDictionaries to master

* commit 'b5412dc9590d15dcae9f87f7fc9b7ea50e4c63ae':
  Cleaned up dictionaries
master_44 		2020-08-10 15:46:37 +02:00
deiflaender
b5412dc959 Cleaned up dictionaries cleanDictionaries_2 2020-08-10 15:16:05 +02:00
Dominique Eiflaender
40e40a01ad Pull request #19: Avoid duplicate redaction if type have same entries, made Applicant and Producer rules more specific 
Merge in RED/redaction-service from ApplicantRule to master

* commit '99bac4550a9cade36de313735916687ea26d7b4d':
  Use @EqualsAndHashCode(onlyExplicitlyIncluded = true) in Entity.java
  Avoid duplicate redaction if type have same entries, made Applicant and Producer rules more specific
1.0.17 master_42 		2020-08-07 12:31:26 +02:00
deiflaender
99bac4550a Use @EqualsAndHashCode(onlyExplicitlyIncluded = true) in Entity.java ApplicantRule_3 2020-08-07 12:28:21 +02:00
deiflaender
7d0b0ed3d0 Avoid duplicate redaction if type have same entries, made Applicant and Producer rules more specific ApplicantRule_2 2020-08-07 12:09:37 +02:00
Cheng Zhu
d465a4ba5b Pull request #18: RED-149: Added must_redact dictionary and Rule, Adjusted rules for applicant and producer to work on all documents. 
Merge in RED/redaction-service from RED-149 to master

* commit 'cce8200d433ec89160af3af32f40be57c0b67678':
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java online editiert mit Bitbucket
  RED-149: Added must_redact dictionary and Rule, Adjusted rules for applicant and producer to work on all documents. Fixed endless loop in rules. Detect multiple occurences in rules
1.0.16 master_40 		2020-08-05 13:21:14 +02:00
Dominique Eiflaender
cce8200d43 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java online editiert mit Bitbucket RED-149_4 2020-08-05 13:15:02 +02:00
deiflaender
1f8d371a82 RED-149: Added must_redact dictionary and Rule, Adjusted rules for applicant and producer to work on all documents. Fixed endless loop in rules. Detect multiple occurences in rules RED-149_3 2020-08-05 13:10:31 +02:00
Thierry Goeckel
70804f111d Pull request #17: Duplicates 
Merge in RED/redaction-service from duplicates to master

* commit '81723ce4022e1e006054eb743f2cc2c0b9faf14f':
  Use void method type
  Use EqualsAndHashcode annotation from Lombok
  Fixed duplicated redaction/RedactionLog entries
  RED-211, RED-215 Added dictionaries and rules for testing.
1.0.15 master_38 		2020-08-04 10:59:38 +02:00
Thierry Göckel
81723ce402 Use void method type duplicates_5 2020-08-04 10:34:54 +02:00
deiflaender
b1a266d4d4 Use EqualsAndHashcode annotation from Lombok duplicates_4 2020-08-04 09:53:58 +02:00
deiflaender
d2d7f8c50c Fixed duplicated redaction/RedactionLog entries duplicates_3 2020-07-31 16:25:10 +02:00
deiflaender
e2895a1c7a RED-211, RED-215 Added dictionaries and rules for testing. 2020-07-31 16:22:47 +02:00
Lena  Maldacker
cd07dc6a44 Pull request #16: Use default color from configuration-service on unknown type 
Merge in RED/redaction-service from defaultColor to master

* commit '872c384dc6da60f421e7aa21f58b574c49414c81':
  Use default color from configuration-service on unknown type
1.0.14 master_36 		2020-07-28 12:41:35 +02:00
deiflaender
872c384dc6 Use default color from configuration-service on unknown type defaultColor_2 2020-07-28 12:38:59 +02:00
Dominique Eiflaender
2aca35e5a0 Pull request #15: Let Tables know its headlines 
Merge in RED/redaction-service from DEV5 to master

* commit '88e1c5c58ea44dfab15f086ef58f23df897777d6':
  Let Tables know its headlines
1.0.13 master_34 		2020-07-27 15:45:43 +02:00
deiflaender
88e1c5c58e Let Tables know its headlines DEV5_2 2020-07-27 15:33:25 +02:00
Dominique Eiflaender
b7ee62f44d Pull request #14: RED-207: Match caseInsensitive dictionaries caseInSensitive 
Merge in RED/redaction-service from RED-207 to master

* commit '135a715e22e6c2536b268db29161552cfd7a6c1c':
  Fixed style in EnityRedactionService
  Fixed wrong naming of caseInsensitive
  RED-207: Match caseInsensitive dictionaries caseInSensitive
1.0.12 master_32 		2020-07-27 13:52:40 +02:00
deiflaender
135a715e22 Fixed style in EnityRedactionService RED-207_4 2020-07-27 13:39:31 +02:00
deiflaender
c953f161b2 Fixed wrong naming of caseInsensitive RED-207_3 2020-07-27 13:38:13 +02:00
deiflaender
f0e48087ff RED-207: Match caseInsensitive dictionaries caseInSensitive RED-207_2 2020-07-27 13:20:00 +02:00
Cheng Zhu
d282680cc8 Pull request #13: Use Hint in IntegrationTest 
Merge in RED/redaction-service from DEV3 to master

* commit 'b57a4a2db3fb8090004dd5f3babd0d7786312730':
  Use Hint in IntegrationTest
master_31 		2020-07-24 11:03:58 +02:00
deiflaender
b57a4a2db3 Use Hint in IntegrationTest DEV3_2 2020-07-24 10:45:04 +02:00
Thierry Goeckel
ca439d821d Pull request #12: Bugfix/RED-183 
Merge in RED/redaction-service from bugfix/RED-183 to master

* commit '7dbe03483b7a8a3c391e9d0791717b9fab5fc5db':
  RED-183: Fix catching validation errors
  Fix style.
1.0.11 master_29 		2020-07-23 14:48:11 +02:00
Thierry Göckel
7dbe03483b RED-183: Fix catching validation errors bugfix/RED-183_2 2020-07-23 13:36:02 +02:00
Thierry Göckel
33ab09d7fc Fix style. 2020-07-23 13:35:58 +02:00
Thierry Goeckel
9a425a8594 Pull request #11: Feature/RED-161: replace hard-coded hint-type with dictionary-service query 
Merge in RED/redaction-service from feature/RED-161 to master

* commit '3eb37fa6db0d9f1a4e6b93b2047b3b96c94cd9ff':
  RED-161: reverse caseSensitive
  RED-161: replace hard-coded hint-type with dictionary-service query
1.0.10 master_27 		2020-07-23 10:59:37 +02:00
cheng
3eb37fa6db RED-161: reverse caseSensitive feature/RED-161_6 2020-07-23 10:51:30 +02:00
cheng
c8375a1ad9 RED-161: replace hard-coded hint-type with dictionary-service query feature/RED-161_2 2020-07-22 22:54:05 +02:00
Dominique Eiflaender
94827a417f Pull request #10: Do not return redacted=true for vertebrates in RedactionLog, return isHint=true and redacted=false 
Merge in RED/redaction-service from RedactionLog1 to master

* commit 'e7ea12a1b03f7f79e0f4fa12671f91ee326eef73':
  CodeStyle
  Do not return redacted=true for vertebrates in RedactionLog, return isHint=true and redacted=false
1.0.9 master_25 		2020-07-22 14:15:56 +02:00
deiflaender
e7ea12a1b0 CodeStyle RedactionLog1_3 2020-07-22 14:14:10 +02:00
deiflaender
6a9df397eb Do not return redacted=true for vertebrates in RedactionLog, return isHint=true and redacted=false RedactionLog1_2 2020-07-22 14:06:45 +02:00
Cheng Zhu
41c61dd214 Pull request #9: DEV: Fixed Nullpointer on undefined color for type, adapted rule to Type naming. 
Merge in RED/redaction-service from Fix1 to master

* commit '49fe418a60f424e373038b1f7b9d43ff4afde37c':
  DEV: Fixed Nullpointer on undefined color for type, adapted rule to Type naming.
1.0.8 master_23 		2020-07-21 16:20:22 +02:00
deiflaender
49fe418a60 DEV: Fixed Nullpointer on undefined color for type, adapted rule to Type naming. Fix1_2 2020-07-21 16:17:52 +02:00
Dominique Eiflaender
c98f1d5e37 Pull request #8: RED-169: Fixed startup problem 
Merge in RED/redaction-service from RED-169 to master

* commit 'c0882346a9d1554c51ccc526d1f6d7c277ffbc7c':
  RED-169: Fixed startup problem
1.0.7 master_21 		2020-07-21 14:53:55 +02:00
deiflaender
c0882346a9 RED-169: Fixed startup problem RED-169_13 2020-07-21 14:49:00 +02:00
Dominique Eiflaender
302daff526 Pull request #6: RED-106: replace the local dictionary preload with remove dictionary service. 
Merge in RED/redaction-service from feature/RED-106i to master

* commit 'd607ac567d1e07cfc4c7dd4fa581d1881a874537':
  RED-106: integrationTest fixed.
  RED-106: integrationTest fixed.
  RED-106: integrationTest fixed.
  REd-106: rebase auf master
  REd-106: rebase auf master
  DEV: bugfix missing bean
  REd-106: enable dictionary version
  RED-106: replace the local dictionary preload with remove dictionary service.
  RED-106: replace the local dictionary preload with remove dictionary service.
1.0.6 master_19 		2020-07-21 13:19:27 +02:00
cheng
d607ac567d RED-106: integrationTest fixed. feature/RED-106i_10 2020-07-21 13:15:58 +02:00
cheng
1b40931c87 RED-106: integrationTest fixed. 2020-07-21 13:14:17 +02:00
cheng
75c6433eef RED-106: integrationTest fixed. 2020-07-21 13:14:10 +02:00
cheng
9c14f331fd REd-106: rebase auf master feature/RED-106i_7 2020-07-20 10:13:35 +02:00
cheng
141e4b9371 REd-106: rebase auf master feature/RED-106i_6 2020-07-20 09:19:54 +02:00
cheng
902d5cddf7 DEV: bugfix missing bean 2020-07-20 09:18:42 +02:00
cheng
b3841b86b1 REd-106: enable dictionary version 2020-07-20 09:18:42 +02:00
cheng
4e3a6af3f8 RED-106: replace the local dictionary preload with remove dictionary service. 2020-07-20 09:18:42 +02:00
cheng
8ed548f1a8 RED-106: replace the local dictionary preload with remove dictionary service. 2020-07-20 09:18:42 +02:00
Thierry Goeckel
fe5c20e1a0 Pull request #7: Fix application startup and remove redundant code. 
Merge in RED/redaction-service from bugfix/application-startup to master

* commit '3e18fe19f31081df98670130512ab3933f7015af':
  Fix application startup and remove redundant code.
1.0.5 master_17 		2020-07-20 09:18:21 +02:00
Thierry Göckel
3e18fe19f3 Fix application startup and remove redundant code. bugfix/application-startup_2 2020-07-20 09:14:25 +02:00
Thierry Goeckel
5e48450669 Pull request #4: RED-125: Section must know its headlines, RED-156: Return RedactionLog 
Merge in RED/redaction-service from RED-125,RED-156 to master

* commit '4b818dba54eea8eb33d5507e024487d5be3ca996':
  DEV: Fixed build problem
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java online editiert mit Bitbucket
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java online editiert mit Bitbucket
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java online editiert mit Bitbucket
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java online editiert mit Bitbucket
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java online editiert mit Bitbucket
  redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java online editiert mit Bitbucket
  RED-125: Section must know its headlines RED-156: Return RedactionLog
1.0.4 master_15 		2020-07-17 15:16:48 +02:00