Add overloaded methods for putObject API (#747)

sinhaashish · kannappanr · commit 26787aff5a3e · 2019-04-30T14:41:50.000-07:00
1. public void putObject(String bucketName, String objectName, String fileName, Long size,
                     Map&lt;String,String&gt; headerMap, ServerSideEncryption sse, String contentType)
2. public void putObject(String bucketName, String objectName, InputStream data, Long size,
                        Map&lt;String, String&gt; headerMap, ServerSideEncryption sse, String contentType)

These two methods can take values/null for all the optional parameters.
diff --git a/api/src/main/java/io/minio/MinioClient.java b/api/src/main/java/io/minio/MinioClient.java
diff --git a/api/src/test/java/io/minio/MinioClientTest.java b/api/src/test/java/io/minio/MinioClientTest.java
@@ -559,7 +559,7 @@ public void testPutSmallObject()
     String inputString = HELLO_WORLD;
     ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));
 
-    client.putObject(BUCKET, "key", data, 11, APPLICATION_OCTET_STREAM);
+    client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_OCTET_STREAM);
   }
 
   // this case only occurs for minio cloud storage
@@ -584,7 +584,7 @@ public void testPutSmallObjectFails()
     String inputString = HELLO_WORLD;
     ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));
 
-    client.putObject(BUCKET, "key", data, 11, APPLICATION_OCTET_STREAM);
+    client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_OCTET_STREAM);
     throw new RuntimeException(EXPECTED_EXCEPTION_DID_NOT_FIRE);
   }
 
@@ -609,7 +609,7 @@ public void testPutIncompleteSmallPut()
     String inputString = "hello worl";
     ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));
 
-    client.putObject(BUCKET, "key", data, 11, APPLICATION_OCTET_STREAM);
+    client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_OCTET_STREAM);
     throw new RuntimeException(EXPECTED_EXCEPTION_DID_NOT_FIRE);
   }
 
@@ -638,7 +638,7 @@ public void testSpecialCharsNameWorks()
       ascii[i - 1] = (byte) i;
     }
     String contentType = null;
-    client.putObject(BUCKET, "世界" + new String(ascii, "UTF-8"), data, 11, contentType);
+    client.putObject(BUCKET, "世界" + new String(ascii, "UTF-8"), data, 11L, null, null, contentType);
   }
 
   @SuppressFBWarnings("NP")
@@ -662,7 +662,7 @@ public void testNullContentTypeWorks()
     ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));
 
     String contentType = null;
-    client.putObject(BUCKET, "key", data, 11, contentType);
+    client.putObject(BUCKET, "key", data, 11L, null, null, contentType);
   }
 
   @Test
@@ -684,7 +684,7 @@ public void testCustomContentTypeWorks()
     String inputString = HELLO_WORLD;
     ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));
 
-    client.putObject(BUCKET, "key", data, 11, APPLICATION_JAVASCRIPT);
+    client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_JAVASCRIPT);
   }
 
   @Test
@@ -828,7 +828,7 @@ private RecordedRequest putObjectWithHeaders(Map<String, String> headerMap)
     server.start();
 
     MinioClient client = new MinioClient(server.url("").toString(), "access_key", "secret_key", "us-east-1");
-    client.putObject(BUCKET, "key", new ByteArrayInputStream(new byte[]{'a'}), 1, headerMap);
+    client.putObject(BUCKET, "key", new ByteArrayInputStream(new byte[]{'a'}), 1L, headerMap, null, null);
 
     return server.takeRequest();
   }
diff --git a/docs/API.md b/docs/API.md
diff --git a/examples/CopyObject.java b/examples/CopyObject.java
@@ -65,7 +65,8 @@ public static void main(String[] args)
       ByteArrayInputStream bais = new ByteArrayInputStream(builder.toString().getBytes("UTF-8"));
 
       // Create object 'my-objectname' in 'my-bucketname' with content from the input stream.
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), "application/octet-stream");
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, null,
+              "application/octet-stream");
       bais.close();
       System.out.println("my-objectname is uploaded successfully");
 
diff --git a/examples/CopyObjectEncrypted.java b/examples/CopyObjectEncrypted.java
@@ -61,7 +61,7 @@ public static void main(String[] args)
       ServerSideEncryption sseTarget = ServerSideEncryption.withCustomerKey(secretKeySpecTarget);
         
       // Create object 'my-objectname' in 'my-bucketname' with content from the input stream.
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), ssePut);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, ssePut, null);
       System.out.println("my-objectname is uploaded successfully");
         
       minioClient.copyObject("my-bucketname", "my-objectname", sseSource, "my-destbucketname",
@@ -75,4 +75,4 @@ public static void main(String[] args)
     }
     System.out.println("finished");
   }
-}
+}
diff --git a/examples/CopyObjectEncryptedKms.java b/examples/CopyObjectEncryptedKms.java
@@ -57,7 +57,7 @@ public static void main(String[] args)
       ServerSideEncryption sse = ServerSideEncryption.withManagedKeys("Key-Id", myContext);
         
       // Create object 'my-objectname' in 'my-bucketname' with content from the input stream.
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), sse);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, sse, null);
       bais.close();
       System.out.println("my-objectname is uploaded successfully");
 
diff --git a/examples/CopyObjectEncryptedS3.java b/examples/CopyObjectEncryptedS3.java
@@ -51,7 +51,7 @@ public static void main(String[] args)
       ServerSideEncryption sse = ServerSideEncryption.atRest();
         
       // Create object 'my-objectname' in 'my-bucketname' with content from the input stream.
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), sse);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, sse, null);
       bais.close();
       System.out.println("my-objectname is uploaded successfully");
 
diff --git a/examples/CopyObjectMetadata.java b/examples/CopyObjectMetadata.java
@@ -67,7 +67,8 @@ public static void main(String[] args)
       ByteArrayInputStream bais = new ByteArrayInputStream(builder.toString().getBytes("UTF-8"));
 
       // Create object 'my-objectname' in 'my-bucketname' with content from the input stream.
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), "application/octet-stream");
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()),null, null,
+              "application/octet-stream");
       bais.close();
       System.out.println("my-objectname is uploaded successfully");
 
diff --git a/examples/PutGetObjectEncrypted.java b/examples/PutGetObjectEncrypted.java
@@ -61,7 +61,7 @@ public static void main(String[] args)
       // To test SSE-C
       ServerSideEncryption sse = ServerSideEncryption.withCustomerKey(keyGen.generateKey());
 
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), sse);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()),null, sse, null);
         
       bais.close();
 
diff --git a/examples/PutGetObjectEncryptedFile.java b/examples/PutGetObjectEncryptedFile.java
@@ -3,13 +3,15 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.InvalidKeyException;
 
+
 import javax.crypto.KeyGenerator;
 import org.xmlpull.v1.XmlPullParserException;
 
 import io.minio.MinioClient;
 import io.minio.ServerSideEncryption;
 import io.minio.errors.MinioException;
 
+
 public class PutGetObjectEncryptedFile {
 /**
  * MinioClient.putObject() and MinioClient.getObject() to a file example for  SSE_C.
@@ -36,7 +38,7 @@ public static void main(String[] args)
 
       // To test SSE-C
       ServerSideEncryption sse = ServerSideEncryption.withCustomerKey(keyGen.generateKey());
-      minioClient.putObject(bucketName, objectName, sse, inputfile);
+      minioClient.putObject(bucketName, objectName, inputfile, null, null, sse, null);
       System.out.println("my-objectname is encrypted and uploaded successfully.");
 
       minioClient.getObject(bucketName, objectName, sse, outputfile);
diff --git a/examples/PutObject.java b/examples/PutObject.java
@@ -64,7 +64,8 @@ public static void main(String[] args)
       ByteArrayInputStream bais = new ByteArrayInputStream(builder.toString().getBytes("UTF-8"));
 
       // Create object 'my-objectname' in 'my-bucketname' with content from the input stream.
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), "application/octet-stream");
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, null,
+              "application/octet-stream");
       bais.close();
       System.out.println("my-objectname is uploaded successfully");
     } catch (MinioException e) {
diff --git a/examples/PutObjectEncryptedKms.java b/examples/PutObjectEncryptedKms.java
@@ -56,7 +56,7 @@ public static void main(String[] args)
       // To test SSE-KMS
       ServerSideEncryption sse = ServerSideEncryption.withManagedKeys("Key-Id", myContext);
 
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), sse);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, sse, null);
             
       bais.close();
 
diff --git a/examples/PutObjectEncryptedS3.java b/examples/PutObjectEncryptedS3.java
@@ -52,7 +52,7 @@ public static void main(String[] args)
       // To test SSE-S3
       ServerSideEncryption sse = ServerSideEncryption.atRest();
       
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), sse);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, sse, null);
         
       bais.close();
     
diff --git a/examples/PutObjectProgressBar.java b/examples/PutObjectProgressBar.java
@@ -59,7 +59,8 @@ public static void main(String[] args) throws InvalidKeyException, NoSuchAlgorit
     InputStream pis = new BufferedInputStream(new ProgressStream("Uploading... ",
                                                                  ProgressBarStyle.ASCII,
                                                                  new FileInputStream(file)));
-    minioClient.putObject(bucketName, objectName, pis, pis.available(), "application/octet-stream");
+    minioClient.putObject(bucketName, objectName, pis, Long.valueOf(pis.available()), null, null,
+            "application/octet-stream");
     pis.close();
     System.out.println("my-objectname is uploaded successfully");
   }
diff --git a/examples/PutObjectUiProgressBar.java b/examples/PutObjectUiProgressBar.java
@@ -93,7 +93,8 @@ private void uploadFile(String fileName) throws IOException, NoSuchAlgorithmExce
           bis);
 
       pmis.getProgressMonitor().setMillisToPopup(10);
-      minioClient.putObject("bank", "my-objectname", pmis, bis.available(), "application/octet-stream");
+      minioClient.putObject("bank", "my-objectname", pmis, Long.valueOf(pmis.available()), null, null,
+              "application/octet-stream");
       System.out.println("my-objectname is uploaded successfully");
     } catch (FileNotFoundException e) {
       // TODO Auto-generated catch block
diff --git a/examples/PutObjectWithMetadata.java b/examples/PutObjectWithMetadata.java
@@ -78,7 +78,8 @@ public static void main(String[] args)
       headerMap.put("X-Amz-Storage-Class", "REDUCED_REDUNDANCY");
 
       // Create object 'my-objectname' in 'my-bucketname' with custom metadata in headerMap
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), headerMap); 
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), headerMap,
+              null, null);
       bais.close();
       System.out.println("my-objectname is uploaded successfully");
     } catch (MinioException e) {
diff --git a/examples/PutStatObjectEncrypted.java b/examples/PutStatObjectEncrypted.java
@@ -59,7 +59,7 @@ public static void main(String[] args)
       // To test SSE-C
       ServerSideEncryption sse = ServerSideEncryption.withCustomerKey(keyGen.generateKey());
         
-      minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), sse);
+      minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, sse, null);
       
       bais.close();
 
diff --git a/examples/UploadObject.java b/examples/UploadObject.java
@@ -20,6 +20,9 @@
 
 import org.xmlpull.v1.XmlPullParserException;
 
+import static java.nio.file.StandardOpenOption.*;
+import java.nio.file.*;
+
 import io.minio.MinioClient;
 import io.minio.errors.MinioException;
 
@@ -39,7 +42,7 @@ public static void main(String[] args)
       //                                           "YOUR-SECRETACCESSKEY");
 
       // Upload 'my-filename' as object 'my-objectname' in 'my-bucketname'.
-      minioClient.putObject("my-bucketname", "my-objectname", "my-filename");
+      minioClient.putObject("my-bucketname", "my-objectname", "my-filename", null, null, null, null);
       System.out.println("my-filename is uploaded to my-objectname successfully");
     } catch (MinioException e) {
       System.out.println("Error occurred: " + e);
diff --git a/functional/FunctionalTest.java b/functional/FunctionalTest.java
diff --git a/functional/PutObjectRunnable.java b/functional/PutObjectRunnable.java

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ public void testPutSmallObject()`
`559`	`559`	`String inputString = HELLO_WORLD;`
`560`	`560`	`ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));`
`561`	`561`
`562`		`- client.putObject(BUCKET, "key", data, 11, APPLICATION_OCTET_STREAM);`
	`562`	`+ client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_OCTET_STREAM);`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`// this case only occurs for minio cloud storage`
`@@ -584,7 +584,7 @@ public void testPutSmallObjectFails()`
`584`	`584`	`String inputString = HELLO_WORLD;`
`585`	`585`	`ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));`
`586`	`586`
`587`		`- client.putObject(BUCKET, "key", data, 11, APPLICATION_OCTET_STREAM);`
	`587`	`+ client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_OCTET_STREAM);`
`588`	`588`	`throw new RuntimeException(EXPECTED_EXCEPTION_DID_NOT_FIRE);`
`589`	`589`	`}`
`590`	`590`
`@@ -609,7 +609,7 @@ public void testPutIncompleteSmallPut()`
`609`	`609`	`String inputString = "hello worl";`
`610`	`610`	`ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));`
`611`	`611`
`612`		`- client.putObject(BUCKET, "key", data, 11, APPLICATION_OCTET_STREAM);`
	`612`	`+ client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_OCTET_STREAM);`
`613`	`613`	`throw new RuntimeException(EXPECTED_EXCEPTION_DID_NOT_FIRE);`
`614`	`614`	`}`
`615`	`615`
`@@ -638,7 +638,7 @@ public void testSpecialCharsNameWorks()`
`638`	`638`	`ascii[i - 1] = (byte) i;`
`639`	`639`	`}`
`640`	`640`	`String contentType = null;`
`641`		`- client.putObject(BUCKET, "世界" + new String(ascii, "UTF-8"), data, 11, contentType);`
	`641`	`+ client.putObject(BUCKET, "世界" + new String(ascii, "UTF-8"), data, 11L, null, null, contentType);`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`@SuppressFBWarnings("NP")`
`@@ -662,7 +662,7 @@ public void testNullContentTypeWorks()`
`662`	`662`	`ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));`
`663`	`663`
`664`	`664`	`String contentType = null;`
`665`		`- client.putObject(BUCKET, "key", data, 11, contentType);`
	`665`	`+ client.putObject(BUCKET, "key", data, 11L, null, null, contentType);`
`666`	`666`	`}`
`667`	`667`
`668`	`668`	`@Test`
`@@ -684,7 +684,7 @@ public void testCustomContentTypeWorks()`
`684`	`684`	`String inputString = HELLO_WORLD;`
`685`	`685`	`ByteArrayInputStream data = new ByteArrayInputStream(inputString.getBytes(StandardCharsets.UTF_8));`
`686`	`686`
`687`		`- client.putObject(BUCKET, "key", data, 11, APPLICATION_JAVASCRIPT);`
	`687`	`+ client.putObject(BUCKET, "key", data, 11L, null, null, APPLICATION_JAVASCRIPT);`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`@Test`
`@@ -828,7 +828,7 @@ private RecordedRequest putObjectWithHeaders(Map<String, String> headerMap)`
`828`	`828`	`server.start();`
`829`	`829`
`830`	`830`	`MinioClient client = new MinioClient(server.url("").toString(), "access_key", "secret_key", "us-east-1");`
`831`		`- client.putObject(BUCKET, "key", new ByteArrayInputStream(new byte[]{'a'}), 1, headerMap);`
	`831`	`+ client.putObject(BUCKET, "key", new ByteArrayInputStream(new byte[]{'a'}), 1L, headerMap, null, null);`
`832`	`832`
`833`	`833`	`return server.takeRequest();`
`834`	`834`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static void main(String[] args)`
`61`	`61`	`ServerSideEncryption sseTarget = ServerSideEncryption.withCustomerKey(secretKeySpecTarget);`
`62`	`62`
`63`	`63`	`// Create object 'my-objectname' in 'my-bucketname' with content from the input stream.`
`64`		`- minioClient.putObject("my-bucketname", "my-objectname", bais, bais.available(), ssePut);`
	`64`	`+ minioClient.putObject("my-bucketname", "my-objectname", bais, Long.valueOf(bais.available()), null, ssePut, null);`
`65`	`65`	`System.out.println("my-objectname is uploaded successfully");`
`66`	`66`
`67`	`67`	`minioClient.copyObject("my-bucketname", "my-objectname", sseSource, "my-destbucketname",`
`@@ -75,4 +75,4 @@ public static void main(String[] args)`
`75`	`75`	`}`
`76`	`76`	`System.out.println("finished");`
`77`	`77`	`}`
`78`		`-}`
	`78`	`+}`