Add jspecify annotations

Author: afranken

pom.xml

@@ -99,7 +99,7 @@
     <docker-builder.image.name>s3mock-buildx</docker-builder.image.name>
     <docker-maven-plugin.version>0.46.0</docker-maven-plugin.version>
     <docker.image.name>adobe/s3mock</docker.image.name>
-
+    <jspecify.version>1.0.0</jspecify.version>
     <junit-jupiter.version>5.7.2</junit-jupiter.version>
     <junit.version>4.13.2</junit.version>
 
@@ -311,6 +311,11 @@
         <artifactId>httpmime</artifactId>
         <version>${httpmime.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jspecify</groupId>
+        <artifactId>jspecify</artifactId>
+        <version>${jspecify.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
@@ -607,6 +612,7 @@
           <version>${kotlin.version}</version>
           <extensions>true</extensions>
           <configuration>
+            <javaParameters>true</javaParameters>
             <args>
               <arg>-Xjsr305=strict</arg> <!-- Enable strict mode for JSR-305 annotations -->
             </args>

server/pom.xml

@@ -79,6 +79,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+    </dependency>
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

server/src/main/java/com/adobe/testing/s3mock/BucketController.java

@@ -57,6 +57,7 @@
 import com.adobe.testing.s3mock.dto.VersioningConfiguration;
 import com.adobe.testing.s3mock.service.BucketService;
 import com.adobe.testing.s3mock.store.BucketMetadata;
+import org.jspecify.annotations.Nullable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -138,7 +139,7 @@ public ResponseEntity<Void> createBucket(
           defaultValue = "false") boolean objectLockEnabled,
       @RequestHeader(value = X_AMZ_OBJECT_OWNERSHIP, required = false,
           defaultValue = "BucketOwnerEnforced") ObjectOwnership objectOwnership,
-      @RequestBody(required = false) CreateBucketConfiguration createBucketRequest) {
+      @RequestBody(required = false) @Nullable CreateBucketConfiguration createBucketRequest) {
     bucketService.verifyBucketNameIsAllowed(bucketName);
     bucketService.verifyBucketDoesNotExist(bucketName);
     bucketService.createBucket(bucketName,
@@ -369,9 +370,7 @@ public ResponseEntity<Void> deleteBucketLifecycleConfiguration(@PathVariable Str
   @S3Verified(year = 2025)
   public ResponseEntity<LocationConstraint> getBucketLocation(@PathVariable String bucketName) {
     BucketMetadata bucketMetadata = bucketService.verifyBucketExists(bucketName);
-    String bucketRegion = bucketMetadata.bucketRegion() != null
-        ? bucketMetadata.bucketRegion()
-        : region.toString();
+    String bucketRegion = bucketMetadata.bucketRegion();
     return ResponseEntity.ok(new LocationConstraint(bucketRegion));
   }
 
@@ -487,7 +486,7 @@ public ResponseEntity<ListVersionsResult> listObjectVersions(
     return ResponseEntity.ok(listVersionsResult);
   }
 
-  private String regionFrom(CreateBucketConfiguration createBucketRequest) {
+  private String regionFrom(@Nullable CreateBucketConfiguration createBucketRequest) {
     if (createBucketRequest != null
             && createBucketRequest.locationConstraint() != null
             && createBucketRequest.locationConstraint().region() != null) {

server/src/main/java/com/adobe/testing/s3mock/ChecksumModeHeaderConverter.java

@@ -17,11 +17,9 @@
 package com.adobe.testing.s3mock;
 
 import com.adobe.testing.s3mock.dto.ChecksumMode;
-import com.adobe.testing.s3mock.dto.ObjectOwnership;
 import com.adobe.testing.s3mock.util.AwsHttpHeaders;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 
 /**
  * Converts values of the {@link AwsHttpHeaders#X_AMZ_CHECKSUM_MODE} which is sent by the Amazon
@@ -33,7 +31,7 @@ class ChecksumModeHeaderConverter implements Converter<String, ChecksumMode> {
 
   @Override
   @Nullable
-  public ChecksumMode convert(@NonNull String source) {
+  public ChecksumMode convert(String source) {
     return ChecksumMode.fromValue(source);
   }
 }

server/src/main/java/com/adobe/testing/s3mock/HttpRangeHeaderConverter.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2023 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,16 +16,15 @@
 
 package com.adobe.testing.s3mock;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.HttpRange;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 
 public class HttpRangeHeaderConverter implements Converter<String, HttpRange> {
 
   @Override
   @Nullable
-  public HttpRange convert(@NonNull String source) {
+  public HttpRange convert(String source) {
     var httpRanges = HttpRange.parseRanges(source);
     if (!httpRanges.isEmpty()) {
       return httpRanges.get(0);

server/src/main/java/com/adobe/testing/s3mock/KmsValidationFilter.java

@@ -33,7 +33,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
-import org.springframework.lang.NonNull;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 /**
@@ -62,9 +61,9 @@ class KmsValidationFilter extends OncePerRequestFilter {
   }
 
   @Override
-  protected void doFilterInternal(@NonNull HttpServletRequest request,
-      @NonNull HttpServletResponse response,
-      @NonNull FilterChain filterChain) throws ServletException, IOException {
+  protected void doFilterInternal(HttpServletRequest request,
+      HttpServletResponse response,
+      FilterChain filterChain) throws ServletException, IOException {
     try {
       LOG.debug("Checking KMS key, if present.");
       var encryptionTypeHeader = request.getHeader(X_AMZ_SERVER_SIDE_ENCRYPTION);

server/src/main/java/com/adobe/testing/s3mock/MultipartController.java

@@ -76,6 +76,7 @@
 import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.jspecify.annotations.Nullable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRange;
 import org.springframework.http.ResponseEntity;
@@ -345,9 +346,9 @@ public ResponseEntity<CopyPartResult> uploadPartCopy(
   public ResponseEntity<InitiateMultipartUploadResult> createMultipartUpload(
       @PathVariable String bucketName,
       @PathVariable ObjectKey key,
-      @RequestHeader(value = CONTENT_TYPE, required = false) String contentType,
-      @RequestHeader(value = X_AMZ_CHECKSUM_TYPE, required = false) ChecksumType checksumType,
-      @RequestHeader(value = X_AMZ_TAGGING, required = false) List<Tag> tags,
+      @RequestHeader(value = CONTENT_TYPE, required = false) @Nullable String contentType,
+      @RequestHeader(value = X_AMZ_CHECKSUM_TYPE, required = false) @Nullable ChecksumType checksumType,
+      @RequestHeader(value = X_AMZ_TAGGING, required = false) @Nullable List<Tag> tags,
       @RequestHeader(value = X_AMZ_STORAGE_CLASS, required = false, defaultValue = "STANDARD")
       StorageClass storageClass,
       @RequestHeader HttpHeaders httpHeaders,

server/src/main/java/com/adobe/testing/s3mock/ObjectCannedAclHeaderConverter.java

@@ -18,9 +18,8 @@
 
 import com.adobe.testing.s3mock.dto.ObjectCannedACL;
 import com.adobe.testing.s3mock.util.AwsHttpHeaders;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 
 /**
  * Converts values of the {@link AwsHttpHeaders#X_AMZ_ACL} which is sent by the Amazon client.
@@ -32,7 +31,7 @@ class ObjectCannedAclHeaderConverter implements Converter<String, ObjectCannedAC
 
   @Override
   @Nullable
-  public ObjectCannedACL convert(@NonNull String source) {
+  public ObjectCannedACL convert(String source) {
     return ObjectCannedACL.fromValue(source);
   }
 }