Merge branch 'connectionHotfix' into 'master'
hotfix: Fixed 'idle in transaction' connections when loading entityLog See merge request redactmanager/persistence-service!287
This commit is contained in:
commit
e4f1a04220
@ -74,7 +74,7 @@ public class ManualRedactionEntryEntity implements IBaseAnnotation {
|
|||||||
@Column
|
@Column
|
||||||
private OffsetDateTime softDeletedTime;
|
private OffsetDateTime softDeletedTime;
|
||||||
|
|
||||||
@ElementCollection
|
@ElementCollection(fetch = FetchType.EAGER)
|
||||||
@Fetch(FetchMode.SUBSELECT)
|
@Fetch(FetchMode.SUBSELECT)
|
||||||
private List<RectangleEntity> positions = new ArrayList<>();
|
private List<RectangleEntity> positions = new ArrayList<>();
|
||||||
|
|
||||||
|
|||||||
@ -57,7 +57,7 @@ public class ManualResizeRedactionEntity implements IBaseAnnotation {
|
|||||||
@ManyToOne(fetch = FetchType.LAZY)
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
private FileEntity fileStatus;
|
private FileEntity fileStatus;
|
||||||
|
|
||||||
@ElementCollection
|
@ElementCollection(fetch = FetchType.EAGER)
|
||||||
@Fetch(FetchMode.SUBSELECT)
|
@Fetch(FetchMode.SUBSELECT)
|
||||||
private List<RectangleEntity> positions = new ArrayList<>();
|
private List<RectangleEntity> positions = new ArrayList<>();
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
|
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Transactional
|
|
||||||
public class EntityLogService {
|
public class EntityLogService {
|
||||||
|
|
||||||
FileManagementStorageService fileManagementStorageService;
|
FileManagementStorageService fileManagementStorageService;
|
||||||
|
|||||||
@ -55,7 +55,6 @@ public class ManualRedactionProviderService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public ManualRedactions getManualRedactions(String fileId, boolean unprocessed) {
|
public ManualRedactions getManualRedactions(String fileId, boolean unprocessed) {
|
||||||
|
|
||||||
Set<ManualRedactionEntry> entriesToAdd;
|
Set<ManualRedactionEntry> entriesToAdd;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user