Merge branch 'develop' into revertDisableUploadBtn

Author: yashmeet29

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

@@ -147,6 +147,8 @@ private SDMErrorMessages() {
       "Failed to access SDM error key fields";
   public static final String FAILED_TO_ACCESS_ERROR_MESSAGES_FIELDS =
       "Failed to access SDM error messages fields";
+  public static final String FILE_EXTENSION_CHANGE_NOT_ALLOWED =
+      "Changing the file extension is not allowed. The file \"%s\" must retain its original extension \"%s\".";
 
   // Helper Methods to create error/warning messages
   public static String buildErrorMessage(

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

@@ -68,6 +68,8 @@ private SDMUIErrorKeys() {}
       "SDM.multipleDuplicateFilenamesPrefix";
   public static final String MULTIPLE_DUPLICATE_FILENAMES_SUFFIX_KEY =
       "SDM.multipleDuplicateFilenamesSuffix";
+  public static final String FILE_EXTENSION_CHANGE_NOT_ALLOWED_KEY =
+      "SDM.fileExtensionChangeNotAllowed";
 
   // Update Operation Errors
   public static final String FILE_NOT_FOUND_PREFIX_KEY = "SDM.fileNotFoundPrefix";

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMCreateAttachmentsHandler.java

@@ -482,8 +482,22 @@ private void updateAndSendToSDM(
         AttachmentsHandlerUtils.prepareCmisDocument(
             filenameInRequest, descriptionInRequest, objectId);
 
+    List<String> extensionChangedFiles = new ArrayList<>();
     AttachmentsHandlerUtils.updateFilenameProperty(
-        fileNameInDB, filenameInRequest, fileNameInSDM, updatedSecondaryProperties);
+        fileNameInDB,
+        filenameInRequest,
+        fileNameInSDM,
+        updatedSecondaryProperties,
+        extensionChangedFiles);
+
+    // If extension change was detected, revert filename to original and warn
+    if (!extensionChangedFiles.isEmpty()) {
+      attachment.put("fileName", fileNameInSDM);
+      for (String warningMessage : extensionChangedFiles) {
+        context.getMessages().warn(warningMessage);
+      }
+    }
+
     AttachmentsHandlerUtils.updateDescriptionProperty(
         descriptionInSDM,
         descriptionInRequest,

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMUpdateAttachmentsHandler.java

@@ -197,6 +197,7 @@ private void renameDocument(
     List<String> fileNameWithRestrictedCharacters = new ArrayList<>();
     List<String> filesNotFound = new ArrayList<>();
     List<String> filesWithUnsupportedProperties = new ArrayList<>();
+    List<String> extensionChangedFiles = new ArrayList<>();
     Map<String, String> badRequest = new HashMap<>();
     Map<String, String> propertyTitles = new HashMap<>();
     List<String> noSDMRoles = new ArrayList<>();
@@ -229,7 +230,8 @@ private void renameDocument(
             filesWithUnsupportedProperties,
             badRequest,
             secondaryPropertiesWithInvalidDefinitions,
-            noSDMRoles);
+            noSDMRoles,
+            extensionChangedFiles);
       }
     }
     handleWarnings(
@@ -241,6 +243,7 @@ private void renameDocument(
         badRequest,
         propertyTitles,
         noSDMRoles,
+        extensionChangedFiles,
         contextInfo);
   }
 
@@ -254,7 +257,8 @@ private void processAttachments(
       List<String> filesWithUnsupportedProperties,
       Map<String, String> badRequest,
       Map<String, String> secondaryPropertiesWithInvalidDefinitions,
-      List<String> noSDMRoles)
+      List<String> noSDMRoles,
+      List<String> extensionChangedFiles)
       throws IOException {
     logger.debug("Processing {} attachments for update", attachments.size());
     List<String> scanFailedFiles = new ArrayList<>();
@@ -275,7 +279,8 @@ private void processAttachments(
           secondaryPropertiesWithInvalidDefinitions,
           noSDMRoles,
           scanFailedFiles,
-          uploadInProgressFiles);
+          uploadInProgressFiles,
+          extensionChangedFiles);
     }
 
     // Throw exception if any files failed scan or upload in progress
@@ -319,7 +324,8 @@ public void processAttachment(
       Map<String, String> secondaryPropertiesWithInvalidDefinitions,
       List<String> noSDMRoles,
       List<String> scanFailedFiles,
-      List<String> uploadInProgressFiles)
+      List<String> uploadInProgressFiles,
+      List<String> extensionChangedFiles)
       throws IOException {
     String id = (String) attachment.get("ID");
     String filenameInRequest = (String) attachment.get("fileName");
@@ -354,6 +360,7 @@ public void processAttachment(
         dbQuery.getPropertiesForID(
             attachmentEntity.get(), persistenceService, id, secondaryTypeProperties);
 
+    int extensionWarningsBefore = extensionChangedFiles.size();
     Map<String, String> updatedSecondaryProperties =
         prepareUpdatedProperties(
             attachmentEntity,
@@ -363,7 +370,13 @@ public void processAttachment(
             details.fileNameInDB,
             details.descriptionInDB,
             secondaryTypeProperties,
-            propertiesInDB);
+            propertiesInDB,
+            extensionChangedFiles);
+
+    // If extension change was detected, revert filename to original
+    if (extensionChangedFiles.size() > extensionWarningsBefore) {
+      attachment.put("fileName", details.fileNameInDB);
+    }
 
     if (updatedSecondaryProperties.isEmpty()) {
       logger.debug("No changes detected for attachment ID: {}, skipping SDM update", id);
@@ -459,7 +472,8 @@ private Map<String, String> prepareUpdatedProperties(
       String fileNameInDB,
       String descriptionInDB,
       Map<String, String> secondaryTypeProperties,
-      Map<String, String> propertiesInDB) {
+      Map<String, String> propertiesInDB,
+      List<String> extensionChangedFiles) {
     Map<String, String> updatedSecondaryProperties =
         SDMUtils.getUpdatedSecondaryProperties(
             attachmentEntity,
@@ -469,7 +483,11 @@ private Map<String, String> prepareUpdatedProperties(
             propertiesInDB);
 
     AttachmentsHandlerUtils.updateFilenameProperty(
-        fileNameInDB, filenameInRequest, fileNameInDB, updatedSecondaryProperties);
+        fileNameInDB,
+        filenameInRequest,
+        fileNameInDB,
+        updatedSecondaryProperties,
+        extensionChangedFiles);
 
     AttachmentsHandlerUtils.updateDescriptionProperty(
         null, descriptionInRequest, descriptionInDB, updatedSecondaryProperties, true);
@@ -563,7 +581,14 @@ private void handleWarnings(
       Map<String, String> badRequest,
       Map<String, String> propertyTitles,
       List<String> noSDMRoles,
+      List<String> extensionChangedFiles,
       String contextInfo) {
+    if (!extensionChangedFiles.isEmpty()) {
+      logger.warn("File extension change attempted for files: {}", extensionChangedFiles);
+      for (String warningMessage : extensionChangedFiles) {
+        context.getMessages().warn(warningMessage);
+      }
+    }
     if (!fileNameWithRestrictedCharacters.isEmpty()) {
       logger.warn(
           "Files with restricted characters in filename: {}", fileNameWithRestrictedCharacters);

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/helper/AttachmentsHandlerUtils.java

@@ -664,14 +664,17 @@ public static JSONObject fetchAttachmentDataFromSDM(
    *
    * @param fileNameInDB the filename currently in the database
    * @param filenameInRequest the filename from the request
+   * @param fileNameInSDM the filename in SDM
    * @param updatedSecondaryProperties the map to update
+   * @param extensionChangedFiles list to collect filenames where extension change was attempted
    * @throws ServiceException if filename validation fails
    */
   public static void updateFilenameProperty(
       String fileNameInDB,
       String filenameInRequest,
       String fileNameInSDM,
-      Map<String, String> updatedSecondaryProperties)
+      Map<String, String> updatedSecondaryProperties,
+      List<String> extensionChangedFiles)
       throws ServiceException {
     logger.debug(
         "Updating filename property - DB: {}, Request: {}, SDM: {}",
@@ -681,6 +684,9 @@ public static void updateFilenameProperty(
     if (fileNameInDB == null) {
       if (filenameInRequest != null) {
         if (!filenameInRequest.equals(fileNameInSDM)) {
+          if (isFileExtensionChanged(fileNameInSDM, filenameInRequest, extensionChangedFiles)) {
+            return;
+          }
           logger.debug(
               "Filename updated from SDM value: {} to request value: {}",
               fileNameInSDM,
@@ -696,6 +702,9 @@ public static void updateFilenameProperty(
         logger.warn("Filename validation failed: filename cannot be empty");
         throw new ServiceException("Filename cannot be empty");
       } else if (!fileNameInDB.equals(filenameInRequest)) {
+        if (isFileExtensionChanged(fileNameInDB, filenameInRequest, extensionChangedFiles)) {
+          return;
+        }
         logger.debug(
             "Filename updated from DB value: {} to request value: {}",
             fileNameInDB,
@@ -705,6 +714,30 @@ public static void updateFilenameProperty(
     }
   }
 
+  /**
+   * Checks if the file extension has changed. If so, adds a warning message to the list and returns
+   * true, indicating the rename should be skipped and the filename reverted.
+   *
+   * @param originalFileName the original filename (from DB or SDM)
+   * @param newFileName the new filename from the request
+   * @param extensionChangedFiles list to collect warning messages
+   * @return true if extension changed (rename should be skipped), false otherwise
+   */
+  private static boolean isFileExtensionChanged(
+      String originalFileName, String newFileName, List<String> extensionChangedFiles) {
+    if (SDMUtils.hasFileExtensionChanged(originalFileName, newFileName)) {
+      String originalExtension = SDMUtils.getFileExtension(originalFileName);
+      logger.warn("File extension change attempted: {} -> {}", originalFileName, newFileName);
+      extensionChangedFiles.add(
+          String.format(
+              SDMUtils.getErrorMessage("FILE_EXTENSION_CHANGE_NOT_ALLOWED"),
+              newFileName,
+              originalExtension));
+      return true;
+    }
+    return false;
+  }
+
   public static void updateDescriptionProperty(
       String descriptionInDB,
       String descriptionInRequest,

sdm/src/main/java/com/sap/cds/sdm/utilities/SDMUtils.java

@@ -134,6 +134,42 @@ public static boolean hasRestrictedCharactersInName(String cmisName) {
     return matcher.find();
   }
 
+  /**
+   * Extracts the file extension from a filename (lowercase, including the dot).
+   *
+   * @param fileName the filename to extract the extension from
+   * @return the file extension (e.g. ".pdf"), or empty string if no valid extension exists
+   */
+  public static String getFileExtension(String fileName) {
+    if (fileName == null || fileName.isEmpty()) {
+      return "";
+    }
+    int lastDotIndex = fileName.lastIndexOf('.');
+    if (lastDotIndex <= 0 || lastDotIndex == fileName.length() - 1) {
+      return "";
+    }
+    return fileName.substring(lastDotIndex).toLowerCase();
+  }
+
+  /**
+   * Checks whether the file extension has changed between the original and new filename.
+   *
+   * @param originalFileName the original filename
+   * @param newFileName the new filename
+   * @return true if the extension has changed, false otherwise
+   */
+  public static boolean hasFileExtensionChanged(String originalFileName, String newFileName) {
+    if (originalFileName == null || newFileName == null) {
+      return false;
+    }
+    String originalExtension = getFileExtension(originalFileName);
+    String newExtension = getFileExtension(newFileName);
+    if (originalExtension.isEmpty() || newExtension.isEmpty()) {
+      return false;
+    }
+    return !originalExtension.equals(newExtension);
+  }
+
   public static void prepareSecondaryProperties(
       Map<String, String> requestBody,
       Map<String, String> secondaryProperties,

sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_Chapters_MultipleFacet.java

@@ -552,7 +552,7 @@ void testCreateChapterAttachmentsWithUnsupportedCharacter() throws IOException {
         return;
       }
 
-      String restrictedName = "a/\\bc.pdf"; // \b becomes BACKSPACE
+      String restrictedName = "a/\\bc.txt"; // \b becomes BACKSPACE
       response =
           api.renameAttachment(
               appUrl, chapterEntityName, facet[i], chapterID, ID2[i], restrictedName);
@@ -575,15 +575,15 @@ void testCreateChapterAttachmentsWithUnsupportedCharacter() throws IOException {
 
     // ---------------- EXPECTED MESSAGE (EXACT) ----------------
     String expectedMessage =
-        "\"a/\\bc.pdf\" contains unsupported characters ('/' or '\\'). Rename and try again.\n\n"
+        "\"a/\\bc.txt\" contains unsupported characters ('/' or '\\'). Rename and try again.\n\n"
             + "Table: attachments\n"
             + "Page: IntegrationTestEntity";
 
     if (message.equals(expectedMessage)) {
 
       for (int i = 0; i < facet.length; i++) {
         api.renameAttachment(
-            appUrl, chapterEntityName, facet[i], chapterID, ID2[i], "sample123.pdf");
+            appUrl, chapterEntityName, facet[i], chapterID, ID2[i], "sample123.txt");
       }
 
       response = api.saveEntityDraft(appUrl, bookEntityName, srvpath, bookID);
@@ -610,11 +610,11 @@ void testRenameSingleDuplicateInChapter() throws IOException {
 
     if ("Entity in draft mode".equals(response)) {
       // To create a duplicate within the same facet, we need to rename ID2[i] to
-      // the same name as an existing file in that facet. The existing files are:
-      // sample.pdf (ID[0]), sample.txt (ID[1]), sample.exe (ID[2]) - these are the first uploads
-      // We rename ID2[i] (sample123.pdf from test 8) to "sample.pdf" which already exists
-      String[] duplicateNames = {"sample.pdf", "sample.txt", "sample.exe"};
-      String[] validNames = {"unique_sample1.pdf", "unique_sample2.txt", "unique_sample3.exe"};
+      // the same name as an existing file in that facet. After test 7, the existing files are:
+      // sample123 (ID[0]), reference123 (ID[1]), footnote123 (ID[2])
+      // We rename ID2[i] (sample123.txt from test 8) to these names which already exist
+      String[] duplicateNames = {"sample123", "reference123", "footnote123"};
+      String[] validNames = {"unique_sample1.txt", "unique_sample2.txt", "unique_sample3.txt"};
 
       // Try to rename to duplicate file names (names that already exist in each facet)
       for (int i = 0; i < facet.length; i++) {

sdm/src/test/java/unit/com/sap/cds/sdm/handler/applicationservice/SDMUpdateAttachmentsHandlerTest.java

@@ -406,7 +406,7 @@ public void testRenameWithNoSDMRoles() throws IOException {
           .when(
               () ->
                   AttachmentsHandlerUtils.updateFilenameProperty(
-                      anyString(), anyString(), anyString(), any(Map.class)))
+                      anyString(), anyString(), anyString(), any(Map.class), any(List.class)))
           .thenAnswer(invocation -> null);
 
       attachmentsMockStatic

sdm/src/test/java/unit/com/sap/cds/sdm/utilities/SDMUtilsTest.java

@@ -150,6 +150,16 @@ public void testIsRestrictedCharactersInName() {
     assertFalse(SDMUtils.hasRestrictedCharactersInName(null));
   }
 
+  @Test
+  public void testHasFileExtensionChanged() {
+    assertTrue(SDMUtils.hasFileExtensionChanged("sample.pdf", "sample.dmg"));
+    assertFalse(SDMUtils.hasFileExtensionChanged("sample.pdf", "renamed.pdf"));
+    assertFalse(SDMUtils.hasFileExtensionChanged(null, "file.txt"));
+    assertFalse(SDMUtils.hasFileExtensionChanged("file.txt", null));
+    assertFalse(SDMUtils.hasFileExtensionChanged("sample.pdf", "sample123"));
+    assertFalse(SDMUtils.hasFileExtensionChanged("sample", "sample123"));
+  }
+
   @Test
   public void prepareSecondaryPropertiesTest_withFilenameKey() {
     Map<String, String> requestBody = new HashMap<>();