diff --git a/driver-async/src/main/com/mongodb/async/client/MongoClients.java b/driver-async/src/main/com/mongodb/async/client/MongoClients.java index 64f7e27967a..0a9a86d69a3 100644 --- a/driver-async/src/main/com/mongodb/async/client/MongoClients.java +++ b/driver-async/src/main/com/mongodb/async/client/MongoClients.java @@ -19,7 +19,7 @@ import com.mongodb.ConnectionString; import com.mongodb.DBRefCodecProvider; import com.mongodb.DocumentToDBRefTransformer; -import com.mongodb.client.MongoDriverInformation; +import com.mongodb.MongoDriverInformation; import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider; import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider; import com.mongodb.connection.AsynchronousSocketChannelStreamFactory; diff --git a/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java b/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java index 68ad02d0e1e..fceede66beb 100644 --- a/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java +++ b/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java @@ -17,7 +17,7 @@ package com.mongodb.async.client; -import com.mongodb.client.MongoDriverInformation; +import com.mongodb.MongoDriverInformation; import com.mongodb.connection.StreamFactory; import com.mongodb.connection.netty.NettyStreamFactory; import io.netty.channel.EventLoopGroup; diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy index 3e493c217a4..c63323bd94d 100644 --- a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy +++ b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy @@ -22,7 +22,7 @@ import com.mongodb.MongoCredential import com.mongodb.ReadConcern import com.mongodb.ServerAddress import com.mongodb.WriteConcern -import com.mongodb.client.MongoDriverInformation +import com.mongodb.MongoDriverInformation import org.bson.Document import spock.lang.IgnoreIf import spock.lang.Unroll diff --git a/driver-core/src/main/com/mongodb/client/MongoDriverInformation.java b/driver-core/src/main/com/mongodb/MongoDriverInformation.java similarity index 98% rename from driver-core/src/main/com/mongodb/client/MongoDriverInformation.java rename to driver-core/src/main/com/mongodb/MongoDriverInformation.java index eddab4a89d0..e843d31b420 100644 --- a/driver-core/src/main/com/mongodb/client/MongoDriverInformation.java +++ b/driver-core/src/main/com/mongodb/MongoDriverInformation.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 MongoDB, Inc. + * Copyright 2017 MongoDB, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mongodb.client; +package com.mongodb; import com.mongodb.annotations.NotThreadSafe; diff --git a/driver-core/src/main/com/mongodb/client/package-info.java b/driver-core/src/main/com/mongodb/client/package-info.java deleted file mode 100644 index c9be33605c2..00000000000 --- a/driver-core/src/main/com/mongodb/client/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2008-2014 MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This package contains classes for the new client api for MongoDatabase and MongoCollection - */ -package com.mongodb.client; diff --git a/driver-core/src/main/com/mongodb/connection/ClientMetadataHelper.java b/driver-core/src/main/com/mongodb/connection/ClientMetadataHelper.java index 53177d528db..6ae04df106d 100644 --- a/driver-core/src/main/com/mongodb/connection/ClientMetadataHelper.java +++ b/driver-core/src/main/com/mongodb/connection/ClientMetadataHelper.java @@ -17,7 +17,7 @@ package com.mongodb.connection; -import com.mongodb.client.MongoDriverInformation; +import com.mongodb.MongoDriverInformation; import org.bson.BsonBinaryWriter; import org.bson.BsonDocument; import org.bson.BsonString; diff --git a/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java b/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java index 0e78ef16360..0b4c281431d 100644 --- a/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java +++ b/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java @@ -18,7 +18,7 @@ import com.mongodb.MongoCompressor; import com.mongodb.MongoCredential; -import com.mongodb.client.MongoDriverInformation; +import com.mongodb.MongoDriverInformation; import com.mongodb.event.ClusterListener; import com.mongodb.event.CommandListener; import com.mongodb.event.ConnectionPoolListener; diff --git a/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java b/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java index 0041461c4dc..9578b8715e5 100644 --- a/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java +++ b/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java @@ -19,7 +19,7 @@ import com.mongodb.MongoCompressor; import com.mongodb.MongoCredential; import com.mongodb.ServerAddress; -import com.mongodb.client.MongoDriverInformation; +import com.mongodb.MongoDriverInformation; import com.mongodb.event.CommandListener; import com.mongodb.event.ServerListener; diff --git a/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java b/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java index 80ee7ec1647..dc9cfc8407d 100644 --- a/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java +++ b/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java @@ -18,7 +18,7 @@ import com.mongodb.MongoCompressor; import com.mongodb.MongoCredential; -import com.mongodb.client.MongoDriverInformation; +import com.mongodb.MongoDriverInformation; import com.mongodb.event.CommandListener; import org.bson.BsonDocument; diff --git a/driver-core/src/test/unit/com/mongodb/client/MongoDriverInformationSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoDriverInformationSpecification.groovy similarity index 97% rename from driver-core/src/test/unit/com/mongodb/client/MongoDriverInformationSpecification.groovy rename to driver-core/src/test/unit/com/mongodb/MongoDriverInformationSpecification.groovy index 503ef73db70..9a78c3c74c0 100644 --- a/driver-core/src/test/unit/com/mongodb/client/MongoDriverInformationSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/MongoDriverInformationSpecification.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2016 MongoDB, Inc. + * Copyright 2017 MongoDB, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.mongodb.client; +package com.mongodb -import spock.lang.Specification; +import spock.lang.Specification class MongoDriverInformationSpecification extends Specification { diff --git a/driver-core/src/test/unit/com/mongodb/connection/ClientMetadataHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ClientMetadataHelperSpecification.groovy index ccb95a2b432..2434e7a4c45 100644 --- a/driver-core/src/test/unit/com/mongodb/connection/ClientMetadataHelperSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/connection/ClientMetadataHelperSpecification.groovy @@ -17,7 +17,7 @@ package com.mongodb.connection -import com.mongodb.client.MongoDriverInformation +import com.mongodb.MongoDriverInformation import org.bson.BsonBinaryWriter import org.bson.BsonDocument import org.bson.BsonString diff --git a/driver-legacy/src/main/com/mongodb/Mongo.java b/driver-legacy/src/main/com/mongodb/Mongo.java index bf29c719a7f..eb883342329 100644 --- a/driver-legacy/src/main/com/mongodb/Mongo.java +++ b/driver-legacy/src/main/com/mongodb/Mongo.java @@ -23,7 +23,6 @@ import com.mongodb.binding.ReadWriteBinding; import com.mongodb.binding.SingleServerBinding; import com.mongodb.binding.WriteBinding; -import com.mongodb.client.MongoDriverInformation; import com.mongodb.client.internal.MongoIterableImpl; import com.mongodb.client.internal.OperationExecutor; import com.mongodb.connection.BufferProvider; diff --git a/driver-legacy/src/main/com/mongodb/MongoClient.java b/driver-legacy/src/main/com/mongodb/MongoClient.java index 79bbb413da2..9286abac679 100644 --- a/driver-legacy/src/main/com/mongodb/MongoClient.java +++ b/driver-legacy/src/main/com/mongodb/MongoClient.java @@ -18,7 +18,6 @@ import com.mongodb.client.ListDatabasesIterable; import com.mongodb.client.MongoDatabase; -import com.mongodb.client.MongoDriverInformation; import com.mongodb.client.MongoIterable; import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider; import com.mongodb.client.internal.ListDatabasesIterableImpl; diff --git a/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy index 79627d25841..7015947f563 100644 --- a/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy +++ b/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy @@ -17,7 +17,6 @@ package com.mongodb -import com.mongodb.client.MongoDriverInformation import com.mongodb.connection.ClusterDescription import com.mongodb.connection.ServerDescription import com.mongodb.event.CommandFailedEvent