diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java index 1e4c8271..9170b916 100644 --- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java +++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java @@ -22,7 +22,6 @@ import com.sap.cds.feature.attachments.handler.applicationservice.processor.readhelper.stream.LazyProxyInputStream; import com.sap.cds.feature.attachments.handler.applicationservice.processor.readhelper.validator.AttachmentStatusValidator; import com.sap.cds.feature.attachments.handler.common.ApplicationHandlerHelper; -import com.sap.cds.feature.attachments.handler.draftservice.constants.DraftConstants; import com.sap.cds.feature.attachments.service.AttachmentService; import com.sap.cds.feature.attachments.service.malware.AsyncMalwareScanExecutor; import com.sap.cds.ql.CQL; @@ -33,6 +32,7 @@ import com.sap.cds.reflect.CdsModel; import com.sap.cds.services.cds.ApplicationService; import com.sap.cds.services.cds.CdsReadEventContext; +import com.sap.cds.services.draft.Drafts; import com.sap.cds.services.handler.EventHandler; import com.sap.cds.services.handler.annotations.After; import com.sap.cds.services.handler.annotations.Before; @@ -121,7 +121,7 @@ private List getAttachmentAssociations(CdsModel model, CdsEntity entity, for (var associatedElement : annotatedEntitiesMap.entrySet()) { if (!associationNames.contains(associatedElement.getKey()) && !processedEntities.contains( - associatedElement.getKey()) && !DraftConstants.SIBLING_ENTITY.equals(associatedElement.getKey())) { + associatedElement.getKey()) && !Drafts.SIBLING_ENTITY.equals(associatedElement.getKey())) { processedEntities.add(associatedElement.getKey()); var result = getAttachmentAssociations(model, associatedElement.getValue(), associatedElement.getKey(), processedEntities); diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java index 206cd565..007e31fe 100644 --- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java +++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java @@ -88,11 +88,11 @@ private boolean isWhereEmpty(DraftCancelEventContext context) { } private CdsStructuredType getActiveEntity(DraftCancelEventContext context) { - return isDraftEntity(context) ? context.getTarget().getTargetOf(DraftConstants.SIBLING_ENTITY) : context.getTarget(); + return isDraftEntity(context) ? context.getTarget().getTargetOf(Drafts.SIBLING_ENTITY) : context.getTarget(); } private CdsStructuredType getDraftEntity(DraftCancelEventContext context) { - return isDraftEntity(context) ? context.getTarget() : context.getTarget().getTargetOf(DraftConstants.SIBLING_ENTITY); + return isDraftEntity(context) ? context.getTarget() : context.getTarget().getTargetOf(Drafts.SIBLING_ENTITY); } private boolean isDraftEntity(DraftCancelEventContext context) { diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java index 454b7b3c..81417306 100644 --- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java +++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java @@ -18,6 +18,7 @@ import com.sap.cds.ql.Select; import com.sap.cds.services.draft.DraftPatchEventContext; import com.sap.cds.services.draft.DraftService; +import com.sap.cds.services.draft.Drafts; import com.sap.cds.services.handler.EventHandler; import com.sap.cds.services.handler.annotations.Before; import com.sap.cds.services.handler.annotations.HandlerOrder; @@ -50,7 +51,7 @@ public void processBeforeDraftPatch(DraftPatchEventContext context, List { var draftElement = path.target().entity().getQualifiedName().endsWith(DraftConstants.DRAFT_TABLE_POSTFIX) ? path.target().entity() - : path.target().entity().getTargetOf(DraftConstants.SIBLING_ENTITY); + : path.target().entity().getTargetOf(Drafts.SIBLING_ENTITY); var select = Select.from(draftElement.getQualifiedName()).matching(path.target().keys()); var result = persistence.run(select); diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/constants/DraftConstants.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/constants/DraftConstants.java index 53d1b5f2..dbfcf7e3 100644 --- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/constants/DraftConstants.java +++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/constants/DraftConstants.java @@ -6,7 +6,6 @@ public final class DraftConstants { - public static final String SIBLING_ENTITY = "SiblingEntity"; public static final String DRAFT_TABLE_POSTFIX = "_drafts"; private DraftConstants() { diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java index d34dd790..76adc301 100644 --- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java +++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java @@ -17,7 +17,6 @@ import com.sap.cds.Result; import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments; import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.StatusCode; -import com.sap.cds.feature.attachments.handler.draftservice.constants.DraftConstants; import com.sap.cds.feature.attachments.service.AttachmentService; import com.sap.cds.feature.attachments.service.malware.client.MalwareScanClient; import com.sap.cds.feature.attachments.service.malware.client.model.MalwareScanResultStatus; @@ -25,6 +24,7 @@ import com.sap.cds.ql.Update; import com.sap.cds.reflect.CdsElementNotFoundException; import com.sap.cds.reflect.CdsEntity; +import com.sap.cds.services.draft.Drafts; import com.sap.cds.services.persistence.PersistenceService; /** @@ -81,7 +81,7 @@ public void scanAttachment(CdsEntity attachmentEntity, String contentId) { private List selectData(CdsEntity attachmentEntity, String contentId) { var result = new ArrayList(); try { - var entity = (CdsEntity) attachmentEntity.getTargetOf(DraftConstants.SIBLING_ENTITY); + var entity = (CdsEntity) attachmentEntity.getTargetOf(Drafts.SIBLING_ENTITY); var selectionResult = readData(contentId, entity); result.add(new SelectionResult(entity, selectionResult)); } catch (CdsElementNotFoundException ignored) { diff --git a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandlerTest.java b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandlerTest.java index 27a64f6b..e6cd099b 100644 --- a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandlerTest.java +++ b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandlerTest.java @@ -29,6 +29,7 @@ import com.sap.cds.ql.cqn.CqnDelete; import com.sap.cds.reflect.CdsEntity; import com.sap.cds.services.draft.DraftCancelEventContext; +import com.sap.cds.services.draft.Drafts; import com.sap.cds.services.runtime.CdsRuntime; class DraftCancelAttachmentsHandlerTest { @@ -97,7 +98,7 @@ void attachmentReaderCorrectCalled() { assertThat(originDelete.toJson()).isEqualTo(delete.toJson()); deleteArgumentCaptor = ArgumentCaptor.forClass(CqnDelete.class); - CdsEntity siblingTarget = target.getTargetOf(DraftConstants.SIBLING_ENTITY); + CdsEntity siblingTarget = target.getTargetOf(Drafts.SIBLING_ENTITY); verify(attachmentsReader).readAttachments(eq(runtime.getCdsModel()), eq(siblingTarget), deleteArgumentCaptor.capture()); CqnDelete siblingDelete = deleteArgumentCaptor.getValue(); @@ -116,7 +117,7 @@ void modifierCalledWithCorrectEntitiesIfDraftIsInContext() { CdsEntity target = eventContext.getTarget(); verify(attachmentsReader).readAttachments(eq(runtime.getCdsModel()), eq(target), deleteArgumentCaptor.capture()); - CdsEntity siblingTarget = target.getTargetOf(DraftConstants.SIBLING_ENTITY); + CdsEntity siblingTarget = target.getTargetOf(Drafts.SIBLING_ENTITY); verify(attachmentsReader).readAttachments(eq(runtime.getCdsModel()), eq(siblingTarget), deleteArgumentCaptor.capture()); CqnDelete siblingDelete = deleteArgumentCaptor.getValue(); @@ -129,7 +130,7 @@ void createdEntityNeedsToBeDeleted() { CqnDelete delete = Delete.from(RootTable_.class); when(eventContext.getCqn()).thenReturn(delete); when(eventContext.getModel()).thenReturn(runtime.getCdsModel()); - CdsEntity siblingTarget = eventContext.getTarget().getTargetOf(DraftConstants.SIBLING_ENTITY); + CdsEntity siblingTarget = eventContext.getTarget().getTargetOf(Drafts.SIBLING_ENTITY); Attachment attachment = buildAttachmentAndReturnByReader("test", siblingTarget, false, ""); cut.processBeforeDraftCancel(eventContext); @@ -145,7 +146,7 @@ void updatedEntityNeedsToBeDeleted() { var delete = Delete.from(RootTable_.class); when(eventContext.getCqn()).thenReturn(delete); when(eventContext.getModel()).thenReturn(runtime.getCdsModel()); - CdsEntity siblingTarget = eventContext.getTarget().getTargetOf(DraftConstants.SIBLING_ENTITY); + CdsEntity siblingTarget = eventContext.getTarget().getTargetOf(Drafts.SIBLING_ENTITY); var id = UUID.randomUUID().toString(); Attachment draftAttachment = buildAttachmentAndReturnByReader("test", siblingTarget, true, id); buildAttachmentAndReturnByReader("test origin", eventContext.getTarget(), false, id); @@ -163,7 +164,7 @@ void entityNotUpdatedNothingToDelete() { var delete = Delete.from(RootTable_.class); when(eventContext.getCqn()).thenReturn(delete); when(eventContext.getModel()).thenReturn(runtime.getCdsModel()); - CdsEntity siblingTarget = eventContext.getTarget().getTargetOf(DraftConstants.SIBLING_ENTITY); + CdsEntity siblingTarget = eventContext.getTarget().getTargetOf(Drafts.SIBLING_ENTITY); var id = UUID.randomUUID().toString(); var contentId = UUID.randomUUID().toString(); buildAttachmentAndReturnByReader(contentId, siblingTarget, true, id);