Rename ActiveEntityModifier to ModifierToCreateFlatCQN

Author: lisajulia

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java

@@ -140,7 +140,8 @@ private List<Attachments> readAttachments(
     logger.debug("Original CQN: {}", context.getCqn());
     CqnDelete modifiedCQN =
         CQL.copy(
-            context.getCqn(), new ActiveEntityModifier(isActiveEntity, entity.getQualifiedName()));
+            context.getCqn(),
+            new ModifierToCreateFlatCQN(isActiveEntity, entity.getQualifiedName()));
     logger.debug("Modified CQN: {}", modifiedCQN);
     return attachmentsReader.readAttachments(context.getModel(), (CdsEntity) entity, modifiedCQN);
   }

…r/draftservice/ActiveEntityModifier.java …raftservice/ModifierToCreateFlatCQN.javacds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/ActiveEntityModifier.java renamed to cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/ModifierToCreateFlatCQN.java cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/ActiveEntityModifier.java renamed to cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/ModifierToCreateFlatCQN.java

@@ -32,14 +32,14 @@
  * <p>This is primarily used in draft service scenarios to transform queries between draft entities
  * (IsActiveEntity = false) and active entities (IsActiveEntity = true).
  */
-class ActiveEntityModifier implements Modifier {
+class ModifierToCreateFlatCQN implements Modifier {
 
-  private static final Logger logger = LoggerFactory.getLogger(ActiveEntityModifier.class);
+  private static final Logger logger = LoggerFactory.getLogger(ModifierToCreateFlatCQN.class);
 
   private final boolean isActiveEntity;
   private final String fullEntityName;
 
-  ActiveEntityModifier(boolean isActiveEntity, String fullEntityName) {
+  ModifierToCreateFlatCQN(boolean isActiveEntity, String fullEntityName) {
     this.isActiveEntity = isActiveEntity;
     this.fullEntityName = fullEntityName;
   }

…aftservice/ActiveEntityModifierTest.java …service/ModifierToCreateFlatCQNTest.javacds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/ActiveEntityModifierTest.java renamed to cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/ModifierToCreateFlatCQNTest.java cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/ActiveEntityModifierTest.java renamed to cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/ModifierToCreateFlatCQNTest.java

@@ -12,15 +12,15 @@
 import com.sap.cds.ql.cqn.CqnSelect;
 import org.junit.jupiter.api.Test;
 
-class ActiveEntityModifierTest {
+class ModifierToCreateFlatCQNTest {
 
   private static final String TEST_DRAFT_SERVICE_BOOKS = "test.DraftService.Books";
 
   @Test
   void activeEntityReplacedToFalse() {
     var select = Select.from(RootTable_.class).where(root -> root.IsActiveEntity().eq(true));
 
-    var result = CQL.copy(select, new ActiveEntityModifier(false, RootTable_.CDS_NAME));
+    var result = CQL.copy(select, new ModifierToCreateFlatCQN(false, RootTable_.CDS_NAME));
 
     assertThat(result.toString())
         .contains("{\"ref\":[\"IsActiveEntity\"]},\"=\",{\"val\":false}]}");
@@ -31,7 +31,7 @@ void activeEntityReplacedToFalse() {
   void activeEntityReplacedToTrue() {
     var select = Select.from(RootTable_.class).where(root -> root.IsActiveEntity().eq(false));
 
-    var result = CQL.copy(select, new ActiveEntityModifier(true, RootTable_.CDS_NAME));
+    var result = CQL.copy(select, new ModifierToCreateFlatCQN(true, RootTable_.CDS_NAME));
 
     assertThat(result.toString()).contains("{\"ref\":[\"IsActiveEntity\"]},\"=\",{\"val\":true}]}");
     assertThat(result.toString()).doesNotContain("false");
@@ -41,7 +41,8 @@ void activeEntityReplacedToTrue() {
   void entityNameReplacedAndActiveEntity() {
     var select = Select.from(RootTable_.class).where(root -> root.IsActiveEntity().eq(true));
 
-    var result = CQL.copy(select, new ActiveEntityModifier(true, RootTable_.CDS_NAME + "_draft"));
+    var result =
+        CQL.copy(select, new ModifierToCreateFlatCQN(true, RootTable_.CDS_NAME + "_draft"));
 
     // Expects the entity to have an IsActiveEntity filter in the reference
     assertThat(result.toString())
@@ -53,7 +54,7 @@ void entityNameReplacedAndActiveEntity() {
   void entityNameNotReplacedAndActiveEntity() {
     var select = Select.from(RootTable_.class).where(root -> root.IsActiveEntity().eq(true));
 
-    var result = CQL.copy(select, new ActiveEntityModifier(true, RootTable_.CDS_NAME));
+    var result = CQL.copy(select, new ModifierToCreateFlatCQN(true, RootTable_.CDS_NAME));
 
     // Expects the entity to have an IsActiveEntity filter in the reference even when entity name
     // doesn't change
@@ -73,7 +74,7 @@ void selectWithFilterReplace() {
                     .filter(e -> e.get(IS_ACTIVE_ENTITY).eq(false))
                     .to("relatedBook"));
 
-    var result = CQL.copy(select, new ActiveEntityModifier(true, TEST_DRAFT_SERVICE_BOOKS));
+    var result = CQL.copy(select, new ModifierToCreateFlatCQN(true, TEST_DRAFT_SERVICE_BOOKS));
 
     assertThat(result.toString()).contains("{\"ref\":[\"IsActiveEntity\"]},\"=\",{\"val\":true}]}");
     assertThat(result.toString()).doesNotContain("false");
@@ -95,7 +96,7 @@ void onlyRefActiveEntityIsReplaced() {
                                         .eq(root.IsActiveEntity())
                                         .and(CQL.constant(true).eq(root.HasActiveEntity())))));
 
-    var result = CQL.copy(select, new ActiveEntityModifier(false, RootTable_.CDS_NAME));
+    var result = CQL.copy(select, new ModifierToCreateFlatCQN(false, RootTable_.CDS_NAME));
 
     assertThat(result.toString()).contains("{\"ref\":[\"IsActiveEntity\"]},\"=\",{\"val\":false}");
     assertThat(result.toString()).contains("{\"ref\":[\"HasActiveEntity\"]},\"=\",{\"val\":true}");
@@ -112,7 +113,7 @@ void combinesNonIsActiveEntityFilterWithIsActiveEntityFilter() {
                 .filter(CQL.get("title").eq("Some Title")) // Filter on entity reference
             );
 
-    ActiveEntityModifier modifier = new ActiveEntityModifier(true, RootTable_.CDS_NAME);
+    ModifierToCreateFlatCQN modifier = new ModifierToCreateFlatCQN(true, RootTable_.CDS_NAME);
 
     var result = CQL.copy(original, modifier);