GODRIVER-249 Move options package into private

saghm · saghm · commit 8ccaef427e2d · 2018-03-05T16:11:07.000-05:00
Change-Id: Ibc024f0c422d45fdcca8189f8852c52defcf7e7a
diff --git a/mongo/change_stream.go b/mongo/change_stream.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
 	"github.com/mongodb/mongo-go-driver/mongo/private/conn"
 	"github.com/mongodb/mongo-go-driver/mongo/private/ops"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // ErrMissingResumeToken indicates that a change stream notification from the server did not
diff --git a/mongo/change_stream_test.go b/mongo/change_stream_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
 	"github.com/mongodb/mongo-go-driver/mongo/private/conn"
 	"github.com/mongodb/mongo-go-driver/mongo/private/ops"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/mongo/collection.go b/mongo/collection.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
 	"github.com/mongodb/mongo-go-driver/mongo/private/cluster"
 	"github.com/mongodb/mongo-go-driver/mongo/private/ops"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 	"github.com/mongodb/mongo-go-driver/mongo/readconcern"
 	"github.com/mongodb/mongo-go-driver/mongo/readpref"
 	"github.com/mongodb/mongo-go-driver/mongo/writeconcern"
diff --git a/mongo/collection_internal_test.go b/mongo/collection_internal_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
 	"github.com/mongodb/mongo-go-driver/mongo/internal/testutil"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 	"github.com/stretchr/testify/require"
 )
 
@@ -163,7 +163,7 @@ func TestCollection_DeleteOne_notFound_withOption(t *testing.T) {
 	initCollection(t, coll)
 
 	filter := bson.NewDocument(bson.EC.Int32("x", 0))
-	result, err := coll.DeleteOne(context.Background(), filter, Opt.Collation(&options.CollationOptions{Locale: "en_US"}))
+	result, err := coll.DeleteOne(context.Background(), filter, Opt.Collation(&options.Collation{Locale: "en_US"}))
 	require.Nil(t, err)
 	require.Equal(t, result.DeletedCount, int64(0))
 }
@@ -217,7 +217,7 @@ func TestCollection_DeleteMany_notFound_withOption(t *testing.T) {
 	filter := bson.NewDocument(
 		bson.EC.SubDocumentFromElements("x", bson.EC.Int32("$lt", 1)))
 
-	result, err := coll.DeleteMany(context.Background(), filter, Opt.Collation(&options.CollationOptions{Locale: "en_US"}))
+	result, err := coll.DeleteMany(context.Background(), filter, Opt.Collation(&options.Collation{Locale: "en_US"}))
 	require.Nil(t, err)
 	require.Equal(t, result.DeletedCount, int64(0))
 }
@@ -615,7 +615,7 @@ func TestCollection_Distinct_withOption(t *testing.T) {
 	coll := createTestCollection(t, nil, nil)
 	initCollection(t, coll)
 
-	results, err := coll.Distinct(context.Background(), "x", nil, Opt.Collation(&options.CollationOptions{Locale: "en_US"}))
+	results, err := coll.Distinct(context.Background(), "x", nil, Opt.Collation(&options.Collation{Locale: "en_US"}))
 	require.Nil(t, err)
 	require.Equal(t, results, []interface{}{int32(1), int32(2), int32(3), int32(4), int32(5)})
 }
diff --git a/mongo/crud_spec_test.go b/mongo/crud_spec_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/bson/extjson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal/testutil/helpers"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 	"github.com/stretchr/testify/require"
 )
 
@@ -884,8 +884,8 @@ func verifyCursorResults(t *testing.T, cursor Cursor, result json.RawMessage) {
 
 }
 
-func collationFromMap(m map[string]interface{}) *options.CollationOptions {
-	var collation options.CollationOptions
+func collationFromMap(m map[string]interface{}) *options.Collation {
+	var collation options.Collation
 
 	if locale, found := m["locale"]; found {
 		collation.Locale = locale.(string)
diff --git a/mongo/options.go b/mongo/options.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 	"github.com/mongodb/mongo-go-driver/mongo/readconcern"
 	"github.com/mongodb/mongo-go-driver/mongo/writeconcern"
 )
@@ -68,7 +68,7 @@ func (Options) BypassDocumentValidation(b bool) options.OptBypassDocumentValidat
 // for lettercase and accent marks.
 //
 // See https://docs.mongodb.com/manual/reference/collation/.
-func (Options) Collation(collation *options.CollationOptions) options.OptCollation {
+func (Options) Collation(collation *options.Collation) options.OptCollation {
 	opt := options.OptCollation{Collation: collation}
 	return opt
 }
diff --git a/mongo/private/ops/aggregate.go b/mongo/private/ops/aggregate.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Aggregate performs an aggregation.
diff --git a/mongo/private/ops/count.go b/mongo/private/ops/count.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Count counts how many documents in a collection match a given query.
diff --git a/mongo/private/ops/delete.go b/mongo/private/ops/delete.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Delete executes an delete command with a given set of delete documents and options.
diff --git a/mongo/private/ops/distinct.go b/mongo/private/ops/distinct.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Distinct returns the distinct values for a specified field across a single collection.
diff --git a/mongo/private/ops/find.go b/mongo/private/ops/find.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Find executes a query.
diff --git a/mongo/private/ops/find_one_and_delete.go b/mongo/private/ops/find_one_and_delete.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // FindOneAndDelete modifies and returns a single document.
diff --git a/mongo/private/ops/find_one_and_replace.go b/mongo/private/ops/find_one_and_replace.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // FindOneAndReplace modifies and returns a single document.
diff --git a/mongo/private/ops/find_one_and_update.go b/mongo/private/ops/find_one_and_update.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // FindOneAndUpdate modifies and returns a single document.
diff --git a/mongo/private/ops/insert.go b/mongo/private/ops/insert.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Insert executes an insert command for the given set of  documents.
diff --git a/mongo/private/ops/update.go b/mongo/private/ops/update.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/mongo/internal"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"github.com/mongodb/mongo-go-driver/mongo/private/options"
 )
 
 // Update executes an update command with a given set of update documents and options.
diff --git a/mongo/private/options/collation.go b/mongo/private/options/collation.go
@@ -8,9 +8,9 @@ package options
 
 import "github.com/mongodb/mongo-go-driver/bson"
 
-// CollationOptions allows users to specify language-specific rules for string comparison, such as
+// Collation allows users to specify language-specific rules for string comparison, such as
 // rules for lettercase and accent marks.
-type CollationOptions struct {
+type Collation struct {
 	Locale          string `bson:",omitempty"`
 	CaseLevel       bool   `bson:",omitempty"`
 	CaseFirst       string `bson:",omitempty"`
@@ -21,7 +21,7 @@ type CollationOptions struct {
 	Backwards       bool   `bson:",omitempty"`
 }
 
-func (co *CollationOptions) toDocument() *bson.Document {
+func (co *Collation) toDocument() *bson.Document {
 	doc := bson.NewDocument()
 	if co.Locale != "" {
 		doc.Append(bson.EC.String("locale", co.Locale))
@@ -51,6 +51,6 @@ func (co *CollationOptions) toDocument() *bson.Document {
 }
 
 // MarshalBSONDocument implements the bson.DocumentMarshaler interface.
-func (co *CollationOptions) MarshalBSONDocument() (*bson.Document, error) {
+func (co *Collation) MarshalBSONDocument() (*bson.Document, error) {
 	return co.toDocument(), nil
 }
diff --git a/mongo/private/options/cursor.go b/mongo/private/options/cursor.go
diff --git a/mongo/private/options/options.go b/mongo/private/options/options.go
@@ -296,7 +296,7 @@ func (OptBypassDocumentValidation) replaceOption()           {}
 func (OptBypassDocumentValidation) updateOption()            {}
 
 // OptCollation is for internal use.
-type OptCollation struct{ Collation *CollationOptions }
+type OptCollation struct{ Collation *Collation }
 
 // Option implements the Optioner interface.
 func (opt OptCollation) Option(d *bson.Document) {
diff --git a/mongo/private/options/return_document.go b/mongo/private/options/return_document.go

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ import (`
`13`	`13`
`14`	`14`	`"github.com/mongodb/mongo-go-driver/bson"`
`15`	`15`	`"github.com/mongodb/mongo-go-driver/mongo/internal"`
`16`		`- "github.com/mongodb/mongo-go-driver/mongo/options"`
`17`	`16`	`"github.com/mongodb/mongo-go-driver/mongo/private/conn"`
`18`	`17`	`"github.com/mongodb/mongo-go-driver/mongo/private/ops"`
	`18`	`+ "github.com/mongodb/mongo-go-driver/mongo/private/options"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// ErrMissingResumeToken indicates that a change stream notification from the server did not`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/mongodb/mongo-go-driver/bson"`
`10`	`10`	`"github.com/mongodb/mongo-go-driver/mongo/internal"`
`11`		`- "github.com/mongodb/mongo-go-driver/mongo/options"`
`12`	`11`	`"github.com/mongodb/mongo-go-driver/mongo/private/conn"`
`13`	`12`	`"github.com/mongodb/mongo-go-driver/mongo/private/ops"`
	`13`	`+ "github.com/mongodb/mongo-go-driver/mongo/private/options"`
`14`	`14`	`"github.com/stretchr/testify/require"`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/mongodb/mongo-go-driver/bson"`
`14`	`14`	`"github.com/mongodb/mongo-go-driver/mongo/internal"`
`15`		`- "github.com/mongodb/mongo-go-driver/mongo/options"`
	`15`	`+ "github.com/mongodb/mongo-go-driver/mongo/private/options"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// Aggregate performs an aggregation.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/mongodb/mongo-go-driver/bson"`
`13`	`13`	`"github.com/mongodb/mongo-go-driver/mongo/internal"`
`14`		`- "github.com/mongodb/mongo-go-driver/mongo/options"`
	`14`	`+ "github.com/mongodb/mongo-go-driver/mongo/private/options"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// Delete executes an delete command with a given set of delete documents and options.`