diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml
index 1e70c005c..77cb2a61c 100644
--- a/cds-feature-attachments/pom.xml
+++ b/cds-feature-attachments/pom.xml
@@ -78,13 +78,13 @@
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>
-      <version>4.10.1</version>
+      <version>4.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.34</version>
+      <version>1.5.37</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/CreateAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/CreateAttachmentsHandler.java
index 77f58f66e..c5c2c863a 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/CreateAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/CreateAttachmentsHandler.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.applicationservice;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.CdsData;
 import com.sap.cds.feature.attachments.handler.applicationservice.helper.ExtendedErrorStatuses;
 import com.sap.cds.feature.attachments.handler.applicationservice.helper.ModifyApplicationHandlerHelper;
@@ -51,10 +49,10 @@ public CreateAttachmentsHandler(
       ThreadDataStorageReader storageReader,
       String defaultMaxSize,
       CdsRuntime cdsRuntime) {
-    this.eventFactory = requireNonNull(eventFactory, "eventFactory must not be null");
-    this.storageReader = requireNonNull(storageReader, "storageReader must not be null");
-    this.defaultMaxSize = requireNonNull(defaultMaxSize, "defaultMaxSize must not be null");
-    this.cdsRuntime = requireNonNull(cdsRuntime, "cdsRuntime must not be null");
+    this.eventFactory = eventFactory;
+    this.storageReader = storageReader;
+    this.defaultMaxSize = defaultMaxSize;
+    this.cdsRuntime = cdsRuntime;
   }
 
   @Before
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/DeleteAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/DeleteAttachmentsHandler.java
index a11f3e6da..32185044f 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/DeleteAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/DeleteAttachmentsHandler.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.applicationservice;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.CdsDataProcessor;
 import com.sap.cds.CdsDataProcessor.Converter;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
@@ -36,9 +34,8 @@ public class DeleteAttachmentsHandler implements EventHandler {
 
   public DeleteAttachmentsHandler(
       AttachmentsReader attachmentsReader, MarkAsDeletedAttachmentEvent deleteEvent) {
-    this.attachmentsReader =
-        requireNonNull(attachmentsReader, "attachmentsReader must not be null");
-    this.deleteEvent = requireNonNull(deleteEvent, "deleteEvent must not be null");
+    this.attachmentsReader = attachmentsReader;
+    this.deleteEvent = deleteEvent;
   }
 
   @Before
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java
index 253e57d20..0848702cb 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java
@@ -4,7 +4,6 @@
 package com.sap.cds.feature.attachments.handler.applicationservice;
 
 import static java.util.Objects.nonNull;
-import static java.util.Objects.requireNonNull;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor;
@@ -82,13 +81,11 @@ public ReadAttachmentsHandler(
       PersistenceService persistenceService,
       AssociationCascader cascader,
       boolean scannerAvailable) {
-    this.attachmentService =
-        requireNonNull(attachmentService, "attachmentService must not be null");
-    this.statusValidator = requireNonNull(statusValidator, "statusValidator must not be null");
-    this.scanExecutor = requireNonNull(scanExecutor, "scanExecutor must not be null");
-    this.persistenceService =
-        requireNonNull(persistenceService, "persistenceService must not be null");
-    this.cascader = requireNonNull(cascader, "cascader must not be null");
+    this.attachmentService = attachmentService;
+    this.statusValidator = statusValidator;
+    this.scanExecutor = scanExecutor;
+    this.persistenceService = persistenceService;
+    this.cascader = cascader;
     this.scannerAvailable = scannerAvailable;
   }
 
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java
index 0747b36c2..7e7b06c6c 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.applicationservice;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.CdsData;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.handler.applicationservice.helper.ModifyApplicationHandlerHelper;
@@ -53,13 +51,11 @@ public UpdateAttachmentsHandler(
       AttachmentService attachmentService,
       ThreadDataStorageReader storageReader,
       String defaultMaxSize) {
-    this.eventFactory = requireNonNull(eventFactory, "eventFactory must not be null");
-    this.attachmentsReader =
-        requireNonNull(attachmentsReader, "attachmentsReader must not be null");
-    this.attachmentService =
-        requireNonNull(attachmentService, "attachmentService must not be null");
-    this.storageReader = requireNonNull(storageReader, "storageReader must not be null");
-    this.defaultMaxSize = requireNonNull(defaultMaxSize, "defaultMaxSize must not be null");
+    this.eventFactory = eventFactory;
+    this.attachmentsReader = attachmentsReader;
+    this.attachmentService = attachmentService;
+    this.storageReader = storageReader;
+    this.defaultMaxSize = defaultMaxSize;
   }
 
   @Before
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/CreateAttachmentEvent.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/CreateAttachmentEvent.java
index 284ffa127..530dddbe1 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/CreateAttachmentEvent.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/CreateAttachmentEvent.java
@@ -4,7 +4,6 @@
 package com.sap.cds.feature.attachments.handler.applicationservice.modifyevents;
 
 import static java.util.Objects.nonNull;
-import static java.util.Objects.requireNonNull;
 
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.MediaData;
@@ -44,9 +43,8 @@ public class CreateAttachmentEvent implements ModifyAttachmentEvent {
 
   public CreateAttachmentEvent(
       AttachmentService attachmentService, ListenerProvider listenerProvider) {
-    this.attachmentService =
-        requireNonNull(attachmentService, "attachmentService must not be null");
-    this.listenerProvider = requireNonNull(listenerProvider, "listenerProvider must not be null");
+    this.attachmentService = attachmentService;
+    this.listenerProvider = listenerProvider;
   }
 
   @Override
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/MarkAsDeletedAttachmentEvent.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/MarkAsDeletedAttachmentEvent.java
index c1316ee9f..1e9423bf2 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/MarkAsDeletedAttachmentEvent.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/MarkAsDeletedAttachmentEvent.java
@@ -4,7 +4,6 @@
 package com.sap.cds.feature.attachments.handler.applicationservice.modifyevents;
 
 import static java.util.Objects.nonNull;
-import static java.util.Objects.requireNonNull;
 
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.service.AttachmentService;
@@ -27,8 +26,7 @@ public class MarkAsDeletedAttachmentEvent implements ModifyAttachmentEvent {
   private final AttachmentService attachmentService;
 
   public MarkAsDeletedAttachmentEvent(AttachmentService attachmentService) {
-    this.attachmentService =
-        requireNonNull(attachmentService, "attachmentService must not be null");
+    this.attachmentService = attachmentService;
   }
 
   @Override
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/ModifyAttachmentEventFactory.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/ModifyAttachmentEventFactory.java
index c74c6726b..a075d8be6 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/ModifyAttachmentEventFactory.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/ModifyAttachmentEventFactory.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.applicationservice.modifyevents;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.CdsData;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.service.AttachmentService;
@@ -37,10 +35,10 @@ public ModifyAttachmentEventFactory(
       UpdateAttachmentEvent updateEvent,
       MarkAsDeletedAttachmentEvent deleteEvent,
       DoNothingAttachmentEvent doNothingEvent) {
-    this.createEvent = requireNonNull(createEvent, "createEvent must not be null");
-    this.updateEvent = requireNonNull(updateEvent, "updateEvent must not be null");
-    this.deleteEvent = requireNonNull(deleteEvent, "deleteEvent must not be null");
-    this.doNothingEvent = requireNonNull(doNothingEvent, "doNothingEvent must not be null");
+    this.createEvent = createEvent;
+    this.updateEvent = updateEvent;
+    this.deleteEvent = deleteEvent;
+    this.doNothingEvent = doNothingEvent;
   }
 
   /**
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/UpdateAttachmentEvent.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/UpdateAttachmentEvent.java
index a178be89d..05afd4d13 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/UpdateAttachmentEvent.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/modifyevents/UpdateAttachmentEvent.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.applicationservice.modifyevents;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.service.AttachmentService;
 import com.sap.cds.ql.cqn.Path;
@@ -28,8 +26,8 @@ public class UpdateAttachmentEvent implements ModifyAttachmentEvent {
 
   public UpdateAttachmentEvent(
       CreateAttachmentEvent createEvent, MarkAsDeletedAttachmentEvent deleteEvent) {
-    this.createEvent = requireNonNull(createEvent, "createEvent must not be null");
-    this.deleteEvent = requireNonNull(deleteEvent, "deleteEvent must not be null");
+    this.createEvent = createEvent;
+    this.deleteEvent = deleteEvent;
   }
 
   @Override
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/transaction/CreationChangeSetListener.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/transaction/CreationChangeSetListener.java
index 62fa0b5ce..52272fcce 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/transaction/CreationChangeSetListener.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/transaction/CreationChangeSetListener.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.applicationservice.transaction;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.feature.attachments.service.AttachmentService;
 import com.sap.cds.feature.attachments.service.model.service.MarkAsDeletedInput;
 import com.sap.cds.services.changeset.ChangeSetContext;
@@ -33,10 +31,9 @@ public class CreationChangeSetListener implements ChangeSetListener {
    */
   public CreationChangeSetListener(
       String contentId, CdsRuntime cdsRuntime, AttachmentService attachmentService) {
-    this.contentId = requireNonNull(contentId, "contentId must not be null");
-    this.cdsRuntime = requireNonNull(cdsRuntime, "cdsRuntime must not be null");
-    this.attachmentService =
-        requireNonNull(attachmentService, "attachmentService must not be null");
+    this.contentId = contentId;
+    this.cdsRuntime = cdsRuntime;
+    this.attachmentService = attachmentService;
   }
 
   @Override
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/common/AttachmentsReader.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/common/AttachmentsReader.java
index 136d32c7d..2317567b0 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/common/AttachmentsReader.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/common/AttachmentsReader.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.common;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.Result;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.ql.CQL;
@@ -35,8 +33,8 @@ public class AttachmentsReader {
   private final PersistenceService persistence;
 
   public AttachmentsReader(AssociationCascader cascader, PersistenceService persistence) {
-    this.cascader = requireNonNull(cascader, "cascader must not be null");
-    this.persistence = requireNonNull(persistence, "persistence must not be null");
+    this.cascader = cascader;
+    this.persistence = persistence;
   }
 
   public List<Attachments> readAttachments(
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftActiveAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftActiveAttachmentsHandler.java
index 2c7dd6996..00a736d64 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftActiveAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftActiveAttachmentsHandler.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.draftservice;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.feature.attachments.handler.applicationservice.helper.ThreadDataStorageSetter;
 import com.sap.cds.services.draft.DraftSaveEventContext;
 import com.sap.cds.services.draft.DraftService;
@@ -18,8 +16,7 @@ public class DraftActiveAttachmentsHandler implements EventHandler {
   private final ThreadDataStorageSetter threadLocalSetter;
 
   public DraftActiveAttachmentsHandler(ThreadDataStorageSetter threadLocalSetter) {
-    this.threadLocalSetter =
-        requireNonNull(threadLocalSetter, "threadLocalSetter must not be null");
+    this.threadLocalSetter = threadLocalSetter;
   }
 
   @On
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java
index 82978dcf0..d785d5c08 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.draftservice;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor;
 import com.sap.cds.CdsDataProcessor.Filter;
@@ -50,9 +48,8 @@ public class DraftCancelAttachmentsHandler implements EventHandler {
 
   public DraftCancelAttachmentsHandler(
       AttachmentsReader attachmentsReader, MarkAsDeletedAttachmentEvent deleteEvent) {
-    this.attachmentsReader =
-        requireNonNull(attachmentsReader, "attachmentsReader must not be null");
-    this.deleteEvent = requireNonNull(deleteEvent, "deleteEvent must not be null");
+    this.attachmentsReader = attachmentsReader;
+    this.deleteEvent = deleteEvent;
   }
 
   @Before
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java
index 5d66dbc96..d62134bd7 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.handler.draftservice;
 
-import static java.util.Objects.requireNonNull;
-
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor;
 import com.sap.cds.CdsDataProcessor.Converter;
@@ -46,9 +44,9 @@ public DraftPatchAttachmentsHandler(
       PersistenceService persistence,
       ModifyAttachmentEventFactory eventFactory,
       String defaultMaxSize) {
-    this.persistence = requireNonNull(persistence, "persistence must not be null");
-    this.eventFactory = requireNonNull(eventFactory, "eventFactory must not be null");
-    this.defaultMaxSize = requireNonNull(defaultMaxSize, "defaultMaxSize must not be null");
+    this.persistence = persistence;
+    this.eventFactory = eventFactory;
+    this.defaultMaxSize = defaultMaxSize;
   }
 
   @Before
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/handler/DefaultAttachmentsServiceHandler.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/handler/DefaultAttachmentsServiceHandler.java
index c14217499..d07ae9341 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/handler/DefaultAttachmentsServiceHandler.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/handler/DefaultAttachmentsServiceHandler.java
@@ -17,7 +17,6 @@
 import com.sap.cds.services.handler.annotations.HandlerOrder;
 import com.sap.cds.services.handler.annotations.On;
 import com.sap.cds.services.handler.annotations.ServiceName;
-import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,8 +40,7 @@ public class DefaultAttachmentsServiceHandler implements EventHandler {
   private final EndTransactionMalwareScanProvider malwareScanProvider;
 
   public DefaultAttachmentsServiceHandler(EndTransactionMalwareScanProvider malwareScanProvider) {
-    this.malwareScanProvider =
-        Objects.requireNonNull(malwareScanProvider, "malwareScanProvider must not be null");
+    this.malwareScanProvider = malwareScanProvider;
   }
 
   @On
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java
index 8f22ad570..46cc5f1c2 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/DefaultAttachmentMalwareScanner.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.service.malware;
 
-import static java.util.Objects.requireNonNull;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.sap.cds.Result;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
@@ -59,10 +57,8 @@ public DefaultAttachmentMalwareScanner(
       PersistenceService persistenceService,
       AttachmentService attachmentService,
       MalwareScanClient malwareScanClient) {
-    this.persistenceService =
-        requireNonNull(persistenceService, "persistenceService must not be null");
-    this.attachmentService =
-        requireNonNull(attachmentService, "attachmentService must not be null");
+    this.persistenceService = persistenceService;
+    this.attachmentService = attachmentService;
     this.malwareScanClient = malwareScanClient;
   }
 
diff --git a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/client/DefaultMalwareScanClient.java b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/client/DefaultMalwareScanClient.java
index fb299334d..b9ec7b344 100644
--- a/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/client/DefaultMalwareScanClient.java
+++ b/cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/client/DefaultMalwareScanClient.java
@@ -3,8 +3,6 @@
  */
 package com.sap.cds.feature.attachments.service.malware.client;
 
-import static java.util.Objects.requireNonNull;
-
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.cds.services.ServiceException;
@@ -43,7 +41,7 @@ public class DefaultMalwareScanClient implements MalwareScanClient {
    * @throws NullPointerException if the {@code clientProviderFactory} is {@code null}.
    */
   public DefaultMalwareScanClient(HttpClientProvider clientProvider) {
-    this.clientProvider = requireNonNull(clientProvider, "clientProvider must not be null");
+    this.clientProvider = clientProvider;
   }
 
   @Override
diff --git a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/ModifyApplicationHandlerHelperTest.java b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/ModifyApplicationHandlerHelperTest.java
index 489017824..3c529434a 100644
--- a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/ModifyApplicationHandlerHelperTest.java
+++ b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/ModifyApplicationHandlerHelperTest.java
@@ -126,8 +126,9 @@ void serviceExceptionDueToLimitExceeded() {
               if (wrappedContent != null) {
                 // Read all bytes - this will trigger CountingInputStream to throw
                 byte[] buffer = new byte[1024];
-                while (wrappedContent.read(buffer) != -1) {
-                  // Keep reading until exception or EOF
+                int bytesRead;
+                while ((bytesRead = wrappedContent.read(buffer)) != -1) {
+                  assertThat(bytesRead).isPositive(); // use value to satisfy SpotBugs
                 }
               }
               return null;
diff --git a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/readhelper/CountingInputStreamTest.java b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/readhelper/CountingInputStreamTest.java
index e1245d79b..e9d9c5e55 100644
--- a/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/readhelper/CountingInputStreamTest.java
+++ b/cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/readhelper/CountingInputStreamTest.java
@@ -15,6 +15,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
 
@@ -137,16 +138,10 @@ void read_exceedsLimit_exceptionContainsMaxSizeString() {
     var data = "hello world".getBytes(StandardCharsets.UTF_8); // 11 bytes
     var delegate = new ByteArrayInputStream(data);
     var cut = new CountingInputStream(delegate, "5"); // limit is 5 bytes
+    var nullOut = OutputStream.nullOutputStream();
 
     ServiceException exception =
-        assertThrows(
-            ServiceException.class,
-            () -> {
-              byte[] buffer = new byte[1024];
-              while (cut.read(buffer) != -1) {
-                // read until exception
-              }
-            });
+        assertThrows(ServiceException.class, () -> cut.transferTo(nullOut));
 
     assertThat(exception.getErrorStatus()).isEqualTo(ExtendedErrorStatuses.CONTENT_TOO_LARGE);
   }
@@ -156,16 +151,10 @@ void read_bulkRead_exceedsLimit_throwsServiceException() {
     var data = "hello world test".getBytes(StandardCharsets.UTF_8); // 16 bytes
     var delegate = new ByteArrayInputStream(data);
     var cut = new CountingInputStream(delegate, "10");
+    var nullOut = OutputStream.nullOutputStream();
 
     ServiceException exception =
-        assertThrows(
-            ServiceException.class,
-            () -> {
-              byte[] buffer = new byte[1024];
-              while (cut.read(buffer) != -1) {
-                // read until exception
-              }
-            });
+        assertThrows(ServiceException.class, () -> cut.transferTo(nullOut));
 
     assertThat(exception.getErrorStatus()).isEqualTo(ExtendedErrorStatuses.CONTENT_TOO_LARGE);
     assertThat(cut.isLimitExceeded()).isTrue();
@@ -231,8 +220,9 @@ void constructor_parsesKB() throws IOException {
     assertDoesNotThrow(
         () -> {
           byte[] buffer = new byte[1024];
-          while (cut.read(buffer) != -1) {
-            // read all bytes
+          int bytesRead;
+          while ((bytesRead = cut.read(buffer)) != -1) {
+            assertThat(bytesRead).isPositive(); // use value to satisfy SpotBugs
           }
         });
   }
diff --git a/integration-tests/generic/src/main/java/com/sap/cds/feature/attachments/integrationtests/testhandler/TestPluginAttachmentsServiceHandler.java b/integration-tests/generic/src/main/java/com/sap/cds/feature/attachments/integrationtests/testhandler/TestPluginAttachmentsServiceHandler.java
index 17e66fbf6..41cb92965 100644
--- a/integration-tests/generic/src/main/java/com/sap/cds/feature/attachments/integrationtests/testhandler/TestPluginAttachmentsServiceHandler.java
+++ b/integration-tests/generic/src/main/java/com/sap/cds/feature/attachments/integrationtests/testhandler/TestPluginAttachmentsServiceHandler.java
@@ -32,7 +32,7 @@
 @ServiceName(value = "*", type = AttachmentService.class)
 @Profile(Profiles.TEST_HANDLER_ENABLED)
 @Component
-public class TestPluginAttachmentsServiceHandler implements EventHandler {
+public final class TestPluginAttachmentsServiceHandler implements EventHandler {
 
   private static final Marker marker = MarkerFactory.getMarker("DUMMY_HANDLER");
   private static final Logger logger =
diff --git a/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationWithTestHandlerTest.java b/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationWithTestHandlerTest.java
index 3f5a01f5f..b8a7f5ba0 100644
--- a/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationWithTestHandlerTest.java
+++ b/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/DraftOdataRequestValidationWithTestHandlerTest.java
@@ -25,7 +25,7 @@
 import org.springframework.test.context.ActiveProfiles;
 
 @ActiveProfiles(Profiles.TEST_HANDLER_ENABLED)
-class DraftOdataRequestValidationWithTestHandlerTest extends DraftOdataRequestValidationBase {
+final class DraftOdataRequestValidationWithTestHandlerTest extends DraftOdataRequestValidationBase {
 
   private static final Logger logger =
       LoggerFactory.getLogger(DraftOdataRequestValidationWithTestHandlerTest.class);
diff --git a/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationWithTestHandlerTest.java b/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationWithTestHandlerTest.java
index 94fca3378..10818beba 100644
--- a/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationWithTestHandlerTest.java
+++ b/integration-tests/generic/src/test/java/com/sap/cds/feature/attachments/integrationtests/nondraftservice/OdataRequestValidationWithTestHandlerTest.java
@@ -23,7 +23,7 @@
 import org.springframework.test.context.ActiveProfiles;
 
 @ActiveProfiles(Profiles.TEST_HANDLER_ENABLED)
-class OdataRequestValidationWithTestHandlerTest extends OdataRequestValidationBase {
+final class OdataRequestValidationWithTestHandlerTest extends OdataRequestValidationBase {
 
   @Test
   void serviceHandlerAvailable() {
diff --git a/pom.xml b/pom.xml
index b84d0e645..716f4034a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,8 @@
 
     <excluded.generation.package>com/sap/cds/feature/attachments/generated/</excluded.generation.package>
 
-    <software.amazon.awssdk-s3-version>2.46.6</software.amazon.awssdk-s3-version>
-    <software.amazon.awssdk-crt-version>0.47.0</software.amazon.awssdk-crt-version>
+    <software.amazon.awssdk-s3-version>2.47.1</software.amazon.awssdk-s3-version>
+    <software.amazon.awssdk-crt-version>0.47.2</software.amazon.awssdk-crt-version>
 
     <!-- Latest versions of CAP Java and cds-dk used for integrations tests only -->
     <cds.services.version>5.0.0</cds.services.version>
@@ -89,7 +89,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
-        <version>4.2.15.Final</version>
+        <version>4.2.16.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -97,7 +97,7 @@
       <dependency>
         <groupId>com.sap.cloud.sdk</groupId>
         <artifactId>sdk-bom</artifactId>
-        <version>5.30.0</version>
+        <version>5.32.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -105,7 +105,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>6.1.0</version>
+        <version>6.1.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -191,7 +191,7 @@
         <plugin>
           <groupId>org.sonatype.central</groupId>
           <artifactId>central-publishing-maven-plugin</artifactId>
-          <version>0.10.0</version>
+          <version>0.11.0</version>
           <extensions>true</extensions>
         </plugin>
         <plugin>
@@ -243,7 +243,7 @@
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>4.9.8.3</version>
+          <version>4.10.2.0</version>
         </plugin>
         <plugin>
           <groupId>com.sap.cds</groupId>
@@ -367,7 +367,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.8.0</version>
         <configuration>
           <java>
             <googleJavaFormat>
diff --git a/storage-targets/cds-feature-attachments-oss/pom.xml b/storage-targets/cds-feature-attachments-oss/pom.xml
index 4ac7ecccd..d8b21fb23 100644
--- a/storage-targets/cds-feature-attachments-oss/pom.xml
+++ b/storage-targets/cds-feature-attachments-oss/pom.xml
@@ -45,13 +45,13 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.34.0</version>
+      <version>12.35.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.69.0</version>
+      <version>2.70.0</version>
     </dependency>
 
     <!-- TESTS -->