104 Commits

Author SHA1 Message Date
Thierry Göckel
00a960ee23 Fix merging of tables with single header row table bugfix/merge-single-row-tables_2 2020-08-24 11:43:19 +02:00
Dominique Eiflaender
8c08bb3664 Pull request #25: RED-101 & RED-102: Make table structure detection more robust
Merge in RED/redaction-service from bugfix/RED-101 to master

* commit '76369f13f8d41154f3dd3690af81b9567ca1133e':
  Remove redundant comment
  RED-101: Add features as requested in PR
  Add unit test for table structure requirements
  Make table structure detection more robust
master_58
2020-08-24 11:09:17 +02:00
Cheng Zhu
14b4f4ab8a Pull request #26: Feature/RED-116: replace gin4-commons with red-commons
Merge in RED/redaction-service from feature/RED-116 to master

* commit '4206e708a20a862083f03d27a992e8661c44abc2':
  RED-116: replace gin4-commons with red-commons
  RED-116: replace gin4-commons with red-commons
1.0.23 master_55
2020-08-20 17:22:36 +02:00
cheng
4206e708a2 RED-116: replace gin4-commons with red-commons feature/RED-116_4 2020-08-20 16:52:56 +02:00
cheng
c4164b57fb RED-116: replace gin4-commons with red-commons feature/RED-116_2 2020-08-20 16:51:02 +02:00
Thierry Göckel
76369f13f8 Remove redundant comment bugfix/RED-101_4 2020-08-18 20:53:41 +02:00
Thierry Göckel
1fff4f7eb0 RED-101: Add features as requested in PR
- Add rule for non-vertebrate studies
- Don't highlight ambiguous cell values
- Rewrite rules in more human-readable fashion
bugfix/RED-101_3
2020-08-18 20:35:40 +02:00
Thierry Göckel
c7f5b4a280 Add unit test for table structure requirements 2020-08-18 20:35:17 +02:00
deiflaender
89ef8234d2 Added missing NoArgsConstructor to RedactionLogEntry, needed for Json Serialization 1.0.22 master_52 2020-08-14 11:21:11 +02:00
Thierry Göckel
4236fa05cc Make table structure detection more robust 2020-08-13 17:48:37 +02:00
Thierry Goeckel
031f10435d Pull request #24: RED-88: Enabled manual redaction
Merge in RED/redaction-service from RED-88 to master

* commit '5d286f58e918b22f041ae54f982f14b2d4fcefa6':
  PR Improvements
  redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactions.java online editiert mit Bitbucket
  redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactions.java online editiert mit Bitbucket
  RED-88: Enabled manual redaction
1.0.20 master_50
2020-08-13 16:20:53 +02:00
deiflaender
5d286f58e9 PR Improvements RED-88_5 2020-08-13 16:10:22 +02:00
Dominique Eiflaender
5d18a46ec3 redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactions.java online editiert mit Bitbucket 2020-08-13 16:07:11 +02:00
Dominique Eiflaender
9b61971132 redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactions.java online editiert mit Bitbucket RED-88_3 2020-08-13 16:07:05 +02:00
deiflaender
2b93ae57d5 RED-88: Enabled manual redaction RED-88_2 2020-08-13 15:34:09 +02:00
Thierry Goeckel
954765759c Pull request #23: Log warning message if tabular data mismatches
Merge in RED/redaction-service from RED-101-quickfix to master

* commit '17aabcd09c1f76bdd467f66aac0cf243c0625734':
  Fix index out of bounds exception
  Remove redundant warn message
  Fix NPE for empty cells
  Add test redacting all files and expecting no exception
  Log warning message if tabular data mismatches
1.0.19 master_48
2020-08-13 11:33:17 +02:00
Thierry Göckel
17aabcd09c Fix index out of bounds exception RED-101-quickfix_6 2020-08-13 11:13:01 +02:00
Thierry Göckel
32aa500983 Remove redundant warn message 2020-08-13 11:04:56 +02:00
Thierry Göckel
a151a13b4c Fix NPE for empty cells 2020-08-13 11:02:09 +02:00
Thierry Göckel
5542a97a38 Add test redacting all files and expecting no exception 2020-08-13 10:14:49 +02:00
Thierry Göckel
8edaa93bda Log warning message if tabular data mismatches RED-101-quickfix_2 2020-08-13 10:07:53 +02:00
Dominique Eiflaender
98e0bf5606 Pull request #22: RED-242: Return sectionNumber for tests
Merge in RED/redaction-service from RED-242 to master

* commit '8344b7ccafcf98e7376c53a0a79708c51daa6d0a':
  RED-242: Return sectionNumber for tests
1.0.18 master_46
2020-08-12 15:51:50 +02:00
deiflaender
8344b7ccaf RED-242: Return sectionNumber for tests RED-242_2 2020-08-12 15:46:33 +02:00
Dominique Eiflaender
96ba93f774 Pull request #20: RED-101
Merge in RED/redaction-service from RED-101 to master

* commit 'c93ca745fc61fc2d7f1a1f474a4e3c464091e70d':
  Normalize header information
  Fix test and suppress checkstyle warnings
  Fix PMD errors
  RED-101: Detect vertebrate study row value
  RED-101: Implement table cell and row redaction
  Fix style
master_45
2020-08-11 13:00:39 +02:00
Thierry Göckel
c93ca745fc Normalize header information RED-101_5 2020-08-11 10:24:33 +02:00
Thierry Göckel
a6415363cd Fix test and suppress checkstyle warnings RED-101_4 2020-08-10 19:04:49 +02:00
Thierry Göckel
d97a7b629a Fix PMD errors 2020-08-10 19:04:49 +02:00
Thierry Göckel
00c96c6f57 RED-101: Detect vertebrate study row value 2020-08-10 19:04:49 +02:00
Thierry Göckel
06630b09d2 RED-101: Implement table cell and row redaction 2020-08-10 19:04:49 +02:00
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