hotfix: fix merge errors
This commit is contained in:
parent
f69921fe59
commit
0f651d6a67
@ -4051,7 +4051,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
.section("section")
|
||||
.value("Luke Skywalker")
|
||||
.build());
|
||||
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests, true);
|
||||
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests);
|
||||
|
||||
var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
|
||||
assertEquals(allManualRedactions.getRecategorizations().size(), 1);
|
||||
@ -4080,7 +4080,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertNotNull(recats.get(0).getSoftDeletedTime());
|
||||
|
||||
// Step 4: Do the same recategorizations again
|
||||
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests, true);
|
||||
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests);
|
||||
|
||||
allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
|
||||
recats = recategorizationPersistenceService.findEntriesByFileIdAndOptions(file.getId(),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user