fix: split and add path as segments to HttpUrl.Builder (#506)

okhttp.HttpUrl.Builder.addEncodedPathSegment() does encoding '/' even
for encoded path.  This patch fixes this by splitting path by '/' and
encodes each segment and add them individually.

Fixes #504

Author: balamurugana

api/src/main/java/io/minio/MinioClient.java

@@ -646,7 +646,9 @@ private Request createRequest(Method method, String bucketName, String objectNam
 
     if (objectName != null) {
       // Limitation: OkHttp does not allow to add '.' and '..' as path segment.
-      urlBuilder.addEncodedPathSegment(S3Escaper.encodePath(objectName));
+      for (String pathSegment : objectName.split("/")) {
+        urlBuilder.addEncodedPathSegment(S3Escaper.encode(pathSegment));
+      }
     }
 
     if (queryParamMap != null) {

api/src/main/java/io/minio/S3Escaper.java

@@ -49,25 +49,4 @@ public static String encode(String str) {
       .replaceAll("\\[", "%5B")
       .replaceAll("\\]", "%5D");
   }
-
-
-  /**
-   * Returns S3 encoded path.
-   */
-  public static String encodePath(String path) {
-    StringBuffer encodedPath = new StringBuffer();
-
-    // Limitation: Its not allowed to add path segment as '/', '//', '/usr' or 'usr/'.
-    if (path != null) {
-      for (String pathSegment : path.split("/")) {
-        if (encodedPath.length() > 0) {
-          encodedPath.append("/");
-        }
-
-        encodedPath.append(encode(pathSegment));
-      }
-    }
-
-    return encodedPath.toString();
-  }
 }

functional/FunctionalTest.java

@@ -278,6 +278,22 @@ public static void getObject_test4() throws Exception {
     client.removeObject(bucketName, fileName);
   }
 
+  /**
+   * Test: getObject(String bucketName, String objectName, String fileName).
+   * where objectName has multiple path segments.
+   */
+  public static void getObject_test5() throws Exception {
+    System.out.println("Test: objectName with multiple path segments: "
+                       + "getObject(String bucketName, String objectName, String fileName)");
+    String fileName = createFile(3 * MB);
+    String objectName = "path/to/" + fileName;
+    client.putObject(bucketName, objectName, fileName);
+    Files.delete(Paths.get(fileName));
+    client.getObject(bucketName, objectName, fileName + ".downloaded");
+    Files.delete(Paths.get(fileName + ".downloaded"));
+    client.removeObject(bucketName, objectName);
+  }
+
   /**
    * Test: listObjects(final String bucketName).
    */
@@ -849,6 +865,7 @@ public static void main(String[] args) {
       getObject_test2();
       getObject_test3();
       getObject_test4();
+      getObject_test5();
 
       listObject_test1();
       listObject_test2();