Merge branch 'develop' into RenameFileExtensionValidation

yashmeet29 · web-flow · commit 2e042ff226d8 · 2026-05-29T10:21:17.000+05:30
diff --git a/.github/actions/deploy-release/action.yml b/.github/actions/deploy-release/action.yml
@@ -37,7 +37,7 @@ runs:
       uses: actions/setup-java@v4
       with:
         distribution: 'sapmachine'
-        java-version: '17'
+        java-version: '21'
         cache: maven
         server-id: central
         server-username: MAVEN_CENTRAL_USER
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
@@ -34,11 +34,11 @@ runs:
         echo "altDeploymentRepository: ${{inputs.server-id}}::default::${{inputs.repository-url}}"
       shell: bash
 
-    - name: Setup Java 17
+    - name: Setup Java 21
       uses: actions/setup-java@v4
       with:
         distribution: sapmachine
-        java-version: '17'
+        java-version: '21'
         server-id: ${{ inputs.server-id }}
         server-username: CAP_DEPLOYMENT_USER
         server-password: CAP_DEPLOYMENT_PASS
diff --git a/.github/workflows/blackduck.yml b/.github/workflows/blackduck.yml
@@ -23,10 +23,10 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
           
diff --git a/.github/workflows/cfdeploy.yml b/.github/workflows/cfdeploy.yml
@@ -41,10 +41,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.deploy_branch }}
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Build and package 🔨
@@ -137,10 +137,10 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Verify and Checkout Deploy Branch 🔄
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,11 +29,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
diff --git a/.github/workflows/demo-build.yml b/.github/workflows/demo-build.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
diff --git a/.github/workflows/internalArticatory.yml b/.github/workflows/internalArticatory.yml
@@ -1,7 +1,7 @@
 name: Internal Artifactory snapshot deploy
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
   ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
 
diff --git a/.github/workflows/main-build-and-deploy-oss.yml b/.github/workflows/main-build-and-deploy-oss.yml
@@ -1,7 +1,7 @@
 name: Deploy to Maven Central
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
 
 on:
diff --git a/.github/workflows/main-build-and-deploy.yml b/.github/workflows/main-build-and-deploy.yml
@@ -1,7 +1,7 @@
 name: Deploy to Artifactory on pre-released
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
   DEPLOY_REPOSITORY_URL: 'https://common.repositories.cloud.sap/artifactory/cap-sdm-java'
   POM_FILE: '.flattened-pom.xml'
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -1,7 +1,7 @@
 name: Main build and snapshot deploy
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
 
 on:
@@ -17,7 +17,7 @@ jobs:
       contents: read
     strategy:
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 21 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
diff --git a/.github/workflows/multi tenancy_Integration.yml b/.github/workflows/multi tenancy_Integration.yml
@@ -34,10 +34,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.branch_name }}
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test.yml b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
@@ -117,10 +117,10 @@ jobs:
       - name: Checkout repository ✅
         uses: actions/checkout@v6
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -164,10 +164,10 @@ jobs:
       - name: Checkout repository ✅
         uses: actions/checkout@v6
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 21 ]
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/singleTenant_deploy_and_Integration_test.yml b/.github/workflows/singleTenant_deploy_and_Integration_test.yml
@@ -27,10 +27,10 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Verify and Checkout Deploy Branch
@@ -127,10 +127,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -27,10 +27,10 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Verify and Checkout Deploy Branch
@@ -178,10 +178,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/singleTenant_integration_test.yml b/.github/workflows/singleTenant_integration_test.yml
@@ -29,10 +29,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.branch_name }}
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -24,10 +24,10 @@ jobs:
         with:
           fetch-depth: 0  # Ensure shallow clones are disabled for better analysis relevancy
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
 
diff --git a/.github/workflows/unit.tests.yml b/.github/workflows/unit.tests.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [17]
+        java-version: [21]
     steps:
     - name: Checkout repository
       uses: actions/checkout@v6
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This plugin can be consumed by the CAP application deployed on BTP to store thei
 - Draft functionality : Provides the capability of working with draft attachments.
 - Display attachments specific to repository: Lists attachments contained in the repository that is configured with the CAP application.
 - Custom properties : Provides the capability to define custom properties for attachments.
-- Maximum allowed uploads: Provides the capability to define the maximum number of uploads allowed for the user.
+- Maximum allowed uploads: Provides the capability to define the maximum number of uploads allowed for the user. Automatically disables the upload button in the UI when the limit is reached.
 - Maximum file size: Provides the capability to specify the maximum file size for attachments.
 - Multiple attachment facets: Provides the capability to define multiple attachment facets/sections in the CAP Entity.
 - Technical user support: Provides the capability to consume the plugin using technical user.
@@ -37,6 +37,7 @@ This plugin can be consumed by the CAP application deployed on BTP to store thei
 - [Support for Multitenancy](#support-for-multitenancy)
 - [Support for Custom Properties](#support-for-custom-properties)
 - [Support for Maximum allowed uploads](#support-for-maximum-allowed-uploads)
+- [Upload Button Auto-Disable in the UI](#upload-button-auto-disable-in-the-ui)
 - [Support for Maximum File Size](#support-for-maximum-file-size)
 - [Support for Multiple attachment facets](#support-for-multiple-attachment-facets)
 - [Support for Technical user](#support-for-technical-user)
@@ -494,9 +495,90 @@ Example for German language in `messages_de.properties`:
 SDM.maxCountErrorMessage = Maximale Anzahl von Anhängen erreicht
 ```
 
-> **Note**
->
-> Once the maxCount is configured, it is recommended not to alter it. If the maxCount is altered, the previously uploaded documents will still be visible.
+#### Upload Button Auto-Disable in the UI
+
+When `maxCount` is configured, the plugin automatically computes a virtual boolean field (e.g. `isAttachmentsUploadable`) on the parent entity at read time and sets it to `false` when the limit is reached. To wire this up in your Fiori UI so the **Upload button is automatically disabled**, follow the steps below.
+
+**1. Declare the virtual field on the parent entity**
+
+Add a `virtual` boolean field for each `maxCount` annotated composition directly on the parent entity in your CDS schema. The field name must follow the pattern `is` + capitalised composition name + `Uploadable`:
+
+```cds
+entity Books : managed, cuid {
+  // ... other fields ...
+  virtual isAttachmentsUploadable : Boolean;
+  virtual isReferencesUploadable  : Boolean;
+
+  attachments : Composition of many Attachments @SDM.Attachments:{maxCount: 4};
+  references  : Composition of many Attachments @SDM.Attachments:{maxCount: 2};
+}
+```
+
+- For a composition named `attachments` declare `virtual isAttachmentsUploadable : Boolean`.
+- For `references` declare `virtual isReferencesUploadable : Boolean`, and so on.
+- Virtual fields are never stored in the database; the plugin populates them at read time.
+
+**2. Disable the Upload button via `InsertRestrictions`**
+
+Annotate each attachment entity in your service to bind its insertability to the virtual field on the parent:
+
+```cds
+annotate MyService.Books.attachments with @(
+  Capabilities: {InsertRestrictions: {Insertable: up_.isAttachmentsUploadable}}
+);
+```
+
+- Replace `MyService.Books.attachments` with your service and entity path.
+- Repeat for every composition facet that has a `maxCount`.
+
+**3. Refresh the parent after attachment changes via `SideEffects`**
+
+After an upload or deletion, Fiori must re-read the parent entity to pick up the updated virtual field and reflect the new button state. Add a named `Common.SideEffects` annotation on the parent entity:
+
+```cds
+annotate MyService.Books with @(
+  Common.SideEffects #attachmentsUploadable: {
+    SourceEntities: ['attachments'],
+    TargetProperties: ['']
+  }
+);
+```
+
+- `SourceEntities: ['attachments']` — triggers the refresh when the `attachments` list changes.
+- `TargetEntities: ['']` — re-fetches the parent entity (`Books`) so the updated `isAttachmentsUploadable` value is returned to the UI.
+- The qualifier (e.g. `#attachmentsUploadable`) can be any unique name; it is only needed to distinguish multiple `SideEffects` annotations on the same entity.
+
+**Example with multiple facets**
+
+If an entity has several `maxCount`-annotated compositions, add one `virtual field` declaration, one `InsertRestrictions`, and one `SideEffects` per facet:
+
+
+```cds
+annotate MyService.Books.attachments with @(
+  Capabilities: {InsertRestrictions: {Insertable: up_.isAttachmentsUploadable}}
+);
+
+annotate MyService.Books.references with @(
+  Capabilities: {InsertRestrictions: {Insertable: up_.isReferencesUploadable}}
+);
+
+annotate MyService.Books with @(
+  Common.SideEffects #attachmentsUploadable: {
+    SourceEntities: ['attachments'],
+    TargetProperties: ['isAttachmentsUploadable']
+  },
+  Common.SideEffects #referencesUploadable: {
+    SourceEntities: ['references'],
+    TargetProperties: ['isAttachmentsUploadable']
+  }
+);
+```
+See this [example](https://github.com/cap-java/sdm/blob/cc537c5c855ad59fa14100a397536ab22f4b1aa7/cap-notebook/demoapp/db/schema.cds#L19) of `virtual field` declaration from a sample Bookshop app.
+
+See this [example](https://github.com/cap-java/sdm/blob/cc537c5c855ad59fa14100a397536ab22f4b1aa7/cap-notebook/demoapp/srv/admin-service.cds#L46) of `InsertRestriction` annotation from a sample Bookshop app.
+
+See this [example](https://github.com/cap-java/sdm/blob/cc537c5c855ad59fa14100a397536ab22f4b1aa7/cap-notebook/demoapp/srv/admin-service.cds#L279) of `SideEffects` annotation from a sample Bookshop app.
+
 
 ## Support for Maximum File Size
 
diff --git a/deploy-artifactory.sh b/deploy-artifactory.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 ########################################
 # CONFIGURATION
 ########################################
-JAVA_VERSION="${JAVA_VERSION:-17}"
+JAVA_VERSION="${JAVA_VERSION:-21}"
 MAVEN_VERSION="${MAVEN_VERSION:-3.6.3}"
 
 # These MUST come from Jenkins
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 
     <properties>
         <revision>1.8.1-SNAPSHOT</revision>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorMessages.java b/sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorMessages.java
diff --git a/sdm/src/main/java/com/sap/cds/sdm/constants/SDMUIErrorKeys.java b/sdm/src/main/java/com/sap/cds/sdm/constants/SDMUIErrorKeys.java
diff --git a/sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMReadAttachmentsHandler.java b/sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMReadAttachmentsHandler.java
diff --git a/sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java b/sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java
diff --git a/sdm/src/test/java/unit/com/sap/cds/sdm/handler/applicationservice/SDMReadAttachmentsHandlerPopulateUploadableFlagsTest.java b/sdm/src/test/java/unit/com/sap/cds/sdm/handler/applicationservice/SDMReadAttachmentsHandlerPopulateUploadableFlagsTest.java
diff --git a/sdm/src/test/java/unit/com/sap/cds/sdm/service/handler/SDMCustomServiceHandlerTest.java b/sdm/src/test/java/unit/com/sap/cds/sdm/service/handler/SDMCustomServiceHandlerTest.java
