improvements

Author: Schmarvinius

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java

@@ -112,17 +112,7 @@ private void deleteRemovedAttachments(
         ApplicationHandlerHelper.condenseAttachments(requestData, entity);
 
     for (Attachments dbAttachment : dbAttachments) {
-      Map<String, Object> dbKeys = new HashMap<>();
-      entity
-          .keyElements()
-          .forEach(
-              keyElement -> {
-                String keyName = keyElement.getName();
-                Object value = dbAttachment.get(keyName);
-                if (value != null) {
-                  dbKeys.put(keyName, value);
-                }
-              });
+      Map<String, Object> dbKeys = ApplicationHandlerHelper.extractKeys(dbAttachment, entity);
       Map<String, Object> keys = ApplicationHandlerHelper.removeDraftKey(dbKeys);
 
       boolean existsInRequest =

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

@@ -13,6 +13,7 @@
 import com.sap.cds.feature.attachments.handler.common.ApplicationHandlerHelper;
 import com.sap.cds.ql.cqn.Path;
 import com.sap.cds.reflect.CdsEntity;
+import com.sap.cds.services.ErrorStatus;
 import com.sap.cds.services.ErrorStatuses;
 import com.sap.cds.services.EventContext;
 import com.sap.cds.services.ServiceException;
@@ -84,12 +85,8 @@ public static InputStream handleAttachmentForEntity(
         }
       } catch (ArithmeticException e) {
         throw new ServiceException("Maximum file size value is too large", e);
-      } catch (RuntimeException e) {
-        throw new ServiceException(
-            ExtendedErrorStatuses.CONTENT_TOO_LARGE, "AttachmentSizeExceeded", maxSizeStr);
-      } catch (Exception e) {
-        throw new ServiceException(
-            ErrorStatuses.BAD_REQUEST, "Failed to process attachment size", e);
+      } catch (IllegalArgumentException e) {
+        throw new ServiceException(ErrorStatuses.BAD_REQUEST, "Failed to process attachment size");
       }
     }