Ensure that the underlying collections are updated correctly

When the user sets a new ReadConcern, ReadPreference or WriteConcern those changes
should be reflected in the underlying files and chunks collections.

JAVA-2049

Author: rozza

driver/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java

@@ -33,7 +33,6 @@
 import org.bson.BsonObjectId;
 import org.bson.BsonValue;
 import org.bson.Document;
-import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
 
@@ -49,46 +48,28 @@
 
 @SuppressWarnings("deprecation")
 final class GridFSBucketImpl implements GridFSBucket {
-    private final MongoDatabase database;
+    private static final int DEFAULT_CHUNKSIZE_BYTES = 255 * 1024;
     private final String bucketName;
     private final int chunkSizeBytes;
-    private final WriteConcern writeConcern;
-    private final ReadConcern readConcern;
-    private final ReadPreference readPreference;
     private final MongoCollection<Document> filesCollection;
     private final MongoCollection<Document> chunksCollection;
-    private final CodecRegistry codecRegistry;
     private volatile boolean checkedIndexes;
 
     GridFSBucketImpl(final MongoDatabase database) {
         this(database, "fs");
     }
 
     GridFSBucketImpl(final MongoDatabase database, final String bucketName) {
-        this.database = notNull("database", database);
-        this.bucketName = notNull("bucketName", bucketName);
-        this.chunkSizeBytes = 255 * 1024;
-        this.writeConcern = database.getWriteConcern();
-        this.readConcern = database.getReadConcern();
-        this.readPreference = database.getReadPreference();
-        this.codecRegistry = getCodecRegistry();
-        this.filesCollection = getFilesCollection();
-        this.chunksCollection = getChunksCollection();
-    }
-
-    GridFSBucketImpl(final MongoDatabase database, final String bucketName, final int chunkSizeBytes, final CodecRegistry codecRegistry,
-                     final ReadPreference readPreference, final WriteConcern writeConcern, final ReadConcern readConcern,
-                     final MongoCollection<Document> filesCollection, final MongoCollection<Document> chunksCollection,
-                     final boolean checkedIndexes) {
-        this.database = notNull("database", database);
+        this(notNull("bucketName", bucketName), DEFAULT_CHUNKSIZE_BYTES,
+                getFilesCollection(notNull("database", database), bucketName),
+                getChunksCollection(database, bucketName));
+    }
+
+    GridFSBucketImpl(final String bucketName, final int chunkSizeBytes, final MongoCollection<Document> filesCollection,
+                     final MongoCollection<Document> chunksCollection) {
         this.bucketName = notNull("bucketName", bucketName);
         this.chunkSizeBytes = chunkSizeBytes;
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.writeConcern = notNull("writeConcern", writeConcern);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.checkedIndexes = checkedIndexes;
-        this.filesCollection =  notNull("filesCollection", filesCollection);
+        this.filesCollection = notNull("filesCollection", filesCollection);
         this.chunksCollection = notNull("chunksCollection", chunksCollection);
     }
 
@@ -104,41 +85,40 @@ public int getChunkSizeBytes() {
 
     @Override
     public ReadPreference getReadPreference() {
-        return readPreference;
+        return filesCollection.getReadPreference();
     }
 
     @Override
     public WriteConcern getWriteConcern() {
-        return writeConcern;
+        return filesCollection.getWriteConcern();
     }
 
     @Override
     public ReadConcern getReadConcern() {
-        return readConcern;
+        return filesCollection.getReadConcern();
     }
 
     @Override
     public GridFSBucket withChunkSizeBytes(final int chunkSizeBytes) {
-        return new GridFSBucketImpl(database, bucketName, chunkSizeBytes, codecRegistry, readPreference, writeConcern, readConcern,
-                filesCollection, chunksCollection, checkedIndexes);
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection);
     }
 
     @Override
     public GridFSBucket withReadPreference(final ReadPreference readPreference) {
-        return new GridFSBucketImpl(database, bucketName, chunkSizeBytes, codecRegistry, readPreference, writeConcern, readConcern,
-                filesCollection, chunksCollection, checkedIndexes);
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadPreference(readPreference),
+                chunksCollection.withReadPreference(readPreference));
     }
 
     @Override
     public GridFSBucket withWriteConcern(final WriteConcern writeConcern) {
-        return new GridFSBucketImpl(database, bucketName, chunkSizeBytes, codecRegistry, readPreference, writeConcern, readConcern,
-                filesCollection, chunksCollection, checkedIndexes);
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withWriteConcern(writeConcern),
+                chunksCollection.withWriteConcern(writeConcern));
     }
 
     @Override
     public GridFSBucket withReadConcern(final ReadConcern readConcern) {
-        return new GridFSBucketImpl(database, bucketName, chunkSizeBytes, codecRegistry, readPreference, writeConcern, readConcern,
-                filesCollection, chunksCollection, checkedIndexes);
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadConcern(readConcern),
+                chunksCollection.withReadConcern(readConcern));
     }
 
     @Override
@@ -252,22 +232,13 @@ public void drop() {
         chunksCollection.drop();
     }
 
-    private CodecRegistry getCodecRegistry() {
-        return fromRegistries(database.getCodecRegistry(), MongoClient.getDefaultCodecRegistry());
-    }
-
-    private MongoCollection<Document> getFilesCollection() {
-        return database.getCollection(bucketName + ".files")
-                .withCodecRegistry(codecRegistry)
-                .withReadPreference(readPreference)
-                .withWriteConcern(writeConcern);
+    private static MongoCollection<Document> getFilesCollection(final MongoDatabase database, final String bucketName) {
+        return database.getCollection(bucketName + ".files").withCodecRegistry(fromRegistries(database.getCodecRegistry(),
+                MongoClient.getDefaultCodecRegistry()));
     }
 
-    private MongoCollection<Document> getChunksCollection() {
-        return database.getCollection(bucketName + ".chunks")
-                .withCodecRegistry(MongoClient.getDefaultCodecRegistry())
-                .withReadPreference(readPreference)
-                .withWriteConcern(writeConcern);
+    private static MongoCollection<Document> getChunksCollection(final MongoDatabase database, final String bucketName) {
+        return database.getCollection(bucketName + ".chunks").withCodecRegistry(MongoClient.getDefaultCodecRegistry());
     }
 
     private void checkCreateIndex() {

driver/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy

@@ -22,14 +22,19 @@ import com.mongodb.client.MongoCollection
 import com.mongodb.client.MongoDatabase
 import com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions
 import com.mongodb.client.gridfs.model.GridFSUploadOptions
+import org.bson.BsonDocument
 import org.bson.Document
+import org.bson.UuidRepresentation
+import org.bson.codecs.UuidCodec
 import org.bson.types.ObjectId
 import spock.lang.Unroll
 
 import java.security.MessageDigest
 
 import static com.mongodb.Fixture.getDefaultDatabaseName
 import static com.mongodb.Fixture.getMongoClient
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
 
 class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
     protected MongoDatabase mongoDatabase;
@@ -476,4 +481,25 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         !collectionNames.contains(filesCollection.getNamespace().collectionName)
         !collectionNames.contains(chunksCollection.getNamespace().collectionName)
     }
+
+    def 'should use the user provided codec registries for encoding / decoding data'() {
+        given:
+        def codecRegistry = fromRegistries(fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)), MongoClient.getDefaultCodecRegistry())
+        def database = getMongoClient().getDatabase(getDefaultDatabaseName()).withCodecRegistry(codecRegistry)
+        def uuid = UUID.randomUUID()
+        def fileMeta = new Document('uuid', uuid)
+        def gridFSBucket = GridFSBuckets.create(database)
+
+        when:
+        def fileId = gridFSBucket.uploadFromStream('myFile', new ByteArrayInputStream(multiChunkString as byte[]),
+                new GridFSUploadOptions().metadata(fileMeta));
+
+        def file = gridFSBucket.find(new Document('_id', fileId)).first()
+
+        then:
+        file.getMetadata() == fileMeta
+
+        then:
+        filesCollection.find(BsonDocument).first().getDocument('metadata').getBinary('uuid').getType() == 4 as byte
+    }
 }