S3Resource improved getURL handling (#795)

Author: klopfdreh

spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3Resource.java

@@ -20,17 +20,14 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.WritableResource;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetUrlRequest;
 import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 
@@ -85,12 +82,9 @@ public S3Resource(Location location, S3Client s3Client, S3OutputStreamProvider s
 
 	@Override
 	public URL getURL() throws IOException {
-		List<String> splits = new ArrayList<>();
-		for (String split : location.getObject().split("/")) {
-			splits.add(URLEncoder.encode(split, StandardCharsets.UTF_8.toString()));
-		}
-		String encodedObjectName = String.join("/", splits);
-		return new URL("https", location.getBucket() + ".s3.amazonaws.com", "/" + encodedObjectName);
+		GetUrlRequest getUrlRequest = GetUrlRequest.builder().bucket(this.getLocation().getBucket())
+				.key(this.location.getObject()).versionId(this.location.getVersion()).build();
+		return s3Client.utilities().getUrl(getUrlRequest);
 	}
 
 	@Override

spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java

@@ -150,16 +150,18 @@ void contentLengthThrowsWhenResourceDoesNotExist(S3OutputStreamProvider s3Output
 	@TestAvailableOutputStreamProviders
 	void returnsResourceUrl(S3OutputStreamProvider s3OutputStreamProvider) throws IOException {
 		S3Resource resource = s3Resource("s3://first-bucket/a-file.txt", s3OutputStreamProvider);
-		assertThat(resource.getURL().toString()).isEqualTo("https://first-bucket.s3.amazonaws.com/a-file.txt");
+		assertThat(resource.getURL().toString())
+				.isEqualTo("http://127.0.0.1:" + localstack.getFirstMappedPort() + "/first-bucket/a-file.txt");
 	}
 
 	@TestAvailableOutputStreamProviders
 	void returnsEncodedResourceUrlAndUri(S3OutputStreamProvider s3OutputStreamProvider)
 			throws IOException, URISyntaxException {
 		S3Resource resource = s3Resource("s3://first-bucket/some/[objectName]", s3OutputStreamProvider);
-		assertThat(resource.getURL().toString())
-				.isEqualTo("https://first-bucket.s3.amazonaws.com/some/%5BobjectName%5D");
-		assertThat(resource.getURI()).isEqualTo(new URI("https://first-bucket.s3.amazonaws.com/some/%5BobjectName%5D"));
+		assertThat(resource.getURL().toString()).isEqualTo(
+				"http://127.0.0.1:" + localstack.getFirstMappedPort() + "/first-bucket/some/%5BobjectName%5D");
+		assertThat(resource.getURI()).isEqualTo(
+				new URI("http://127.0.0.1:" + localstack.getFirstMappedPort() + "/first-bucket/some/%5BobjectName%5D"));
 	}
 
 	@TestAvailableOutputStreamProviders