Fixed GridFS.createFile bug

The underlying call handles the closure of the stream correctly

JAVA-1813

Author: rozza

config/findbugs-exclude.xml

@@ -19,6 +19,12 @@
             <Bug pattern="RV_RETURN_VALUE_IGNORED"/>  <!-- Deliberately ignoring return value of CountDownLatch.await -->
         </Class>
     </Match>
+
+    <Match>
+        <Class name="com.mongodb.gridfs.GridFS" />
+        <Method name="createFile" params="java.io.File" /> <!-- The underlying call to GridFSInputFile closes the file -->
+        <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
+    </Match>
     <Match>
         <Class name="com.mongodb.DocumentCodec">
             <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>

driver/src/main/com/mongodb/gridfs/GridFS.java

@@ -330,12 +330,7 @@ public GridFSInputFile createFile(final byte[] data) {
      * @throws IOException if there are problems reading {@code file}
      */
     public GridFSInputFile createFile(final File file) throws IOException {
-        FileInputStream fileInputStream = new FileInputStream(file);
-        try {
-            return createFile(fileInputStream, file.getName(), true);
-        } finally {
-            fileInputStream.close();
-        }
+        return createFile(new FileInputStream(file), file.getName(), true);
     }
 
     /**

driver/src/test/functional/com/mongodb/gridfs/GridFSTest.java

@@ -28,9 +28,13 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import static java.nio.charset.Charset.defaultCharset;
 import static org.junit.Assert.assertArrayEquals;
@@ -114,6 +118,20 @@ public void testOutStreamBigAligned() throws Exception {
         testOutStream(s);
     }
 
+    @Test
+    public void testCreateFileWithFile() throws Exception {
+        URI fileURI = GridFSTest.class.getResource("/GridFS/GridFSTestFile.txt").toURI();
+        GridFSInputFile in = gridFS.createFile(new File(fileURI));
+        in.save();
+
+        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        out.writeTo(bout);
+        String outString = new String(bout.toByteArray(), defaultCharset());
+
+        assertEquals(new String(Files.readAllBytes(Paths.get(fileURI))), outString);
+    }
+
     @Test
     public void testMetadata() throws Exception {
 

driver/src/test/resources/GridFS/GridFSTestFile.txt

@@ -0,0 +1 @@
+GridFS Test File