Skip to content

Commit

Permalink
JAVA-2705: Move MongoDriverInformation from com.mongodb.client packag…
Browse files Browse the repository at this point in the history
…e to com.mongodb package.

   This breaks binary compatibility, but without this change it's impossible to modularize the core driver,
   as the com.mongodb.client package would be split between two modules, which is not allowed.

   A mitigating factor is that this class is only intended for use by wrapping drivers like our own Scala
   and Reactive Streams drivers, and so is unlikely to be referenced directly by downstream users besides
   MongoDB itself.
  • Loading branch information
jyemin committed Jan 9, 2018
1 parent 3d5e177 commit 121130a
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 36 deletions.
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
Expand Down
@@ -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.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.mongodb.client;
package com.mongodb;

import com.mongodb.annotations.NotThreadSafe;

Expand Down
20 changes: 0 additions & 20 deletions driver-core/src/main/com/mongodb/client/package-info.java

This file was deleted.

Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;

Expand Down
Expand Up @@ -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;

Expand Down
@@ -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.
Expand All @@ -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 {

Expand Down
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion driver-legacy/src/main/com/mongodb/Mongo.java
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion driver-legacy/src/main/com/mongodb/MongoClient.java
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
Expand Down

0 comments on commit 121130a

Please sign in to comment.