Merge remote-tracking branch 'origin/main' into spring-boot-4

Author: StefanHenke

.cdsrc.json

@@ -4,8 +4,5 @@
         "extensibility": true,
         "toggles": true
     },
-    "profile": "with-mtx-sidecar",
-    "odata": {
-        "containment": true
-    }
+    "profile": "with-mtx-sidecar"
 }

.github/workflows/maven.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
-        java-version: 21
+        java-version: 25
         distribution: 'sapmachine'
     - name: Build with Maven
       run: mvn -ntp -B clean install

app/admin/fiori-service.cds

@@ -94,7 +94,7 @@ annotate AdminService.GenreHierarchy with {
   ID @UI.Hidden;
 };
 
-annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchyActions #GenreHierarchy: {
+annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchyActions #GenreHierarchyHierarchy: {
   $Type                  : 'Hierarchy.RecursiveHierarchyActionsType',
   // any name can be the action name with namespace/no bound action name
   ChangeNextSiblingAction: 'AdminService.moveSibling',
@@ -104,7 +104,7 @@ annotate AdminService.GenreHierarchy with @UI: {
     PresentationVariant #VH: {
         $Type                      : 'UI.PresentationVariantType',
         Visualizations             : ['@UI.LineItem'],
-        RecursiveHierarchyQualifier: 'GenreHierarchy'
+        RecursiveHierarchyQualifier: 'GenreHierarchyHierarchy'
     },
     LineItem               : [{
         $Type: 'UI.DataField',
@@ -196,19 +196,7 @@ annotate AdminService.Books.texts {
 //
 //  Annotations for hierarchy ContentsHierarchy
 //
-annotate AdminService.ContentsHierarchy with @Aggregation.RecursiveHierarchy#ContentsHierarchy: {
-    $Type: 'Aggregation.RecursiveHierarchyType',
-    NodeProperty: ID, // identifies a node
-    ParentNavigationProperty: parent // navigates to a node's parent
-  };
-
-annotate AdminService.ContentsHierarchy with @Hierarchy.RecursiveHierarchy#ContentsHierarchy: {
-  $Type: 'Hierarchy.RecursiveHierarchyType',
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot: DistanceFromRoot,
-  DrillState: DrillState,
-  LimitedRank: LimitedRank
-};
+annotate AdminService.ContentsHierarchy with @hierarchy;
 
 annotate AdminService.Books actions {
     @(

app/admin/webapp/manifest.json

@@ -124,7 +124,7 @@
                             "controlConfiguration": {
                                 "contents/@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "hierarchyQualifier": "ContentsHierarchy",
+                                        "hierarchyQualifier": "ContentsHierarchyHierarchy",
                                         "type": "TreeTable"
                                     }
                                 }

app/browse-genres/fiori-service.cds

@@ -5,16 +5,5 @@
 using CatalogService from '../../srv/cat-service';
 
 
-annotate CatalogService.GenreHierarchy with @Aggregation.RecursiveHierarchy#GenreHierarchy: {
-    $Type: 'Aggregation.RecursiveHierarchyType',
-    NodeProperty: ID, // identifies a node
-    ParentNavigationProperty: parent // navigates to a node's parent
-  };
+annotate CatalogService.GenreHierarchy with @hierarchy;
 
-annotate CatalogService.GenreHierarchy with @Hierarchy.RecursiveHierarchy#GenreHierarchy: {
-  $Type: 'Hierarchy.RecursiveHierarchyType',
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot: DistanceFromRoot,
-  DrillState: DrillState,
-  LimitedRank: LimitedRank
-};

app/browse-genres/webapp/manifest.json

@@ -88,7 +88,7 @@
 							"controlConfiguration": {
                                 "@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "hierarchyQualifier": "GenreHierarchy",
+                                        "hierarchyQualifier": "GenreHierarchyHierarchy",
                                         "type": "TreeTable"
                                     }
                                 }

app/fiori.html

@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.139.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.139.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.147.1/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.147.1/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

app/genres/fiori-service.cds

@@ -5,17 +5,4 @@
 using AdminService from '../../srv/admin-service';
 
 
-annotate AdminService.GenreHierarchy with @Aggregation.RecursiveHierarchy#GenreHierarchy: {
-    $Type: 'Aggregation.RecursiveHierarchyType',
-    NodeProperty: ID, // identifies a node
-    ParentNavigationProperty: parent // navigates to a node's parent
-  };
-
-  annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchy#GenreHierarchy: {
-  $Type: 'Hierarchy.RecursiveHierarchyType',
-  // ExternalKey           : null,
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot: DistanceFromRoot,
-  DrillState: DrillState,
-  LimitedRank: LimitedRank
-};
+annotate AdminService.GenreHierarchy with @hierarchy;

app/genres/webapp/manifest.json

@@ -93,7 +93,7 @@
 							"controlConfiguration": {
                                 "@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "hierarchyQualifier": "GenreHierarchy",
+                                        "hierarchyQualifier": "GenreHierarchyHierarchy",
                                         "type": "TreeTable"
                                     }
                                 }