SPY-187: Expose a few more attributes of MemcachedClient

Motivation
----------
Extending MemcachedClient to access some of its protected attributes is
not always desirable as it makes harder writing mocks for unit testing.

Modifications
-------------
MemcachedClient now exposes operationTimeout,
mconn, tcService and executorService.

Result
------
One does not have to extend MemcachedClient any more to write custom
commands.

Change-Id: I81932da64d4492512dcf1a11fe1161203fa70c5e
Reviewed-on: http://review.couchbase.org/51546
Reviewed-by: Michael Nitschinger <[email protected]>
Tested-by: Michael Nitschinger <[email protected]>

Author: fabienrenaud

src/main/java/net/spy/memcached/DefaultConnectionFactory.java

@@ -142,6 +142,22 @@ public class DefaultConnectionFactory extends SpyObject implements
    */
   private ExecutorService executorService;
 
+  /**
+   *Construct a DefaultConnectionFactory with the given parameters.
+   *
+   * @param qLen the queue length.
+   * @param bufSize the buffer size
+   * @param hash the algorithm to use for hashing
+   */
+  public DefaultConnectionFactory(int qLen, int bufSize, HashAlgorithm hash) {
+    super();
+    clientMode = ClientMode.Dynamic;
+    opQueueLen = qLen;
+    readBufSize = bufSize;
+    hashAlg = hash;
+    metrics = null;
+  }
+
   /**
    * Construct a DefaultConnectionFactory with the given parameters.
    *

src/main/java/net/spy/memcached/KetamaConnectionFactory.java

@@ -66,7 +66,9 @@ public class KetamaConnectionFactory extends DefaultConnectionFactory {
    */
   public KetamaConnectionFactory(ClientMode clientMode, int qLen, int bufSize,
       long opQueueMaxBlockTime) {
-    super(clientMode, qLen, bufSize, DefaultHashAlgorithm.KETAMA_HASH);
+      super(clientMode, qLen, bufSize, DefaultHashAlgorithm.KETAMA_HASH);
+      this.ketamaNodeKeyFormat = KetamaNodeKeyFormatter.Format.SPYMEMCACHED;
+      this.weights = new HashMap<InetSocketAddress, Integer>();
   }
 
   public KetamaConnectionFactory(int qLen, int bufSize,

src/main/java/net/spy/memcached/MemcachedClient.java

@@ -34,33 +34,6 @@
 
 package net.spy.memcached;
 
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
 import net.spy.memcached.auth.AuthDescriptor;
 import net.spy.memcached.auth.AuthThreadMonitor;
 import net.spy.memcached.compat.SpyObject;
@@ -95,13 +68,39 @@
 import net.spy.memcached.ops.StoreOperation;
 import net.spy.memcached.ops.StoreType;
 import net.spy.memcached.ops.TimedOutOperationStatus;
-import net.spy.memcached.protocol.ascii.AsciiOperationFactory;
 import net.spy.memcached.protocol.binary.BinaryOperationFactory;
 import net.spy.memcached.transcoders.SerializingTranscoder;
 import net.spy.memcached.transcoders.TranscodeService;
 import net.spy.memcached.transcoders.Transcoder;
 import net.spy.memcached.util.StringUtils;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Client to a memcached server.
  *
@@ -3062,8 +3061,25 @@ void setIsConfigurtionInitialized(boolean isConfigurationInitialized){
     this.isConfigurationInitialized = isConfigurationInitialized;
   }
 
+  public long getOperationTimeout() {
+    return operationTimeout;
+  }
+
+  public MemcachedConnection getConnection() {
+    return mconn;
+  }
+
+  public TranscodeService getTranscoderService() {
+    return tcService;
+  }
+
+  public ExecutorService getExecutorService() {
+    return executorService;
+  }
+
   @Override
   public String toString() {
     return connFactory.toString();
   }
 }
+

src/main/java/net/spy/memcached/MemcachedClientIF.java

@@ -23,6 +23,10 @@
 
 package net.spy.memcached;
 
+import net.spy.memcached.internal.BulkFuture;
+import net.spy.memcached.internal.OperationFuture;
+import net.spy.memcached.transcoders.Transcoder;
+
 import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.Iterator;
@@ -32,10 +36,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import net.spy.memcached.internal.BulkFuture;
-import net.spy.memcached.internal.OperationFuture;
-import net.spy.memcached.transcoders.Transcoder;
-
 /**
  * This interface is provided as a helper for testing clients of the
  * MemcachedClient.
@@ -240,4 +240,5 @@ CountDownLatch broadcastOp(final BroadcastOpFactory of,
    * @return the union of all SASL mechanisms supported by the servers.
    */
   Set<String> listSaslMechanisms();
+
 }