Rearrange BSON library packages

Removed builder, parser, parser/ast, and elements packages. Moved unstable packages under x/bsonx. Change-Id: I8cb68a4e1839dd4efc3e4f32073213a0f6512e9d
clenimar · Nov 15, 2018 · bb96e7b · bb96e7b
1 parent 6fd340f
commit bb96e7b
Show file tree

Hide file tree

Showing 45 changed files with 34 additions and 4,959 deletions.
diff --git a/Makefile b/Makefile
@@ -4,8 +4,10 @@ MONGO_PKGS = $(shell ./etc/find_pkgs.sh ./mongo)
 MONGO_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./mongo _test)
 CORE_PKGS = $(shell ./etc/find_pkgs.sh ./core)
 CORE_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./core _test)
-PKGS = $(BSON_PKGS) $(MONGO_PKGS) $(CORE_PKGS)
-TEST_PKGS = $(BSON_TEST_PKGS) $(MONGO_TEST_PKGS) $(CORE_TEST_PKGS)
+UNSTABLE_PKGS = $(shell ./etc/find_pkgs.sh ./x)
+UNSTABLE_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./x _test)
+PKGS = $(BSON_PKGS) $(MONGO_PKGS) $(CORE_PKGS) $(UNSTABLE_PKGS)
+TEST_PKGS = $(BSON_TEST_PKGS) $(MONGO_TEST_PKGS) $(CORE_TEST_PKGS) $(UNSTABLE_TEST_PKGS)
 
 TEST_TIMEOUT = 600
 

diff --git a/bson/bson_test.go b/bson/bson_test.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/x/bsonx"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/bson/bsoncodec/default_value_decoders_test.go b/bson/bsoncodec/default_value_decoders_test.go
@@ -18,12 +18,12 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 func TestDefaultValueDecoders(t *testing.T) {

diff --git a/bson/bsoncodec/default_value_encoders_test.go b/bson/bsoncodec/default_value_encoders_test.go
@@ -16,12 +16,12 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 func TestDefaultValueEncoders(t *testing.T) {

diff --git a/bson/bsonrw/bsonrwtest/bsonrwtest.go b/bson/bsonrw/bsonrwtest/bsonrwtest.go
@@ -9,11 +9,11 @@ package bsonrwtest
 import (
 	"testing"
 
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 var _ bsonrw.ValueReader = (*ValueReaderWriter)(nil)

diff --git a/bson/bsonrw/copier.go b/bson/bsonrw/copier.go
@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 // Copier is a type that allows copying between ValueReaders, ValueWriters, and

diff --git a/bson/bsonrw/copier_test.go b/bson/bsonrw/copier_test.go
@@ -12,10 +12,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 func TestCopier(t *testing.T) {

diff --git a/bson/bsonrw/value_reader_test.go b/bson/bsonrw/value_reader_test.go
@@ -14,10 +14,10 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 func TestValueReader(t *testing.T) {

diff --git a/bson/bsonrw/value_reader_writer_test.go b/bson/bsonrw/value_reader_writer_test.go
@@ -9,10 +9,10 @@ package bsonrw
 import (
 	"testing"
 
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 type VRWInvoked byte

diff --git a/bson/bsonrw/value_writer.go b/bson/bsonrw/value_writer.go
@@ -14,10 +14,10 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 var _ ValueWriter = (*valueWriter)(nil)

diff --git a/bson/bsonrw/value_writer_test.go b/bson/bsonrw/value_writer_test.go
@@ -15,10 +15,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
 	"github.com/mongodb/mongo-go-driver/bson/objectid"
+	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
 func TestNewBSONValueWriter(t *testing.T) {

diff --git a/bson/builder/array_constructor.go b/bson/builder/array_constructor.go