From 31491305924fea0e8a3844adffb4126981b5475d Mon Sep 17 00:00:00 2001
From: Joannis Orlandos <joannis@orlandos.nl>
Date: Tue, 31 Mar 2020 14:32:25 +0200
Subject: [PATCH] add more simple defaults to GridFS

---
 Sources/MongoKitten/GridFS/GridFSBucket.swift     | 4 ++--
 Sources/MongoKitten/GridFS/GridFSFileWriter.swift | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/MongoKitten/GridFS/GridFSBucket.swift b/Sources/MongoKitten/GridFS/GridFSBucket.swift
index 72273c75..d768c136 100644
--- a/Sources/MongoKitten/GridFS/GridFSBucket.swift
+++ b/Sources/MongoKitten/GridFS/GridFSBucket.swift
@@ -24,7 +24,7 @@ public final class GridFSBucket {
         self.chunksCollection = database[name + ".chunks"]
     }
     
-    public func upload(_ data: Data, filename: String?, id: Primitive = ObjectId(), metadata: Document? = nil, chunkSize: Int32 = GridFSBucket.defaultChunkSize) -> EventLoopFuture<Void> {
+    public func upload(_ data: Data, filename: String? = nil, id: Primitive = ObjectId(), metadata: Document? = nil, chunkSize: Int32 = GridFSBucket.defaultChunkSize) -> EventLoopFuture<Void> {
         var buffer = GridFSFileWriter.allocator.buffer(capacity: data.count)
         buffer.writeBytes(data)
         
@@ -32,7 +32,7 @@ public final class GridFSBucket {
         return writer.finalize(filename: filename, metadata: metadata).map { _ in }
     }
     
-    public func upload(_ buffer: ByteBuffer, filename: String?, id: Primitive = ObjectId(), metadata: Document? = nil, chunkSize: Int32 = GridFSBucket.defaultChunkSize) -> EventLoopFuture<Void> {
+    public func upload(_ buffer: ByteBuffer, filename: String? = nil, id: Primitive = ObjectId(), metadata: Document? = nil, chunkSize: Int32 = GridFSBucket.defaultChunkSize) -> EventLoopFuture<Void> {
         let writer = GridFSFileWriter(fs: self, fileId: id, chunkSize: chunkSize, buffer: buffer)
         return writer.finalize(filename: filename, metadata: metadata).map { _ in }
     }
diff --git a/Sources/MongoKitten/GridFS/GridFSFileWriter.swift b/Sources/MongoKitten/GridFS/GridFSFileWriter.swift
index 2a657bcf..506043bf 100644
--- a/Sources/MongoKitten/GridFS/GridFSFileWriter.swift
+++ b/Sources/MongoKitten/GridFS/GridFSFileWriter.swift
@@ -13,7 +13,7 @@ public final class GridFSFileWriter {
     var length: Int
     var finalized = false
     
-    public init(toBucket fs: GridFSBucket, fileId: Primitive, chunkSize: Int32) {
+    public init(toBucket fs: GridFSBucket, fileId: Primitive = ObjectId(), chunkSize: Int32 = GridFSBucket.defaultChunkSize) {
         self.fs = fs
         self.fileId = fileId
         self.chunkSize = chunkSize
@@ -21,7 +21,7 @@ public final class GridFSFileWriter {
         self.length = self.buffer.readableBytes
     }
     
-    internal init(fs: GridFSBucket, fileId: Primitive, chunkSize: Int32, buffer: ByteBuffer? = nil) {
+    internal init(fs: GridFSBucket, fileId: Primitive = ObjectId(), chunkSize: Int32 = GridFSBucket.defaultChunkSize, buffer: ByteBuffer? = nil) {
         self.fs = fs
         self.fileId = fileId
         self.chunkSize = chunkSize
@@ -43,7 +43,7 @@ public final class GridFSFileWriter {
         return self.flush()
     }
     
-    public func finalize(filename: String?, metadata: Document? = nil) -> EventLoopFuture<GridFSFile> {
+    public func finalize(filename: String? = nil, metadata: Document? = nil) -> EventLoopFuture<GridFSFile> {
         assert(self.finalized == false, "Finalizing a finalized writer is an error")
         
         self.finalized = true