JAVA-2647: Remove initialClusterTime and initialOperationTime properties from ClientSessionOptions

Author: jyemin

driver/src/main/com/mongodb/ClientSessionOptions.java

@@ -19,8 +19,6 @@
 
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
-import org.bson.BsonDocument;
-import org.bson.BsonTimestamp;
 
 /**
  * The options to apply to a {@code ClientSession}.
@@ -34,8 +32,6 @@
 public final class ClientSessionOptions {
 
     private final Boolean causallyConsistent;
-    private final BsonDocument initialClusterTime;
-    private final BsonTimestamp initialOperationTime;
 
     /**
      * Whether operations using the session should causally consistent with each other.
@@ -47,23 +43,6 @@ public Boolean isCausallyConsistent() {
         return causallyConsistent;
     }
 
-    /**
-     * Gets the initial cluster time to apply to the client session
-     *
-     * @return the initial cluster time, which may be null
-     */
-    public BsonDocument getInitialClusterTime() {
-        return initialClusterTime;
-    }
-
-    /**
-     * Gets the initial operation time to apply to the client session
-     * @return the initial operation time, which may be null
-     */
-    public BsonTimestamp getInitialOperationTime() {
-        return initialOperationTime;
-    }
-
     /**
      * Gets an instance of a builder
      *
@@ -79,8 +58,6 @@ public static Builder builder() {
     @NotThreadSafe
     public static final class Builder {
         private Boolean causallyConsistent;
-        private BsonDocument initialClusterTime;
-        private BsonTimestamp initialOperationTime;
 
         /**
          * Sets whether operations using the session should causally consistent with each other.
@@ -93,27 +70,6 @@ public Builder causallyConsistent(final boolean causallyConsistent) {
             return this;
         }
 
-        /**
-         * Sets the initial cluster time to apply to the client session
-         *
-         * @param initialClusterTime the initial cluster time, which may be null
-         * @return this
-         */
-        public Builder initialClusterTime(final BsonDocument initialClusterTime) {
-            this.initialClusterTime = initialClusterTime;
-            return this;
-        }
-
-        /**
-         * Gets the initial operation time to apply to the client session
-         *
-         * @param initialOperationTime the initial operation time, which may be null
-         * @return this
-         */
-        public Builder initialOperationTime(final BsonTimestamp initialOperationTime) {
-            this.initialOperationTime = initialOperationTime;
-            return this;
-        }
         /**
          * Build the session options instance.
          *
@@ -129,7 +85,5 @@ private Builder() {
 
     private ClientSessionOptions(final Builder builder) {
         this.causallyConsistent = builder.causallyConsistent;
-        this.initialClusterTime = builder.initialClusterTime;
-        this.initialOperationTime = builder.initialOperationTime;
     }
 }

driver/src/main/com/mongodb/Mongo.java

@@ -874,8 +874,6 @@ static class ClientSessionImpl implements ClientSession {
             this.mongo = mongo;
             this.serverSession = mongo.serverSessionPool.get();
             this.options = options;
-            clusterTime = options.getInitialClusterTime();
-            operationTime = options.getInitialOperationTime();
             closed = false;
         }
 

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

@@ -197,22 +197,14 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         when:
         def clientSession = Fixture.getMongoClient().startSession(ClientSessionOptions.builder()
                 .causallyConsistent(causallyConsistent)
-                .initialClusterTime(initialClusterTime)
-                .initialOperationTime(initialOperationTime)
                 .build())
 
         then:
         clientSession != null
         clientSession.isCausallyConsistent() == causallyConsistent
-        clientSession.getClusterTime() == initialClusterTime
-        clientSession.getOperationTime() == initialOperationTime
 
         where:
-        [causallyConsistent, initialClusterTime, initialOperationTime] << [
-                [true, false],
-                [null, new BsonDocument('x', new BsonInt32(1))],
-                [null, new BsonTimestamp(42, 1)]
-        ].combinations()
+        causallyConsistent << [true, false]
     }
 
     @IgnoreIf({ !serverVersionAtLeast(3, 5) })

driver/src/test/unit/com/mongodb/ClientSessionOptionsSpecification.groovy

@@ -16,9 +16,6 @@
 
 package com.mongodb
 
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonTimestamp
 import spock.lang.Specification
 
 class ClientSessionOptionsSpecification extends Specification {
@@ -29,28 +26,18 @@ class ClientSessionOptionsSpecification extends Specification {
 
         then:
         options.isCausallyConsistent() == null
-        options.getInitialClusterTime() == null
-        options.getInitialOperationTime() == null
     }
 
     def 'should apply options set in builder'() {
         when:
         def options = ClientSessionOptions.builder()
                 .causallyConsistent(causallyConsistent)
-                .initialClusterTime(initialClusterTime)
-                .initialOperationTime(initialOperationTime)
                 .build()
 
         then:
         options.isCausallyConsistent() == causallyConsistent
-        options.getInitialClusterTime() == initialClusterTime
-        options.getInitialOperationTime() == initialOperationTime
 
         where:
-        [causallyConsistent, initialClusterTime, initialOperationTime] << [
-                [true, false],
-                [null, new BsonDocument('x', new BsonInt32(1))],
-                [null, new BsonTimestamp(42, 1)]
-        ].combinations()
+        causallyConsistent << [true, false]
     }
 }