simplification

Author: Schmarvinius

storage-targets/cds-feature-attachments-oss/src/main/java/com/sap/cds/feature/attachments/oss/handler/OSSAttachmentsServiceHandler.java

@@ -154,70 +154,34 @@ void restoreAttachment(AttachmentRestoreEventContext context) {
 
   @On
   void readAttachment(AttachmentReadEventContext context) {
+    String contentId = context.getContentId();
     logger.info(
         "OS Attachment Service handler called for reading attachment with document id: {}",
-        context.getContentId());
-    try {
-      Future<InputStream> future = osClient.readContent(context.getContentId());
-      InputStream inputStream = future.get(); // Wait for the content to be read
-      if (inputStream != null) {
-        // Wrap to convert any checked IOExceptions during reads into UncheckedIOException,
-        // so we can map them to ServiceException consistently without closing the stream here.
-        InputStream safeInputStream =
-            new java.io.FilterInputStream(inputStream) {
-              @Override
-              public int read() {
-                try {
-                  return super.read();
-                } catch (java.io.IOException e) {
-                  throw new java.io.UncheckedIOException(e);
-                }
-              }
+        contentId);
 
-              @Override
-              public int read(byte[] b, int off, int len) {
-                try {
-                  return super.read(b, off, len);
-                } catch (java.io.IOException e) {
-                  throw new java.io.UncheckedIOException(e);
-                }
-              }
-
-              @Override
-              public int read(byte[] b) {
-                try {
-                  return super.read(b);
-                } catch (java.io.IOException e) {
-                  throw new java.io.UncheckedIOException(e);
-                }
-              }
-            };
+    try {
+      // Get the stream from the client (blocking wait)
+      InputStream inputStream = osClient.readContent(contentId).get();
 
-        try {
-          // Do not close the stream here; CAP runtime will stream and close it
-          context.getData().setContent(safeInputStream);
-        } catch (RuntimeException rte) {
-          if (rte instanceof java.io.UncheckedIOException) {
-            throw new ServiceException(
-                "Failed to read file with document id {}", context.getContentId(), rte.getCause());
-          }
-          throw rte;
-        }
+      if (inputStream != null) {
+        // Pass the open stream directly.
+        // CAP runtime will stream it to the client and close it automatically.
+        context.getData().setContent(inputStream);
       } else {
-        logger.error("Document not found for id {}", context.getContentId());
+        logger.error("Document not found for id {}", contentId);
         throw new AttachmentNotFoundException(
-            "Document not found for id " + context.getContentId(), context.getContentId());
+            "Document not found for id " + contentId, contentId);
       }
     } catch (InterruptedException ex) {
       Thread.currentThread().interrupt();
       throw new ServiceException(
-          "Failed to read file with document id {}", context.getContentId(), ex);
+          "Failed to read file with document id {}", contentId, ex);
     } catch (AttachmentNotFoundException ex) {
       throw new ServiceException(
-          "Attachment not found with document id {}", context.getContentId(), ex);
+          "Attachment not found with document id {}", contentId, ex);
     } catch (ObjectStoreServiceException | ExecutionException ex) {
       throw new ServiceException(
-          "Failed to read file with document id {}", context.getContentId(), ex);
+          "Failed to read file with document id {}", contentId, ex);
     } finally {
       context.setCompleted();
     }