fallback

Author: eugene-andreev

srv/src/main/java/my/bookshop/handlers/hierarchy/HierarchyFallbackHandler.java

@@ -0,0 +1,39 @@
+package my.bookshop.handlers.hierarchy;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+import com.sap.cds.ql.Select;
+import com.sap.cds.services.cds.CdsReadEventContext;
+import com.sap.cds.services.cds.CqnService;
+import com.sap.cds.services.handler.EventHandler;
+import com.sap.cds.services.handler.annotations.Before;
+import com.sap.cds.services.handler.annotations.ServiceName;
+import com.sap.cds.services.persistence.PersistenceService;
+
+import cds.gen.adminservice.AdminService_;
+import cds.gen.adminservice.GenreHierarchy_;
+
+@Component
+@Profile("default") // non-HANA
+@ServiceName(AdminService_.CDS_NAME)
+/**
+ * Fallback to plain representation
+ */
+public class HierarchyFallbackHandler implements EventHandler {
+
+    private final PersistenceService db;
+
+    HierarchyFallbackHandler(PersistenceService db) {
+        this.db = db;
+    }
+
+    @Before(event = CqnService.EVENT_READ, entity = GenreHierarchy_.CDS_NAME)
+    public void readGenreHierarchy(CdsReadEventContext event) {
+        if (event.getCqn().transformations().size() < 1) {
+            return;
+        }
+        event.setResult(db.run(Select.from(cds.gen.adminservice.GenreHierarchy_.class)));
+    }
+
+}

…/bookshop/handlers/HierarchyHandler.java …/hierarchy/HierarchyReadOnlyHandler.javasrv/src/main/java/my/bookshop/handlers/HierarchyHandler.java renamed to srv/src/main/java/my/bookshop/handlers/hierarchy/HierarchyReadOnlyHandler.java srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java renamed to srv/src/main/java/my/bookshop/handlers/hierarchy/HierarchyReadOnlyHandler.java

@@ -1,4 +1,4 @@
-package my.bookshop.handlers;
+package my.bookshop.handlers.hierarchy;
 
 import static cds.gen.catalogservice.CatalogService_.GENRE_HIERARCHY;
 
@@ -37,14 +37,13 @@
 import com.sap.cds.services.handler.annotations.ServiceName;
 import com.sap.cds.services.persistence.PersistenceService;
 
-import cds.gen.adminservice.AdminService_;
 import cds.gen.catalogservice.CatalogService_;
 import cds.gen.catalogservice.GenreHierarchy;
 import cds.gen.catalogservice.GenreHierarchy_;
 
 @Component
 @Profile("default") // non-HANA
-@ServiceName({ CatalogService_.CDS_NAME, AdminService_.CDS_NAME })
+@ServiceName(CatalogService_.CDS_NAME)
 /**
  * On HANA, requests for GenreHierarchy are handled generically.
  * 
@@ -55,15 +54,15 @@
  * The handler is neither functionally complete nor correct for all requests. It
  * is not intended as a blue-print for custom code.
  */
-public class HierarchyHandler implements EventHandler {
+public class HierarchyReadOnlyHandler implements EventHandler {
 
     private final PersistenceService db;
 
-    HierarchyHandler(PersistenceService db) {
+    HierarchyReadOnlyHandler(PersistenceService db) {
         this.db = db;
     }
 
-    @Before(event = CqnService.EVENT_READ)
+    @Before(event = CqnService.EVENT_READ, entity = GenreHierarchy_.CDS_NAME)
     public void readGenreHierarchy(CdsReadEventContext event) {
         List<CqnTransformation> trafos = event.getCqn().transformations();
         List<GenreHierarchy> result = null;
@@ -72,12 +71,6 @@ public void readGenreHierarchy(CdsReadEventContext event) {
             return;
         }
 
-        // Fallback for draft-enabled scenario: plain table
-        if (cds.gen.adminservice.GenreHierarchy_.CDS_NAME.equals(event.getTarget().getQualifiedName())) {
-            event.setResult(db.run(Select.from(cds.gen.adminservice.GenreHierarchy_.class)));
-            return;
-        }
-
         if (getTopLevels(trafos) instanceof CqnTopLevelsTransformation topLevels) {
             result = topLevels(topLevels, CQL.TRUE);
         } else if (trafos.get(0) instanceof CqnDescendantsTransformation descendants) {

…handlers/HierarchyHandlerSorterTest.java …ierarchy/HierarchyHandlerSorterTest.javasrv/src/test/java/my/bookshop/handlers/HierarchyHandlerSorterTest.java renamed to srv/src/test/java/my/bookshop/handlers/hierarchy/HierarchyHandlerSorterTest.java srv/src/test/java/my/bookshop/handlers/HierarchyHandlerSorterTest.java renamed to srv/src/test/java/my/bookshop/handlers/hierarchy/HierarchyHandlerSorterTest.java

@@ -1,11 +1,11 @@
-package my.bookshop.handlers;
+package my.bookshop.handlers.hierarchy;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
 import cds.gen.catalogservice.GenreHierarchy;
-import my.bookshop.handlers.HierarchyHandler.Sorter;
+import my.bookshop.handlers.hierarchy.HierarchyReadOnlyHandler.Sorter;
 
 public class HierarchyHandlerSorterTest {