Updated DB.addUser to user createCredential

Author: rozza

driver-legacy/src/main/com/mongodb/DB.java

@@ -29,14 +29,10 @@
 import com.mongodb.operation.CommandReadOperation;
 import com.mongodb.operation.CommandWriteOperation;
 import com.mongodb.operation.CreateCollectionOperation;
-import com.mongodb.operation.CreateUserOperation;
 import com.mongodb.operation.CreateViewOperation;
 import com.mongodb.operation.DropDatabaseOperation;
-import com.mongodb.operation.DropUserOperation;
 import com.mongodb.operation.ListCollectionsOperation;
 import com.mongodb.operation.ReadOperation;
-import com.mongodb.operation.UpdateUserOperation;
-import com.mongodb.operation.UserExistsOperation;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWrapper;
 import org.bson.BsonInt32;
@@ -52,7 +48,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import static com.mongodb.DBCollection.createWriteConcernException;
-import static com.mongodb.MongoCredential.createMongoCRCredential;
+import static com.mongodb.MongoCredential.createCredential;
 import static com.mongodb.MongoNamespace.checkDatabaseNameValidity;
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.notNull;
@@ -604,6 +600,7 @@ public CommandResult getStats() {
     /**
      * Adds or updates a user for this database
      *
+     * <p>Never create or modify users over an insecure network without the use of TLS.</p>
      * @param userName the user name
      * @param password the password
      * @return the result of executing this operation
@@ -621,6 +618,7 @@ public WriteResult addUser(final String userName, final char[] password) {
     /**
      * Adds or updates a user for this database
      *
+     * <p>Never create or modify users over an insecure network without the use of TLS.</p>
      * @param userName the user name
      * @param password the password
      * @param readOnly if true, user will only be able to read
@@ -633,21 +631,21 @@ public WriteResult addUser(final String userName, final char[] password) {
      */
     @Deprecated
     public WriteResult addUser(final String userName, final char[] password, final boolean readOnly) {
-        MongoCredential credential = createMongoCRCredential(userName, getName(), password);
+        MongoCredential credential = createCredential(userName, getName(), password);
         boolean userExists = false;
         try {
-            userExists = executor.execute(new UserExistsOperation(getName(), userName), primary());
+            userExists = executor.execute(new com.mongodb.operation.UserExistsOperation(getName(), userName), primary());
         } catch (MongoCommandException e) {
             if (e.getCode() != 13) {
                 throw e;
             }
         }
         try {
             if (userExists) {
-                executor.execute(new UpdateUserOperation(credential, readOnly, getWriteConcern()));
+                executor.execute(new com.mongodb.operation.UpdateUserOperation(credential, readOnly, getWriteConcern()));
                 return new WriteResult(1, true, null);
             } else {
-                executor.execute(new CreateUserOperation(credential, readOnly, getWriteConcern()));
+                executor.execute(new com.mongodb.operation.CreateUserOperation(credential, readOnly, getWriteConcern()));
                 return new WriteResult(1, false, null);
             }
         } catch (MongoWriteConcernException e) {
@@ -667,7 +665,7 @@ public WriteResult addUser(final String userName, final char[] password, final b
     @Deprecated
     public WriteResult removeUser(final String userName) {
         try {
-            executor.execute(new DropUserOperation(getName(), userName, getWriteConcern()));
+            executor.execute(new com.mongodb.operation.DropUserOperation(getName(), userName, getWriteConcern()));
             return new WriteResult(1, true, null);
         } catch (MongoWriteConcernException e) {
             throw createWriteConcernException(e);

driver-legacy/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy

@@ -136,7 +136,7 @@ class DBFunctionalSpecification extends FunctionalSpecification {
         database.setWriteConcern(null)
     }
 
-    @IgnoreIf({ serverVersionAtLeast(3, 7) || !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
     def 'should throw WriteConcernException on write concern error for add user'() {
         given:
         database.setWriteConcern(new WriteConcern(5))
@@ -153,7 +153,7 @@ class DBFunctionalSpecification extends FunctionalSpecification {
         database.removeUser('writeConcernUser')
     }
 
-    @IgnoreIf({ serverVersionAtLeast(3, 7) || !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
     def 'should throw WriteConcernException on write concern error for remove user'() {
         given:
         database.addUser('writeConcernUser', 'foo'.toCharArray())

driver-legacy/src/test/functional/com/mongodb/DBTest.java

@@ -39,7 +39,6 @@
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static com.mongodb.ClusterFixture.serverVersionLessThan;
 import static com.mongodb.DBObjectMatchers.hasFields;
 import static com.mongodb.DBObjectMatchers.hasSubdocument;
 import static com.mongodb.Fixture.getDefaultDatabaseName;
@@ -294,7 +293,6 @@ public void shouldNotThrowAnExceptionOnCommandFailure() {
 
     @Test
     public void shouldAddUser() {
-        assumeTrue(serverVersionLessThan("3.7"));
         String userName = "jeff";
         char[] password = "123".toCharArray();
         boolean readOnly = true;
@@ -312,7 +310,6 @@ public void shouldAddUser() {
 
     @Test
     public void shouldUpdateUser() {
-        assumeTrue(serverVersionLessThan("3.7"));
         String userName = "jeff";
         char[] password = "123".toCharArray();
         boolean readOnly = true;
@@ -336,7 +333,6 @@ public void shouldUpdateUser() {
 
     @Test
     public void shouldRemoveUser() {
-        assumeTrue(serverVersionLessThan("3.7"));
         String userName = "jeff";
 
         char[] password = "123".toCharArray();

driver-legacy/src/test/functional/com/mongodb/MongoClientSessionSpecification.groovy

@@ -323,7 +323,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         readConcern << [ReadConcern.DEFAULT, ReadConcern.LOCAL, ReadConcern.MAJORITY]
     }
 
-    @IgnoreIf({ serverVersionAtLeast(3, 7) || !serverVersionAtLeast(3, 6) || !isAuthenticated() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isAuthenticated() })
     @SuppressWarnings('deprecation')
     def 'should not use a default session when there is more than one authenticated user'() {
         given: