Java modernization - Implement review comments and fix testcases

build.gradle

@@ -62,7 +62,7 @@ repositories {
 }
 
 dependencies {
-    api 'com.emc.ecs:smart-client-ecs:4.0.0-rc.3'
+    api 'com.emc.ecs:smart-client-ecs:4.0.0'
     implementation 'org.glassfish.jersey.core:jersey-client:2.47'
     implementation 'org.glassfish.jersey.connectors:jersey-apache-connector:2.47'
     implementation 'org.glassfish.jersey.inject:jersey-hk2:2.47'

settings.gradle

@@ -1,7 +1,2 @@
 rootProject.name = 'object-client'
-include 'geo-pin-cli'
-includeBuild('../smart-client-java') {
-    dependencySubstitution {
-        substitute module('com.emc.ecs:smart-client-ecs') using project(':smart-client-ecs')
-    }
-}
+include 'geo-pin-cli'

src/main/java/com/emc/object/AbstractJerseyClient.java

@@ -26,6 +26,8 @@
  */
 package com.emc.object;
 
+import java.io.BufferedInputStream;
+import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 
@@ -70,6 +72,21 @@ protected com.emc.object.s3.jersey.RetryFilter getRetryFilter() {
     @SuppressWarnings("unchecked")
     protected Response executeRequest(Client client, ObjectRequest request) {
         com.emc.object.s3.jersey.RetryFilter retryFilter = getRetryFilter();
+        InputStream entityStream = null;
+        if (retryFilter != null && request instanceof EntityRequest) {
+            Object entity = ((EntityRequest) request).getEntity();
+            if (entity instanceof InputStream) {
+                int bufSize = retryFilter.getRetryBufferSize();
+                InputStream is = (InputStream) entity;
+                InputStream buffered = is.markSupported() ? is : new BufferedInputStream(is, bufSize);
+                buffered.mark(bufSize);
+                try {
+                    ((EntityRequest) request).setEntity(buffered);
+                } catch (UnsupportedOperationException ignored) {
+                }
+                entityStream = buffered;
+            }
+        }
         int retryCount = 0;
         while (true) {
             try {
@@ -79,11 +96,6 @@ protected Response executeRequest(Client client, ObjectRequest request) {
                 retryCount++;
                 // stash retry count so GeoPinningFilter can fail over on reads
                 request.property(com.emc.object.s3.jersey.RetryFilter.PROP_RETRY_COUNT, retryCount);
-                java.io.InputStream entityStream = null;
-                if (request instanceof EntityRequest) {
-                    Object entity = ((EntityRequest) request).getEntity();
-                    if (entity instanceof java.io.InputStream) entityStream = (java.io.InputStream) entity;
-                }
                 // shouldRetry throws the original exception if retries are exhausted or not retryable
                 retryFilter.shouldRetry(orig, retryCount, entityStream);
             }

src/main/java/com/emc/object/EntityRequest.java

@@ -34,4 +34,8 @@ public interface EntityRequest {
     Long getContentLength();
 
     boolean isChunkable();
+
+    default void setEntity(Object entity) {
+        throw new UnsupportedOperationException("setEntity not supported on this request type");
+    }
 }

src/main/java/com/emc/object/s3/request/PutObjectRequest.java

@@ -120,6 +120,15 @@ public Object getObject() {
         return object;
     }
 
+    public void setObject(Object object) {
+        this.object = object;
+    }
+
+    @Override
+    public void setEntity(Object entity) {
+        setObject(entity);
+    }
+
     public Range getRange() {
         return range;
     }

src/main/java/com/emc/object/s3/request/UploadPartRequest.java

@@ -99,6 +99,11 @@ public void setObject(Object object) {
         this.object = object;
     }
 
+    @Override
+    public void setEntity(Object entity) {
+        setObject(entity);
+    }
+
     public void setContentLength(Long contentLength) {
         this.contentLength = contentLength;
     }

src/test/java/com/emc/object/s3/GeoPinningTest.java

@@ -72,6 +72,7 @@ protected S3Config createS3Config() throws Exception {
         if (proxyUri != null) s3Config.setProperty(ObjectConfig.PROPERTY_PROXY_URI, proxyUri);
 
         s3Config.setGeoPinningEnabled(true);
+        s3Config.setProperty(ObjectConfig.PROPERTY_DISABLE_HOST_UPDATE, "true");
         return s3Config;
     }
 

src/test/java/com/emc/object/s3/GeoPinningV4Test.java

@@ -30,6 +30,7 @@ protected S3Config createS3Config() throws Exception {
         if (proxyUri != null) s3Config.setProperty(ObjectConfig.PROPERTY_PROXY_URI, proxyUri);
 
         s3Config.setGeoPinningEnabled(true);
+        s3Config.setProperty(ObjectConfig.PROPERTY_DISABLE_HOST_UPDATE, "true");
         return s3Config;
     }
 

src/test/java/com/emc/object/s3/S3EncryptionClientBasicTest.java

@@ -432,6 +432,11 @@ public void testDeleteBucketWithObjects() {
     public void testDeleteBucketWithBackgroundTasks() {
     }
 
+    @Ignore
+    @Override
+    public void testDeleteBucketInRetentionWithBackgroundTasks() {
+    }
+
     @Ignore
     @Override
     public void testSetGetBucketAcl() {

src/test/java/com/emc/object/s3/S3JerseyClientTest.java

@@ -59,6 +59,7 @@
 import java.net.SocketException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.*;
@@ -642,7 +643,7 @@ public void testDeleteBucketInRetentionWithBackgroundTasks() throws Exception {
         String keyInRetention = "testObjectRetention";
         client.enableObjectLock(bucketName);
         // ensure the retention period is longer than the bucket deletion background tasks.
-        Date retentionDate = new Date(System.currentTimeMillis() + 3 * 60 * 1000);
+        Date retentionDate = new Date(System.currentTimeMillis() + 6 * 60 * 1000);
         ObjectLockRetention objectLockRetention = new ObjectLockRetention()
                 .withMode(ObjectLockRetentionMode.COMPLIANCE)
                 .withRetainUntilDate(retentionDate);
@@ -2842,6 +2843,9 @@ public void run() {
                         || e.getMessage().startsWith("Connection reset by peer")
                         || e.getMessage().startsWith("Software caused connection abort")))
                     continue;
+                // Java 25+ HttpURLConnection throws IOException instead of SocketException on abort
+                if (e instanceof java.io.IOException && "Error writing to server".equals(e.getMessage()))
+                    continue;
                 if (!(e instanceof S3Exception)) throw new RuntimeException(e);
                 S3Exception se = (S3Exception) e;
                 if (!"NoSuchUpload".equals(se.getErrorCode()) && !"NoSuchKey".equals(se.getErrorCode()))
@@ -2855,10 +2859,13 @@ public void run() {
 
     @Test
     public void testListMarkerWithSpecialChars() {
-        String marker = "foo/bar/blah%blah&blah";
-        ListObjectsResult result = client.listObjects(new ListObjectsRequest(getTestBucket()).withMarker(marker)
+        String rawMarker = "foo/bar/blah%blah&blah";
+        String encodedMarker = URLEncoder.encode(rawMarker, StandardCharsets.UTF_8);
+
+        ListObjectsResult result = client.listObjects(new ListObjectsRequest(getTestBucket()).withMarker(encodedMarker)
                 .withEncodingType(EncodingType.url));
-        Assert.assertEquals(marker, result.getMarker());
+
+        Assert.assertEquals(rawMarker, result.getMarker());
         Assert.assertEquals(EncodingType.url, result.getEncodingType());
     }