PR Review fixes - I

Author: samyuktaprabhu

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/mimeTypeValidation/AttachmentDataExtractor.java

@@ -70,10 +70,10 @@ private static String validateAndNormalize(String fileName) {
       throw new ServiceException(ErrorStatuses.BAD_REQUEST, "Filename must not be blank");
     }
 
-    int lastDotIndex = trimmedFileName.lastIndexOf('.');
-    if (lastDotIndex == -1 || lastDotIndex == trimmedFileName.length() - 1) {
+    if (trimmedFileName.endsWith(".")) {
       throw new ServiceException(ErrorStatuses.BAD_REQUEST, "Invalid filename format: " + fileName);
     }
+
     return trimmedFileName;
   }
 

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/mimeTypeValidation/MediaTypeService.java

@@ -54,21 +54,24 @@ public static boolean isMimeTypeAllowed(
       return false;
     }
 
-    if (acceptableMediaTypes == null
-        || acceptableMediaTypes.isEmpty()
-        || acceptableMediaTypes.contains("*/*")) return true;
+    if (acceptableMediaTypes == null || acceptableMediaTypes.isEmpty()) {
+      return true;
+    }
 
     String baseMimeType = mimeType.trim().toLowerCase();
     Collection<String> normalizedTypes =
         acceptableMediaTypes.stream().map(type -> type.trim().toLowerCase()).toList();
 
+    if (normalizedTypes.contains("*/*")) {
+      return true;
+    }
+
     return normalizedTypes.stream()
         .anyMatch(
-            type -> {
-              return type.endsWith("/*")
-                  ? baseMimeType.startsWith(type.substring(0, type.length() - 1))
-                  : baseMimeType.equals(type);
-            });
+            type ->
+                type.endsWith("/*")
+                    ? baseMimeType.startsWith(type.substring(0, type.length() - 1))
+                    : baseMimeType.equals(type));
   }
 
   private static String fallbackToDefaultMimeType(String fileName) {

integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/MediaValidatedAttachmentsNonDraftTest.java

@@ -108,7 +108,7 @@ void shouldRejectAttachment_whenFileHasNoExtension() throws Exception {
     requestHelper.executePostWithMatcher(
         createUrl(rootId, MEDIA_VALIDATED_ATTACHMENTS),
         attachmentMetadata,
-        status().isBadRequest());
+        status().isUnsupportedMediaType());
   }
 
   @Test