Merge branch 'develop' into largeFileUploadFixWithouRestTemplate

Author: maheshsooryambylu

.github/actions/newrelease/action.yml

@@ -34,7 +34,8 @@ runs:
         #./ensure-license.sh
         git config --global user.name 'github-actions[bot]'
         git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-        git checkout -b Release_v1.0.2
+        git checkout -b Release_v1.1.0
+        git add cap-notebook/version.txt
         git commit -am "Update version to $VERSION"
-        git push --set-upstream origin Release_v1.0.2
+        git push --set-upstream origin Release_v1.1.0
       shell: bash

.github/workflows/sonarqube.yml

@@ -54,7 +54,7 @@ jobs:
               -Dsonar.junit.reportPaths=sdm/target/surefire-reports \
               -Dsonar.coverage.jacoco.xmlReportPaths=sdm/target/site/jacoco/jacoco.xml \
               -Dsonar.inclusions=**/*.java \
-              -Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,cap-notebook/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java \
+              -Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,cap-notebook/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java \
               -Dsonar.java.file.suffixes=.java \
               -Dsonar.host.url=${{ secrets.SONAR_HOST_URL }} \
               -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
@@ -70,7 +70,7 @@ jobs:
               -Dsonar.junit.reportPaths=sdm/target/surefire-reports \
               -Dsonar.coverage.jacoco.xmlReportPaths=sdm/target/site/jacoco/jacoco.xml \
               -Dsonar.inclusions=**/*.java \
-              -Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,cap-notebook/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java \
+              -Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,cap-notebook/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java \
               -Dsonar.java.file.suffixes=.java \
               -Dsonar.host.url=${{ secrets.SONAR_HOST_URL }} \
               -Dsonar.login=${{ secrets.SONAR_TOKEN }}

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 1.1.0
+
+### Fixed
+
+- Allow any name in the primary key for the entity. 
+- Duplicate filename check with multiple repository switch.
+- Error message for special characters in filename.
+
+### Added
+
+- Support repository onboarding for multitenant use case.
+
 ## Version 1.0.2
 
 ### Added

README.md

@@ -21,6 +21,7 @@ This plugin can be consumed by the CAP application deployed on BTP to store thei
 - [Deploying and testing the application](#deploying-and-testing-the-application)
 - [Use com.sap.cds:sdm dependency](#use-comsapcdssdm-dependency)
 - [Support for Multitenancy](#support-for-multitenancy)
+- [Support for Custom Properties](#support-for-custom-properties)
 - [Known Restrictions](#known-restrictions)
 - [Support, Feedback, Contributing](#support-feedback-contributing)
 - [Code of Conduct](#code-of-conduct)
@@ -317,10 +318,64 @@ String response = sdmAdminService.onboardRepository(repository);
  When the application is deployed as a SaaS application using the code above, tenants automatically onboard a repository upon subscription.
 - When the application is deployed as a SaaS application with above code, tenants on subscribing the SaaS application gets onboarded automatically.
 
+## Support for Custom Properties
+
+Custom properties are supported via the usage of CMIS secondary type properties. Follow the below steps to add and use custom properties.
+
+1. If the repository does not contain secondary types and properties, create CMIS secondary types and properties using the [Create Secondary Type API](https://api.sap.com/api/CreateSecondaryTypeApi/overview). The property definition must contain the following section for the CAP plugin to process the property.
+
+   ```json
+   "mcm:miscellaneous": {        
+      "isPartOfTable": "true"  
+   } 
+   ```
+
+   With this, the secondary type and properties definition will be as per the sample given below
+
+      ```json
+      {
+         "id": "Working:DocumentInfo",
+         "displayName": "Document Info",
+         "baseId": "cmis:secondary",
+         "parentId": "cmis:secondary",
+         ...
+         },
+         "propertyDefinitions": {
+            "Working:DocumentInfoRecord": {
+                  "id": "Working:DocumentInfoRecord",
+                  "displayName": "Document Info Record",
+                  ...
+                  "mcm:miscellaneous": {     <-- Required section in the property definition
+                     "isPartOfTable": "true"
+                  }
+            }
+         }
+      }
+      ```
+
+2. Using secondary properties in CAP Application.
+   - Extend the `Attachments` aspect with the secondary properties in the previously created _attachment-extension.cds_ file. 
+   - Annotate the secondary properties with `@SDM.Attachments.AdditionalProperty`. 
+   - If the property id contains a `:`, replace it with a triple underscore `___`. 
+   
+   Refer the following example from a sample Bookshop app:
+
+      ```cds
+      extend Attachments with {
+         Working___DocumentInfoRecord : String @SDM.Attachments.AdditionalProperty @(title: '{i18n>property1}');
+      }
+      ```
+
+   > **Note**
+   >
+   > SDM supports secondary properties with data types `String`, `Boolean`, `Decimal`, `Integer` and `DateTime`.  
+
+
 ## Known Restrictions
 
 - Repository : This plugin does not support the use of versioned repositories.
 - File size : Attachments are limited to a maximum size of 700 MB. If the repository is [onboarded](https://help.sap.com/docs/document-management-service/sap-document-management-service/internal-repository?version=Cloud&locale=en-US) with virus scan enabled for all files, attachments are limited to a maximum size of 400 MB. 
+- Datatypes for custom properties : Custom properties are supported for the following data types `String`, `Boolean`, `Decimal`, `Integer` and `DateTime`.  
 
 ## Support, Feedback, Contributing
 

pom.xml

@@ -24,7 +24,7 @@
     </developers>
 
     <properties>
-        <revision>1.0.3-SNAPSHOT</revision>
+        <revision>1.1.1-SNAPSHOT</revision>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

sdm/src/main/java/com/sap/cds/sdm/caching/CacheConfig.java

@@ -1,5 +1,6 @@
 package com.sap.cds.sdm.caching;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.ehcache.Cache;
 import org.ehcache.CacheManager;
@@ -16,6 +17,7 @@ public class CacheConfig {
   private static Cache<CacheKey, String> clientCredentialsTokenCache;
   private static Cache<TokenCacheKey, String> userAuthoritiesTokenCache;
   private static Cache<RepoKey, String> versionedRepoCache;
+  private static Cache<SecondaryTypesKey, List<String>> secondaryTypesCache;
   private static final int HEAP_SIZE = 1000;
   private static final int USER_TOKEN_EXPIRY = 660;
   private static final int ACCESS_TOKEN_EXPIRY = 660;
@@ -63,6 +65,15 @@ public static void initializeCache() {
                 .withExpiry(
                     Expirations.timeToLiveExpiration(
                         new Duration(USER_TOKEN_EXPIRY, TimeUnit.MINUTES))));
+
+    secondaryTypesCache =
+        cacheManager.createCache(
+            "secondaryTypes",
+            CacheConfigurationBuilder.newCacheConfigurationBuilder(
+                    SecondaryTypesKey.class,
+                    (Class<List<String>>) (Class<?>) List.class,
+                    ResourcePoolsBuilder.heap(HEAP_SIZE))
+                .withExpiry(Expirations.noExpiration()));
   }
 
   public static Cache<CacheKey, String> getUserTokenCache() {
@@ -80,4 +91,8 @@ public static Cache<CacheKey, String> getClientCredentialsTokenCache() {
   public static Cache<RepoKey, String> getVersionedRepoCache() {
     return versionedRepoCache;
   }
+
+  public static Cache<SecondaryTypesKey, List<String>> getSecondaryTypesCache() {
+    return secondaryTypesCache;
+  }
 }

sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java

@@ -0,0 +1,12 @@
+package com.sap.cds.sdm.caching;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SecondaryTypesKey {
+  private String repositoryId;
+}

sdm/src/main/java/com/sap/cds/sdm/configuration/Registration.java

@@ -62,7 +62,7 @@ public void eventHandlers(CdsRuntimeConfigurer configurer) {
     SDMService sdmService = new SDMServiceImpl(binding, connectionPool);
     DocumentUploadService documentService = new DocumentUploadService();
     configurer.eventHandler(buildReadHandler());
-    configurer.eventHandler(new SDMCreateAttachmentsHandler(sdmService));
+    configurer.eventHandler(new SDMCreateAttachmentsHandler(persistenceService, sdmService));
     configurer.eventHandler(new SDMUpdateAttachmentsHandler(persistenceService, sdmService));
     configurer.eventHandler(
         new SDMAttachmentsServiceHandler(persistenceService, sdmService, documentService));

sdm/src/main/java/com/sap/cds/sdm/constants/SDMConstants.java

@@ -8,6 +8,8 @@ private SDMConstants() {
   }
 
   public static final String REPOSITORY_ID = System.getenv("REPOSITORY_ID");
+  public static final String SDM_ANNOTATION_ADDITIONALPROPERTY =
+      "@SDM.Attachments.AdditionalProperty";
   public static final String DUPLICATE_FILE_IN_DRAFT_ERROR_MESSAGE =
       "The file(s) %s have been added multiple times. Please rename and try again.";
   public static final String FILES_RENAME_WARNING_MESSAGE =
@@ -40,12 +42,13 @@ private SDMConstants() {
   public static final int CHUNK_SIZE = 100 * 1024 * 1024; // 100MB Chunk Size
   public static final String ONBOARD_REPO_MESSAGE =
       "Repository with name %s  and id %s onboarded successfully";
-  public static final String ONBOARD_REPO__ERROR_MESSAGE =
+  public static final String ONBOARD_REPO_ERROR_MESSAGE =
       "Error in onboarding repository with name %s";
   public static final String NO_SDM_BINDING = "No SDM binding found";
   public static final String DI_TOKEN_EXCHANGE_ERROR = "Error fetching DI token with JWT bearer";
   public static final String DI_TOKEN_EXCHANGE_PARAMS =
       "/oauth/token?grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer";
+  public static final String UPDATE_ATTACHMENT_ERROR = "Could not update the attachment";
 
   public static String nameConstraintMessage(
       List<String> fileNameWithRestrictedCharacters, String operation) {
@@ -67,6 +70,22 @@ public static String nameConstraintMessage(
     return bulletPoints.toString();
   }
 
+  public static String secondaryPropertiesError(List<String> invalidSecondaryProperties) {
+    // Create the base message
+    String prefixMessage = "The following secondary properties are not supported.\n\n";
+
+    // Initialize the StringBuilder with the formatted message prefix
+    StringBuilder bulletPoints = new StringBuilder(prefixMessage);
+
+    // Append each unsupported file name to the StringBuilder
+    for (String file : invalidSecondaryProperties) {
+      bulletPoints.append(String.format("\t• %s%n", file));
+    }
+    bulletPoints.append(
+        "\nPlease contact your administrator for assistance with any necessary adjustments.");
+    return bulletPoints.toString();
+  }
+
   public static String getDuplicateFilesError(String filename) {
     return String.format(DUPLICATE_FILES_ERROR, filename);
   }

sdm/src/main/java/com/sap/cds/sdm/handler/TokenHandler.java

@@ -311,7 +311,7 @@ public static HttpClient getHttpClient(
     DefaultHttpClientFactory.DefaultHttpClientFactoryBuilder builder =
         DefaultHttpClientFactory.builder();
     if (connectionPoolConfig == null) {
-      Duration timeout = Duration.ofSeconds((long) SDMConstants.CONNECTION_TIMEOUT);
+      Duration timeout = Duration.ofSeconds(SDMConstants.CONNECTION_TIMEOUT);
       builder.timeoutMilliseconds((int) timeout.toMillis());
       builder.maxConnectionsPerRoute(SDMConstants.MAX_CONNECTIONS);
       builder.maxConnectionsTotal(SDMConstants.MAX_CONNECTIONS);