Remove Drop option from collectionopt

GODRIVER-52 Change-Id: If6b6f70c2e40742ff7fa185f91e254e2d71f1517
mongodb · Jul 24, 2018 · eecffe0 · eecffe0
1 parent aa6b7a8
commit eecffe0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/mongo/collection.go b/mongo/collection.go
@@ -26,6 +26,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/mongo/countopt"
 	"github.com/mongodb/mongo-go-driver/mongo/deleteopt"
 	"github.com/mongodb/mongo-go-driver/mongo/distinctopt"
+	"github.com/mongodb/mongo-go-driver/mongo/dropcollopt"
 	"github.com/mongodb/mongo-go-driver/mongo/findopt"
 	"github.com/mongodb/mongo-go-driver/mongo/insertopt"
 	"github.com/mongodb/mongo-go-driver/mongo/replaceopt"
@@ -1075,14 +1076,14 @@ func (coll *Collection) Indexes() IndexView {
 }
 
 // Drop drops this collection from database.
-func (coll *Collection) Drop(ctx context.Context, opts ...collectionopt.Drop) error {
+func (coll *Collection) Drop(ctx context.Context, opts ...dropcollopt.DropColl) error {
 	if ctx == nil {
 		ctx = context.Background()
 	}
 
 	var sess *session.Client
 	for _, opt := range opts {
-		if conv, ok := opt.(collectionopt.DropCollSession); ok {
+		if conv, ok := opt.(dropcollopt.DropCollSession); ok {
 			sess = conv.ConvertDropCollSession()
 		}
 	}

diff --git a/mongo/collectionopt/collectionopt.go b/mongo/collectionopt/collectionopt.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/readpref"
-	"github.com/mongodb/mongo-go-driver/core/session"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
 )
 
@@ -38,27 +37,6 @@ func (*CollectionBundle) collectionOption() {}
 // OptionFunc implements Option.
 func (optionFunc) collectionOption() {}
 
-// Drop represents all possible params for the drop() function.
-type Drop interface {
-	drop()
-}
-
-// DropCollSession is the session for the drop() function.
-type DropCollSession interface {
-	Drop
-	ConvertDropCollSession() *session.Client
-}
-
-// DropSessionOpt is a drop session option.
-type DropSessionOpt struct{}
-
-func (DropSessionOpt) drop() {}
-
-// ConvertDropCollSession implements the DropCollSession interface.
-func (DropSessionOpt) ConvertDropCollSession() *session.Client {
-	return nil
-}
-
 // BundleCollection bundles collection options.
 func BundleCollection(opts ...Option) *CollectionBundle {
 	head := collectionBundle

diff --git a/mongo/session.go b/mongo/session.go
@@ -12,7 +12,6 @@ import (
 	"github.com/mongodb/mongo-go-driver/core/session"
 	"github.com/mongodb/mongo-go-driver/mongo/aggregateopt"
 	"github.com/mongodb/mongo-go-driver/mongo/changestreamopt"
-	"github.com/mongodb/mongo-go-driver/mongo/collectionopt"
 	"github.com/mongodb/mongo-go-driver/mongo/countopt"
 	"github.com/mongodb/mongo-go-driver/mongo/dbopt"
 	"github.com/mongodb/mongo-go-driver/mongo/deleteopt"
@@ -39,7 +38,6 @@ type Session struct {
 	countopt.CountSessionOpt
 	deleteopt.DeleteSessionOpt
 	distinctopt.DistinctSessionOpt
-	collectionopt.DropSessionOpt
 	dbopt.DropDBSessionOpt
 	findopt.FindSessionOpt
 	dropcollopt.DropCollSessionOpt
@@ -59,7 +57,6 @@ var (
 	_ changestreamopt.ChangeStream      = (*Session)(nil)
 	_ deleteopt.Delete                  = (*Session)(nil)
 	_ distinctopt.Distinct              = (*Session)(nil)
-	_ collectionopt.Drop                = (*Session)(nil)
 	_ dbopt.DropDB                      = (*Session)(nil)
 	_ findopt.Find                      = (*Session)(nil)
 	_ findopt.One                       = (*Session)(nil)