Add s3://bucket/key support for AmazonS3URI

aws · Jul 11, 2014 · 1d8722f · 1d8722f
1 parent aef1849
commit 1d8722f
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/main/java/com/amazonaws/services/s3/AmazonS3URI.java b/src/main/java/com/amazonaws/services/s3/AmazonS3URI.java
@@ -59,6 +59,24 @@ public AmazonS3URI(final URI uri) {
             throw new IllegalArgumentException("Invalid S3 URI: no hostname: "
                                                + uri);
         }
+
+        // s3://*
+        if (uri.getScheme().equalsIgnoreCase("s3")) {
+            this.region = null;
+            this.isPathStyle = false;
+            this.bucket = uri.getHost();
+
+            String path = uri.getPath();
+            if (path.length() <= 1) {
+                // s3://bucket or s3://bucket/
+                this.key = null;
+            } else {
+                // s3://bucket/key
+                // Remove the leading '/'.
+                this.key = uri.getPath().substring(1);
+            }
+            return;
+        }
 
         Matcher matcher = ENDPOINT_PATTERN.matcher(host);
         if (!matcher.find()) {