Add mongo/findopt

GODRIVER-272

Change-Id: I6acc5c25b3ffeb1accfe8d14e7125c46d35792c5

Author: Divjot Arora

core/command/find.go

@@ -56,7 +56,7 @@ func (f *Find) Encode(desc description.SelectedServer) (wiremessage.WireMessage,
 			batchSize = int32(t)
 			err = opt.Option(command)
 		case option.OptProjection:
-			err = t.IsFind().Option(command)
+			err = t.Option(command)
 		default:
 			err = opt.Option(command)
 		}

core/dispatch/aggregate.go

@@ -38,24 +38,10 @@ func Aggregate(
 			return nil, err
 		}
 		if wc != nil {
-			elem, err := wc.MarshalBSONElement()
-			if err != nil {
-				return nil, err
-			}
-
-			opt := option.OptWriteConcern{WriteConcern: elem, Acknowledged: wc.Acknowledged()}
+			opt := option.OptWriteConcern{WriteConcern: wc}
 			cmd.Opts = append(cmd.Opts, opt)
+			acknowledged = wc.Acknowledged()
 		}
-
-		for _, opt := range cmd.Opts {
-			wc, ok := opt.(option.OptWriteConcern)
-			if !ok {
-				continue
-			}
-			acknowledged = wc.Acknowledged
-			break
-		}
-
 	case false:
 		ss, err = topo.SelectServer(ctx, readSelector)
 		if err != nil {

core/dispatch/delete.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/command"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -32,27 +31,16 @@ func Delete(
 		return result.Delete{}, err
 	}
 
+	acknowledged := true
 	if wc != nil {
 		opt, err := writeConcernOption(wc)
 		if err != nil {
 			return result.Delete{}, err
 		}
 		cmd.Opts = append(cmd.Opts, opt)
+		acknowledged = wc.Acknowledged()
 	}
 
-	// NOTE: We iterate through the options because the user may have provided
-	// an option explicitly and that needs to override the provided write concern.
-	// We put this here because it would complicate the methods that call this to
-	// parse out the option.
-	acknowledged := true
-	for _, opt := range cmd.Opts {
-		wc, ok := opt.(option.OptWriteConcern)
-		if !ok {
-			continue
-		}
-		acknowledged = wc.Acknowledged
-		break
-	}
 	desc := ss.Description()
 	conn, err := ss.Connection(ctx)
 	if err != nil {

core/dispatch/dispatch.go

@@ -19,17 +19,9 @@ import (
 var ErrUnacknowledgedWrite = errors.New("unacknowledged write")
 
 func writeConcernOption(wc *writeconcern.WriteConcern) (option.OptWriteConcern, error) {
-	elem, err := wc.MarshalBSONElement()
-	if err != nil {
-		return option.OptWriteConcern{}, err
-	}
-	return option.OptWriteConcern{WriteConcern: elem, Acknowledged: wc.Acknowledged()}, nil
+	return option.OptWriteConcern{WriteConcern: wc}, nil
 }
 
 func readConcernOption(rc *readconcern.ReadConcern) (option.OptReadConcern, error) {
-	elem, err := rc.MarshalBSONElement()
-	if err != nil {
-		return option.OptReadConcern{}, err
-	}
-	return option.OptReadConcern{ReadConcern: elem}, nil
+	return option.OptReadConcern{ReadConcern: rc}, nil
 }

core/dispatch/find_one_and_delete.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/command"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -32,26 +31,14 @@ func FindOneAndDelete(
 		return result.FindAndModify{}, err
 	}
 
+	acknowledged := true
 	if wc != nil {
 		opt, err := writeConcernOption(wc)
 		if err != nil {
 			return result.FindAndModify{}, err
 		}
 		cmd.Opts = append(cmd.Opts, opt)
-	}
-
-	// NOTE: We iterate through the options because the user may have provided
-	// an option explicitly and that needs to override the provided write concern.
-	// We put this here because it would complicate the methods that call this to
-	// parse out the option.
-	acknowledged := true
-	for _, opt := range cmd.Opts {
-		wc, ok := opt.(option.OptWriteConcern)
-		if !ok {
-			continue
-		}
-		acknowledged = wc.Acknowledged
-		break
+		acknowledged = wc.Acknowledged()
 	}
 
 	desc := ss.Description()

core/dispatch/find_one_and_replace.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/command"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -32,26 +31,14 @@ func FindOneAndReplace(
 		return result.FindAndModify{}, err
 	}
 
+	acknowledged := true
 	if wc != nil {
 		opt, err := writeConcernOption(wc)
 		if err != nil {
 			return result.FindAndModify{}, err
 		}
 		cmd.Opts = append(cmd.Opts, opt)
-	}
-
-	// NOTE: We iterate through the options because the user may have provided
-	// an option explicitly and that needs to override the provided write concern.
-	// We put this here because it would complicate the methods that call this to
-	// parse out the option.
-	acknowledged := true
-	for _, opt := range cmd.Opts {
-		wc, ok := opt.(option.OptWriteConcern)
-		if !ok {
-			continue
-		}
-		acknowledged = wc.Acknowledged
-		break
+		acknowledged = wc.Acknowledged()
 	}
 
 	desc := ss.Description()

core/dispatch/find_one_and_update.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/command"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -32,26 +31,14 @@ func FindOneAndUpdate(
 		return result.FindAndModify{}, err
 	}
 
+	acknowledged := true
 	if wc != nil {
 		opt, err := writeConcernOption(wc)
 		if err != nil {
 			return result.FindAndModify{}, err
 		}
 		cmd.Opts = append(cmd.Opts, opt)
-	}
-
-	// NOTE: We iterate through the options because the user may have provided
-	// an option explicitly and that needs to override the provided write concern.
-	// We put this here because it would complicate the methods that call this to
-	// parse out the option.
-	acknowledged := true
-	for _, opt := range cmd.Opts {
-		wc, ok := opt.(option.OptWriteConcern)
-		if !ok {
-			continue
-		}
-		acknowledged = wc.Acknowledged
-		break
+		acknowledged = wc.Acknowledged()
 	}
 
 	desc := ss.Description()

core/dispatch/insert.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/command"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -32,27 +31,16 @@ func Insert(
 		return result.Insert{}, err
 	}
 
+	acknowledged := true
 	if wc != nil {
 		opt, err := writeConcernOption(wc)
 		if err != nil {
 			return result.Insert{}, err
 		}
 		cmd.Opts = append(cmd.Opts, opt)
+		acknowledged = wc.Acknowledged()
 	}
 
-	// NOTE: We iterate through the options because the user may have provided
-	// an option explicitly and that needs to override the provided write concern.
-	// We put this here because it would complicate the methods that call this to
-	// parse out the option.
-	acknowledged := true
-	for _, opt := range cmd.Opts {
-		wc, ok := opt.(option.OptWriteConcern)
-		if !ok {
-			continue
-		}
-		acknowledged = wc.Acknowledged
-		break
-	}
 	desc := ss.Description()
 	conn, err := ss.Connection(ctx)
 	if err != nil {

core/dispatch/update.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/command"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -32,27 +31,16 @@ func Update(
 		return result.Update{}, err
 	}
 
+	acknowledged := true
 	if wc != nil {
 		opt, err := writeConcernOption(wc)
 		if err != nil {
 			return result.Update{}, err
 		}
 		cmd.Opts = append(cmd.Opts, opt)
+		acknowledged = wc.Acknowledged()
 	}
 
-	// NOTE: We iterate through the options because the user may have provided
-	// an option explicitly and that needs to override the provided write concern.
-	// We put this here because it would complicate the methods that call this to
-	// parse out the option.
-	acknowledged := true
-	for _, opt := range cmd.Opts {
-		wc, ok := opt.(option.OptWriteConcern)
-		if !ok {
-			continue
-		}
-		acknowledged = wc.Acknowledged
-		break
-	}
 	desc := ss.Description()
 	conn, err := ss.Connection(ctx)
 	if err != nil {