expand handler

Author: etimr

app/admin/fiori-service.cds

@@ -104,7 +104,8 @@ annotate AdminService.GenreHierarchy with @UI: {
     LineItem               : [{
         $Type: 'UI.DataField',
         Value: name,
-    }]
+        Label : 'Genre'
+    }],
 };
 
 annotate AdminService.ContentsHierarchy with @UI: {
@@ -123,8 +124,8 @@ annotate AdminService.ContentsHierarchy with @UI: {
     }],
     HeaderInfo            : {
         $Type         : 'UI.HeaderInfoType',
-        TypeName      : 'Organization Level',
-        TypeNamePlural: 'Organization Levels',
+        TypeName      : 'Contents Level',
+        TypeNamePlural: 'Contents Levels',
         Title         : {
             $Type: 'UI.DataField',
             Value: name,

srv/src/main/java/my/bookshop/handlers/HierarchyExpandHandler.java

@@ -1,5 +1,4 @@
 package my.bookshop.handlers;
-
 import java.util.List;
 
 import org.springframework.context.annotation.Profile;
@@ -21,10 +20,12 @@
 import cds.gen.adminservice.GenreHierarchy_;
 
 
+
 @Component
 @ServiceName(AdminService_.CDS_NAME)
 /**
  *  For testing purposes of modifying requests for hierarchies
+ *  Remove when generic solution for $apply and $expand is available
  */
 @Profile("hybrid")
 public class HierarchyExpandHandler implements EventHandler {
@@ -37,12 +38,15 @@ void removeExpand(CdsReadEventContext event) {
         }
         if (trafos.get(0) instanceof CqnAncestorsTransformation) {
             CqnSelect original = event.getCqn();
-            CqnSelect copy = CQL.copy(original, new Modifier() {
-                public List<CqnSelectListItem> items(List<CqnSelectListItem> items) {
-                    return items.stream().filter(i -> !i.isExpand()).toList();
-                }
-            });
+            Boolean isExpand = original.items().stream().filter(CqnSelectListItem::isExpand).findAny().isPresent();
+            if (isExpand) {   
+                CqnSelect copy = CQL.copy(original, new Modifier() {
+                    public List<CqnSelectListItem> items(List<CqnSelectListItem> items) {
+                        return items.stream().filter(i -> !i.isExpand()).toList();
+                    }
+                });
             event.setCqn(copy);
+            }
         }
         event.proceed(); 
     }