fix test + address comments

Author: eugene-andreev

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

@@ -47,8 +47,6 @@
 import cds.gen.adminservice.BooksAddToOrderContext;
 import cds.gen.adminservice.BooksCovers;
 import cds.gen.adminservice.Books_;
-import cds.gen.adminservice.Info;
-import cds.gen.adminservice.Info_;
 import cds.gen.adminservice.OrderItems;
 import cds.gen.adminservice.OrderItems_;
 import cds.gen.adminservice.Orders;
@@ -70,13 +68,11 @@ class AdminServiceHandler implements EventHandler {
 	private final PersistenceService db;
 	private final Messages messages;
 	private final CqnAnalyzer analyzer;
-	private final Environment env;
 
-	AdminServiceHandler(AdminService.Draft adminService, PersistenceService db, Messages messages, CdsModel model, Environment env) {
+	AdminServiceHandler(AdminService.Draft adminService, PersistenceService db, Messages messages, CdsModel model) {
 		this.adminService = adminService;
 		this.db = db;
 		this.messages = messages;
-		this.env = env;
 
 		// model is a tenant-dependant model proxy
 		this.analyzer = CqnAnalyzer.create(model);

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

@@ -4,7 +4,6 @@
 
 import java.util.List;
 
-import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import com.sap.cds.ql.CQL;
@@ -26,7 +25,6 @@
 /**
  * Example of a custom handler for nextSiblingAction
  */
-@Profile("cloud")
 public class HierarchySiblingActionHandler implements EventHandler {
 
     private final PersistenceService db;

srv/src/test/java/my/bookshop/GenreHierarchyTest.java

@@ -106,7 +106,7 @@ void testExpandNonFiction() throws Exception {
 	void testCollapseAll() throws Exception {
 		client.perform(get(genresURI
 				+ "?$select=DrillState,ID,name"
-				+ "&$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID',Levels=1)"
+				+ "&$apply=orderby(name)/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID',Levels=1)"
 				+ "&$count=true&$skip=0&$top=238"))
 				.andExpect(status().isOk())
 				.andExpect(jsonPath("$.value[0].name").value("Fiction"))
@@ -121,7 +121,7 @@ void testCollapseAll() throws Exception {
 	void testExpandAll() throws Exception {
 		String url = genresURI
 				+ "?$select=DistanceFromRoot,DrillState,ID,LimitedDescendantCount,name"
-				+ "&$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID')"
+				+ "&$apply=orderby(name)/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID')"
 				+ "&$count=true&$skip=0&$top=238";
 
 		ResultActions expectations = client.perform(get(url))