Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-9139: move document to its own module, add TableOfContents and TableOfContentsItem

Browse Source 
* update LayoutEngine package
This commit is contained in:
Kilian Schuettler 2024-11-13 10:53:45 +01:00
parent 3e2d3169af
commit dc84e12695
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/DeprecatedElementsFinder.java
View File

@ -10,11 +10,13 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.reflections.scanners.Scanners; import org.reflections.scanners.Scanners;
import org.reflections.util.ConfigurationBuilder; import org.reflections.util.ConfigurationBuilder;
import org.reflections.util.FilterBuilder;
import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation; import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
@ -25,6 +27,8 @@ import lombok.extern.slf4j.Slf4j;
public class DeprecatedElementsFinder { public class DeprecatedElementsFinder {
public static final String PACKAGE_NAME = "com.iqser.red.service.redaction.v1.server"; public static final String PACKAGE_NAME = "com.iqser.red.service.redaction.v1.server";
public static final Pattern DATA_PACKAGE = Pattern.compile(".*/data/.*");
private Set<Method> deprecatedMethods; private Set<Method> deprecatedMethods;
@Getter @Getter
private Map<String, String> deprecatedMethodsSignaturesMap; private Map<String, String> deprecatedMethodsSignaturesMap;
@ -43,7 +47,10 @@ public class DeprecatedElementsFinder {
Reflections reflections = new Reflections(new ConfigurationBuilder().forPackage(PACKAGE_NAME) Reflections reflections = new Reflections(new ConfigurationBuilder().forPackage(PACKAGE_NAME)
.setExpandSuperTypes(true) .setExpandSuperTypes(true)
.setScanners(Scanners.MethodsAnnotated, Scanners.TypesAnnotated, Scanners.SubTypes)); .setScanners(Scanners.MethodsAnnotated, Scanners.TypesAnnotated, Scanners.SubTypes)
.filterInputsBy(new FilterBuilder().includePackage(PACKAGE_NAME).excludePackage(PACKAGE_NAME + ".data")
// Exclude the generated proto data package
));
deprecatedMethods = reflections.get(Scanners.MethodsAnnotated.with(Deprecated.class).as(Method.class)); deprecatedMethods = reflections.get(Scanners.MethodsAnnotated.with(Deprecated.class).as(Method.class));

4
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java
View File

@ -237,7 +237,9 @@ public abstract class AbstractRedactionIntegrationTest {
@BeforeAll @BeforeAll
public static void init() { public static void init() {
PDFNet.initialize("demo:1650351709282:7bd235e003000000004ec28a6743e1163a085e2115de2536ab6e2cfe5a"); synchronized (PDFNet.class) {
PDFNet.initialize("demo:1650351709282:7bd235e003000000004ec28a6743e1163a085e2115de2536ab6e2cfe5a");
}
} }

4
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
View File

@ -1986,7 +1986,7 @@ public class RedactionIntegrationTest extends RulesIntegrationTest {
.get(1).getType(), ChangeType.IGNORED); .get(1).getType(), ChangeType.IGNORED);
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(1).getPropertyChanges() .get(1).getPropertyChanges()
.get("reason"), "No vertebrate found -> removed by manual override"); .get("reason"), "No vertebrate found -> ");
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(1).getPropertyChanges() .get(1).getPropertyChanges()
.get("matchedRule"), "CBI.13.2 -> "); .get("matchedRule"), "CBI.13.2 -> ");
@ -2040,7 +2040,7 @@ public class RedactionIntegrationTest extends RulesIntegrationTest {
.get(1).getType(), ChangeType.RECATEGORIZE); .get(1).getType(), ChangeType.RECATEGORIZE);
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(1).getPropertyChanges() .get(1).getPropertyChanges()
.get("reason"), "No vertebrate found -> Recategorized entities are applied by default., recategorized by manual override"); .get("reason"), "No vertebrate found -> Recategorized entities are applied by default.");
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(1).getPropertyChanges() .get(1).getPropertyChanges()
.get("matchedRule"), "CBI.13.2 -> MAN.3.3"); .get("matchedRule"), "CBI.13.2 -> MAN.3.3");

15
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java
View File

@ -62,7 +62,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
entity.getManualOverwrite().addChange(removal); entity.getManualOverwrite().addChange(removal);
assertTrue(entity.ignored()); assertTrue(entity.ignored());
assertFalse(entity.applied()); assertFalse(entity.applied());
assertEquals(reason + ", removed by manual override", entity.buildReason()); assertEquals(reason, entity.buildReason());
// force again // force again
ManualForceRedaction forceRedaction = ManualForceRedaction.builder() ManualForceRedaction forceRedaction = ManualForceRedaction.builder()
@ -76,7 +76,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
assertTrue(entity.applied()); assertTrue(entity.applied());
assertFalse(entity.ignored()); assertFalse(entity.ignored());
assertFalse(entity.removed()); assertFalse(entity.removed());
assertEquals(reason + ", removed by manual override, forced by manual override", entity.buildReason()); assertEquals(reason, entity.buildReason());
assertEquals("coolio", assertEquals("coolio",
entity.getManualOverwrite().getLegalBasis() entity.getManualOverwrite().getLegalBasis()
.orElse(entity.getMatchedRule().getLegalBasis())); .orElse(entity.getMatchedRule().getLegalBasis()));
@ -86,7 +86,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
entity.getManualOverwrite().addChange(removal2); entity.getManualOverwrite().addChange(removal2);
assertTrue(entity.ignored()); assertTrue(entity.ignored());
assertFalse(entity.applied()); assertFalse(entity.applied());
assertEquals(reason + ", removed by manual override, forced by manual override, removed by manual override", entity.buildReason()); assertEquals(reason, entity.buildReason());
// force again, with requestDate before removal2, but after force1 // force again, with requestDate before removal2, but after force1
ManualForceRedaction forceRedaction2 = ManualForceRedaction.builder() ManualForceRedaction forceRedaction2 = ManualForceRedaction.builder()
@ -99,7 +99,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
entity.getManualOverwrite().addChange(forceRedaction2); entity.getManualOverwrite().addChange(forceRedaction2);
assertTrue(entity.ignored()); assertTrue(entity.ignored());
assertFalse(entity.applied()); assertFalse(entity.applied());
assertEquals(reason + ", removed by manual override, forced by manual override, forced by manual override, removed by manual override", entity.buildReason()); assertEquals(reason, entity.buildReason());
String legalBasis = "Yeah"; String legalBasis = "Yeah";
String section = "Some random section!"; String section = "Some random section!";
@ -116,8 +116,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
entity.getManualOverwrite().addChange(legalBasisChange); entity.getManualOverwrite().addChange(legalBasisChange);
assertTrue(entity.ignored()); assertTrue(entity.ignored());
assertFalse(entity.applied()); assertFalse(entity.applied());
assertEquals(reason + ", removed by manual override, forced by manual override, forced by manual override, removed by manual override, legal basis was manually changed", assertEquals(reason, entity.buildReason());
entity.buildReason());
assertEquals(value, assertEquals(value,
entity.getManualOverwrite().getValue() entity.getManualOverwrite().getValue()
.orElse(entity.getValue())); .orElse(entity.getValue()));
@ -172,7 +171,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
entity.getManualOverwrite().addChange(removal); entity.getManualOverwrite().addChange(removal);
assertTrue(entity.ignored()); assertTrue(entity.ignored());
assertFalse(entity.applied()); assertFalse(entity.applied());
assertEquals(reason + ", removed by manual override", entity.buildReason()); assertEquals(reason, entity.buildReason());
// force again // force again
ManualForceRedaction forceRedaction = ManualForceRedaction.builder() ManualForceRedaction forceRedaction = ManualForceRedaction.builder()
@ -186,7 +185,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
assertFalse(entity.applied()); assertFalse(entity.applied());
assertFalse(entity.ignored()); assertFalse(entity.ignored());
assertFalse(entity.removed()); assertFalse(entity.removed());
assertEquals(reason + ", removed by manual override, forced by manual override", entity.buildReason()); assertEquals(reason, entity.buildReason());
assertEquals("coolio", assertEquals("coolio",
entity.getManualOverwrite().getLegalBasis() entity.getManualOverwrite().getLegalBasis()
.orElse(entity.getMatchedRule().getLegalBasis())); .orElse(entity.getMatchedRule().getLegalBasis()));