Pull request #335: immutable field fix
Merge in RED/redaction-service from RED-3242 to master * commit '3c691a1afc9ce67845aad5d15bbc99a0113f6a6b': immutable field fix
This commit is contained in:
commit
ca1da20ba3
@ -316,6 +316,11 @@ public class RedactionLogMergeService {
|
|||||||
|
|
||||||
var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();
|
var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();
|
||||||
|
|
||||||
|
var change = ManualChange.from(manualRedactionEntry)
|
||||||
|
.withManualRedactionType(addToDictionary ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY);
|
||||||
|
List<ManualChange> changeList = new ArrayList<>();
|
||||||
|
changeList.add(change);
|
||||||
|
|
||||||
return RedactionLogEntry.builder()
|
return RedactionLogEntry.builder()
|
||||||
.id(id)
|
.id(id)
|
||||||
.color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
|
.color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
|
||||||
@ -330,8 +335,7 @@ public class RedactionLogMergeService {
|
|||||||
.isHint(false)
|
.isHint(false)
|
||||||
.sectionNumber(-1)
|
.sectionNumber(-1)
|
||||||
.rectangle(manualRedactionEntry.isRectangle())
|
.rectangle(manualRedactionEntry.isRectangle())
|
||||||
.manualChanges(List.of(ManualChange.from(manualRedactionEntry)
|
.manualChanges(changeList)
|
||||||
.withManualRedactionType(addToDictionary ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY)))
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user