geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [02/51] [abbrv] [partial] geode git commit: GEODE-2632: change dependencies on GemFireCacheImpl to InternalCache
Date Fri, 12 May 2017 22:18:05 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index c000109..583aa56 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.jmock.Expectations;
 import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.After;
 import org.junit.Before;
@@ -74,6 +75,7 @@ public class ListIndexFunctionJUnitTest {
     mockContext = new Mockery() {
       {
         setImposteriser(ClassImposteriser.INSTANCE);
+        setThreadingPolicy(new Synchroniser());
       }
     };
     mockCounter = new AtomicLong(0l);

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java
index 1966a08..917361f 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java
@@ -26,8 +26,10 @@ import org.apache.geode.cache.RegionExistsException;
 import org.apache.geode.cache.TimeoutException;
 import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.internal.InternalClientCache;
 import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.internal.JUnit3DistributedTestCase;
 
@@ -70,27 +72,27 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase
    * Finish what {@code beginCacheXml} started. It does this be generating a cache.xml file and then
    * creating a real cache using that cache.xml.
    */
-  public final void finishCacheXml(final String name, final boolean useSchema,
+  public final void finishCacheXml(final File root, final String name, final boolean useSchema,
       final String xmlVersion) {
-    delegate.finishCacheXml(name, useSchema, xmlVersion);
+    delegate.finishCacheXml(root, name, useSchema, xmlVersion);
   }
 
   /**
    * Return a cache for obtaining regions, created lazily.
    */
-  public final Cache getCache() {
+  public final InternalCache getCache() {
     return delegate.getCache();
   }
 
-  public final Cache getCache(final CacheFactory factory) {
+  public final InternalCache getCache(final CacheFactory factory) {
     return delegate.getCache(factory);
   }
 
-  public final Cache getCache(final boolean client) {
+  public final InternalCache getCache(final boolean client) {
     return delegate.getCache(client);
   }
 
-  public final Cache getCache(final boolean client, final CacheFactory factory) {
+  public final InternalCache getCache(final boolean client, final CacheFactory factory) {
     return delegate.getCache(client, factory);
   }
 
@@ -99,7 +101,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase
    *
    * @since GemFire 6.5
    */
-  public final ClientCache getClientCache(final ClientCacheFactory factory) {
+  public final InternalClientCache getClientCache(final ClientCacheFactory factory) {
     return delegate.getClientCache(factory);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 4ccf8c2..60f47c4 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -39,10 +39,12 @@ import org.apache.geode.cache.TimeoutException;
 import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.cache.client.internal.InternalClientCache;
 import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionMessageObserver;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.InternalRegionArguments;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.xmlcache.CacheCreation;
@@ -79,7 +81,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
    * <p>
    * Field is static so it doesn't get serialized with SerializableRunnable inner classes.
    */
-  private static Cache cache;
+  private static InternalCache cache;
 
   private final CacheTestFixture cacheTestFixture;
 
@@ -112,20 +114,20 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
       try {
         System.setProperty(
             DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true");
-        Cache newCache;
+        InternalCache newCache;
         if (client) {
           System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "locators", "");
           System.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0");
-          newCache = (Cache) new ClientCacheFactory(getSystem().getProperties()).create();
+          newCache = (InternalCache) new ClientCacheFactory(getSystem().getProperties()).create();
         } else {
           if (factory == null) {
-            newCache = CacheFactory.create(getSystem());
+            newCache = (InternalCache) CacheFactory.create(getSystem());
           } else {
             Properties props = getSystem().getProperties();
             for (Map.Entry entry : props.entrySet()) {
               factory.set((String) entry.getKey(), (String) entry.getValue());
             }
-            newCache = factory.create();
+            newCache = (InternalCache) factory.create();
           }
         }
         cache = newCache;
@@ -154,7 +156,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
       try {
         System.setProperty(
             DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true");
-        Cache newCache = CacheFactory.create(getLonerSystem());
+        InternalCache newCache = (InternalCache) CacheFactory.create(getLonerSystem());
         cache = newCache;
       } catch (CacheExistsException e) {
         Assert.fail("the cache already exists", e); // TODO: remove error handling
@@ -211,10 +213,10 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
    * Finish what {@code beginCacheXml} started. It does this be generating a cache.xml file and then
    * creating a real cache using that cache.xml.
    */
-  public final void finishCacheXml(final String name, final boolean useSchema,
+  public final void finishCacheXml(final File root, final String name, final boolean useSchema,
       final String xmlVersion) {
     synchronized (JUnit4CacheTestCase.class) {
-      File dir = new File("XML_" + xmlVersion);
+      File dir = new File(root, "XML_" + xmlVersion);
       dir.mkdirs();
       File file = new File(dir, name + ".xml");
       try {
@@ -222,8 +224,8 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
         CacheXmlGenerator.generate(cache, pw, useSchema, xmlVersion);
         pw.close();
       } catch (IOException ex) {
-        Assert.fail("IOException during cache.xml generation to " + file, ex); // TODO: remove error
-                                                                               // handling
+        // TODO: remove error handling
+        Assert.fail("IOException during cache.xml generation to " + file, ex);
       }
       cache = null;
       GemFireCacheImpl.testCacheXml = file;
@@ -238,24 +240,24 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
   /**
    * Return a cache for obtaining regions, created lazily.
    */
-  public final Cache getCache() {
+  public final InternalCache getCache() {
     return getCache(false);
   }
 
-  public final Cache getCache(final CacheFactory factory) {
+  public final InternalCache getCache(final CacheFactory factory) {
     return getCache(false, factory);
   }
 
-  public final Cache getCache(final Properties properties) {
+  public final InternalCache getCache(final Properties properties) {
     getSystem(properties);
     return getCache();
   }
 
-  public final Cache getCache(final boolean client) {
+  public final InternalCache getCache(final boolean client) {
     return getCache(client, null);
   }
 
-  public final Cache getCache(final boolean client, final CacheFactory factory) {
+  public final InternalCache getCache(final boolean client, final CacheFactory factory) {
     synchronized (JUnit4CacheTestCase.class) {
       final GemFireCacheImpl gemFireCache = GemFireCacheImpl.getInstance();
       if (gemFireCache != null && !gemFireCache.isClosed()
@@ -288,7 +290,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
    *
    * @since GemFire 6.5
    */
-  public final ClientCache getClientCache(final ClientCacheFactory factory) {
+  public final InternalClientCache getClientCache(final ClientCacheFactory factory) {
     synchronized (JUnit4CacheTestCase.class) {
       final GemFireCacheImpl gemFireCache = GemFireCacheImpl.getInstance();
       if (gemFireCache != null && !gemFireCache.isClosed()
@@ -308,12 +310,12 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
       if (cache == null || cache.isClosed()) {
         cache = null;
         disconnectFromDS();
-        cache = (Cache) factory.create();
+        cache = (InternalCache) factory.create();
       }
       if (cache != null) {
         IgnoredException.addIgnoredException("java.net.ConnectException");
       }
-      return (ClientCache) cache;
+      return (InternalClientCache) cache;
     }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
index 3e8630b..d02ce74 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
@@ -24,14 +24,10 @@ import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- */
 public class RemoteDUnitVM extends UnicastRemoteObject implements RemoteDUnitVMIF {
-
   private static final Logger logger = LogService.getLogger();
 
-  public RemoteDUnitVM() throws RemoteException {
+  RemoteDUnitVM() throws RemoteException {
     super();
   }
 
@@ -40,37 +36,38 @@ public class RemoteDUnitVM extends UnicastRemoteObject implements RemoteDUnitVMI
    * the object. Does this synchronously (does not spawn a thread). This method is used by the unit
    * test framework, dunit.
    *
-   * @param obj the object to execute the method on
+   * @param target the object to execute the method on
    * @param methodName the name of the method to execute
    * @return the result of method execution
    */
-  public MethExecutorResult executeMethodOnObject(Object obj, String methodName) {
-    String name = obj.getClass().getName() + "." + methodName + " on object: " + obj;
+  @Override
+  public MethExecutorResult executeMethodOnObject(Object target, String methodName) {
+    String name = target.getClass().getName() + '.' + methodName + " on object: " + target;
     long start = start(name);
-    MethExecutorResult result = MethExecutor.executeObject(obj, methodName);
+    MethExecutorResult result = MethExecutor.executeObject(target, methodName);
     logDelta(name, start, result);
     return result;
   }
 
   protected long start(String name) {
-    logger.info("Received method: " + name);
-    long start = System.nanoTime();
-    return start;
+    logger.info("Received method: {}", name);
+    return System.nanoTime();
   }
 
-  protected void logDelta(String name, long start, MethExecutorResult result) {
+  private void logDelta(String name, long start, MethExecutorResult result) {
     long delta = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
-    logger.info("Got result: " + result.toString() + " from " + name + " (took " + delta + " ms)");
+    logger.info("Got result: {} from {} (took {} ms)", result, name, delta);
   }
 
   /**
    * Executes a given instance method on a given object with the given arguments.
    */
-  public MethExecutorResult executeMethodOnObject(Object obj, String methodName, Object[] args) {
-    String name = obj.getClass().getName() + "." + methodName
-        + (args != null ? " with " + args.length + " args" : "") + " on object: " + obj;
+  @Override
+  public MethExecutorResult executeMethodOnObject(Object target, String methodName, Object[] args) {
+    String name = target.getClass().getName() + '.' + methodName
+        + (args != null ? " with " + args.length + " args" : "") + " on object: " + target;
     long start = start(name);
-    MethExecutorResult result = MethExecutor.executeObject(obj, methodName, args);
+    MethExecutorResult result = MethExecutor.executeObject(target, methodName, args);
     logDelta(name, start, result);
     return result;
   }
@@ -85,7 +82,7 @@ public class RemoteDUnitVM extends UnicastRemoteObject implements RemoteDUnitVMI
    * @return the result of method execution
    */
   public MethExecutorResult executeMethodOnClass(String className, String methodName) {
-    String name = className + "." + methodName;
+    String name = className + '.' + methodName;
     long start = start(name);
     MethExecutorResult result = MethExecutor.execute(className, methodName);
     logDelta(name, start, result);
@@ -96,10 +93,11 @@ public class RemoteDUnitVM extends UnicastRemoteObject implements RemoteDUnitVMI
   /**
    * Executes a given static method in a given class with the given arguments.
    */
+  @Override
   public MethExecutorResult executeMethodOnClass(String className, String methodName,
       Object[] args) {
     String name =
-        className + "." + methodName + (args != null ? " with " + args.length + " args" : "");
+        className + '.' + methodName + (args != null ? " with " + args.length + " args" : "");
     long start = start(name);
     MethExecutorResult result = MethExecutor.execute(className, methodName, args);
     logDelta(name, start, result);
@@ -107,22 +105,25 @@ public class RemoteDUnitVM extends UnicastRemoteObject implements RemoteDUnitVMI
   }
 
   public void executeTask(int tsid, int type, int index) throws RemoteException {
-    throw new UnsupportedOperationException();
-
+    throw new UnsupportedOperationException("executeTask is not implemented");
   }
 
   public void runShutdownHook() throws RemoteException {
-
+    throw new UnsupportedOperationException("runShutdownHook is not implemented");
   }
 
   public void notifyDynamicActionComplete(int actionId) throws RemoteException {
-    throw new UnsupportedOperationException();
-
+    throw new UnsupportedOperationException("notifyDynamicActionComplete is not implemented");
   }
 
+  @Override
   public void shutDownVM() throws RemoteException {
     ChildVM.stopVM();
   }
 
-  public void disconnectVM() throws RemoteException {}
+  public void disconnectVM() throws RemoteException {
+    throw new UnsupportedOperationException("disconnectVM is not implemented");
+  }
+
+  private static final long serialVersionUID = 251934856609958734L;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
index d2cc533..9db6b06 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
@@ -21,12 +21,12 @@ import hydra.MethExecutorResult;
 
 public interface RemoteDUnitVMIF extends Remote {
 
-  MethExecutorResult executeMethodOnObject(Object o, String methodName) throws RemoteException;
+  MethExecutorResult executeMethodOnObject(Object target, String methodName) throws RemoteException;
 
-  MethExecutorResult executeMethodOnObject(Object o, String methodName, Object[] args)
+  MethExecutorResult executeMethodOnObject(Object target, String methodName, Object[] args)
       throws RemoteException;
 
-  MethExecutorResult executeMethodOnClass(String name, String methodName, Object[] args)
+  MethExecutorResult executeMethodOnClass(String className, String methodName, Object[] args)
       throws RemoteException;
 
   void shutDownVM() throws RemoteException;

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 2046eed..01b16a3 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -470,8 +470,8 @@ fromData,47,2a2bb700182a2bb900190100b500052a2bb900190100b500062a2bb8001ac0001bb5
 toData,44,2a2bb700152b2ab40005b9001602002b2ab40006b9001602002ab4000a2bb800172b2ab4000fb900160200b1
 
 org/apache/geode/internal/admin/remote/BridgeServerResponse,2
-fromData,28,2a2bb700282a2bb80029c0000fb5000b2a2bb80029c00023b50024b1
-toData,22,2a2bb700262ab4000b2bb800272ab400242bb80027b1
+fromData,28,2a2bb700292a2bb8002ac0000fb5000b2a2bb8002ac00024b50025b1
+toData,22,2a2bb700272ab4000b2bb800282ab400252bb80028b1
 
 org/apache/geode/internal/admin/remote/CacheConfigRequest,2
 fromData,36,2a2bb700112a2bb900120100b500032a2bb900130100b500042a2bb900130100b50006b1
@@ -512,8 +512,8 @@ toData,73,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400
 toDataPre_GFE_8_0_0_0,65,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000fb1
 
 org/apache/geode/internal/admin/remote/CompactRequest,2
-fromData,6,2a2bb70027b1
-toData,6,2a2bb70028b1
+fromData,6,2a2bb70029b1
+toData,6,2a2bb7002ab1
 
 org/apache/geode/internal/admin/remote/CompactResponse,2
 fromData,14,2a2bb700042a2bb80005b50003b1
@@ -600,7 +600,7 @@ fromData,17,2a2bb7000b2a2bb8000cc00005b50007b1
 toData,14,2a2bb700092ab400072bb8000ab1
 
 org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest,1
-fromData,6,2a2bb7002eb1
+fromData,6,2a2bb7002fb1
 
 org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse,2
 fromData,124,2a2bb700072bb9000801003d2abb0009591cb7000ab50002033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400021904b9000e020057840301a7ffdd2bb9000801003d2abb0009591cb7000ab50003033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400031904b9000e020057840301a7ffddb1
@@ -623,8 +623,8 @@ fromData,17,2a2bb700162a2bb80017c00008b5000ab1
 toData,14,2a2bb700142ab4000a2bb80015b1
 
 org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest,2
-fromData,35,2a2bb700282abb002959b7002ab500022ab400022bb8002b2a2bb9002c0100b50003b1
-toData,24,2a2bb7002d2ab400022bb8002e2b2ab40003b9002f0200b1
+fromData,35,2a2bb700292abb002a59b7002bb500022ab400022bb8002c2a2bb9002d0100b50003b1
+toData,24,2a2bb7002e2ab400022bb8002f2b2ab40003b900300200b1
 
 org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest,2
 fromData,6,2a2bb70009b1
@@ -739,15 +739,15 @@ fromData,6,2a2bb7000ab1
 toData,6,2a2bb70009b1
 
 org/apache/geode/internal/admin/remote/RevokePersistentIDRequest,2
-fromData,25,2a2bb7001c2abb001d59b7001eb500022ab400022bb8001fb1
-toData,14,2a2bb700202ab400022bb80021b1
+fromData,25,2a2bb7001d2abb001e59b7001fb500022ab400022bb80020b1
+toData,14,2a2bb700212ab400022bb80022b1
 
 org/apache/geode/internal/admin/remote/RootRegionRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
 
 org/apache/geode/internal/admin/remote/RootRegionResponse,2
-fromData,34,2a2bb700232a2bb80024c00019c00019b5001a2a2bb80024c00019c00019b5001bb1
+fromData,28,2a2bb700232a2bb80024c00019b5001a2a2bb80024c00019b5001bb1
 toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1
 
 org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
@@ -843,8 +843,8 @@ fromData,1,b1
 toData,1,b1
 
 org/apache/geode/internal/cache/AbstractRegion,2
-toData,6,2a2bb8017bb1
-fromData,8,bb017c59b7017dbf
+fromData,11,bb017459130175b70176bf
+toData,6,2a2bb80173b1
 
 org/apache/geode/internal/cache/AbstractUpdateOperation$AbstractUpdateMessage,2
 fromData,16,2a2bb700182a2bb900190100b5000cb1
@@ -907,8 +907,8 @@ fromData,14,2a2bb700102a2bb80011b50008b1
 toData,14,2a2bb700122ab400082bb80013b1
 
 org/apache/geode/internal/cache/DestroyPartitionedRegionMessage,2
-fromData,76,2a2bb700442a2bb80045b500062a2bb900460100b80047b500082a2bb900480100b5000a2bb9004801003d2a1cbc0ab5000d033e1d1ca200152ab4000d1d2bb9004801004f840301a7ffecb1
-toData,77,2a2bb700492ab400062bb8004a2b2ab40008b4004bb9004c02002b2ab4000ab9004d02002b2ab4000dbeb9004d0200033d1c2ab4000dbea200152b2ab4000d1c2eb9004d0200840201a7ffe8b1
+fromData,76,2a2bb700432a2bb80044b500062a2bb900450100b80046b500082a2bb900470100b5000a2bb9004701003d2a1cbc0ab5000d033e1d1ca200152ab4000d1d2bb9004701004f840301a7ffecb1
+toData,77,2a2bb700482ab400062bb800492b2ab40008b4004ab9004b02002b2ab4000ab9004c02002b2ab4000dbeb9004c0200033d1c2ab4000dbea200152b2ab4000d1c2eb9004c0200840201a7ffe8b1
 
 org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionMessage,2
 fromData,41,2a2bb700582a2bb80059c0005ab500082a2bb8005bb500112a2bb8005cb5001f2a2bb8005db50029b1
@@ -947,8 +947,8 @@ fromData,14,2a2bb700192a2bb8001ab50004b1
 toData,14,2a2bb700172ab400042bb80018b1
 
 org/apache/geode/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
-fromData,291,2bb9009501003d2bb9009501003e2a1cb500962a1c2bb600972a2bb80098b500102a2bb900990100b8009ab500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009bb500882a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001e2ab4001e9900382bb900990100360415049a000b2a03b5001fa7001b150404a0000b2a04b5001fa7000dbb009c59129db7009ebf2a2bb8009fb500201c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a015049900162abb00a159b700a2b5000e2ab4000e2bb800a31c1110007e99001c1c1120007e99000704a700040336052a15052bb800a4b5000a1d1104007e9900082a04b5000fb1
-toData,202,033d033e2a1cb600a53d2a1db600a63e2b1cb900a702002b1db900a702002ab4000d9e000d2b2ab4000db900a802002ab400102bb800a92b2ab40009b400aab900ab02002ab40088c6000b2ab400882bb800ac2ab4001e9900542b2ab4001f99000704a7000403b900ab02002ab4001fb800ad36042ab4001f9a001f2ab40020c10021990015013a052ab40020c00021c000213a06a7000c2ab400203a05013a061504190519062bb800ae2ab4000ec6000b2ab4000e2bb800af2ab4000ac6000b2ab4000a2bb800afb1
+fromData,291,2bb9009601003d2bb9009601003e2a1cb500972a1c2bb600982a2bb80099b500102a2bb9009a0100b8009bb500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009cb500892a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001e2ab4001e9900382bb9009a0100360415049a000b2a03b5001fa7001b150404a0000b2a04b5001fa7000dbb009d59129eb7009fbf2a2bb800a0b500201c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a115049900162abb00a259b700a3b5000e2ab4000e2bb800a41c1110007e99001c1c1120007e99000704a700040336052a15052bb800a5b5000a1d1104007e9900082a04b5000fb1
+toData,202,033d033e2a1cb600a63d2a1db600a73e2b1cb900a802002b1db900a802002ab4000d9e000d2b2ab4000db900a902002ab400102bb800aa2b2ab40009b400abb900ac02002ab40089c6000b2ab400892bb800ad2ab4001e9900542b2ab4001f99000704a7000403b900ac02002ab4001fb800ae36042ab4001f9a001f2ab40020c10021990015013a052ab40020c00021c000213a06a7000c2ab400203a05013a061504190519062bb800af2ab4000ec6000b2ab4000e2bb800b02ab4000ac6000b2ab4000a2bb800b0b1
 
 org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionMessage,2
 fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
@@ -990,11 +990,11 @@ toData,17,2ab400022bb800042ab400032bb80004b1
 
 org/apache/geode/internal/cache/EntryEventImpl,2
 fromData,216,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500082ab4001b2bb80016b600202a2bb80016c00021b500092bb900220100990013b200239a003cbb0024591225b70026bf2bb9002201009900212a2bb80027b500282a2ab40028b500062a2ab40028b80029b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80027b5002a2a2ab4002ab80029b50007a7000b2a2bb80016b500072a2bb8002bb5002c2a2bb8002db5000a2a2bb8002eb50013b1
-toData,279,2ab400182bb801482ab600892bb801482ab4001bb601752bb801482b2ab4001eb40176b9017702002b2ab4000811c03f7eb9017802002ab600492bb801482ab400092bb801482b03b9017902002ab6003f4d2cc100803e1d99000d2cc00080b900a901003e2b1db9017902001d99003b2ab40028c6000e2ab400282bb8017aa7002e2ab40006c6000e2ab400062bb8017aa7001c2cc000803a041904b900b701002bb8017ba700082c2bb801482ab700414d2cc100803e1d99000d2cc00080b900a901003e2b1db9017902001d9900292ab4002ac6000e2ab4002a2bb8017aa7001c2cc000803a041904b900b701002bb8017ba700082c2bb801482ab4002cc0017c2bb8017d2ab600572bb801482ab400132bb8017eb1
+toData,279,2ab400182bb801472ab600892bb801472ab4001bb601742bb801472b2ab4001eb40175b9017602002b2ab4000811c03f7eb9017702002ab600492bb801472ab400092bb801472b03b9017802002ab6003f4d2cc100803e1d99000d2cc00080b900a901003e2b1db9017802001d99003b2ab40028c6000e2ab400282bb80179a7002e2ab40006c6000e2ab400062bb80179a7001c2cc000803a041904b900b701002bb8017aa700082c2bb801472ab700414d2cc100803e1d99000d2cc00080b900a901003e2b1db9017802001d9900292ab4002ac6000e2ab4002a2bb80179a7001c2cc000803a041904b900b701002bb8017aa700082c2bb801472ab4002cc0017b2bb8017c2ab600572bb801472ab400132bb8017db1
 
 org/apache/geode/internal/cache/EntrySnapshot,2
-fromData,50,2a03b500052bb9004101003d1c9900112abb000759b70042b50004a7000e2abb000359b70043b500042ab400042bb60044b1
-toData,22,2b2ab40004c10007b9003f02002ab400042bb60040b1
+fromData,50,2a03b500052bb9004201003d1c9900112abb000759b70043b50004a7000e2abb000359b70044b500042ab400042bb60045b1
+toData,22,2b2ab40004c10007b9004002002ab400042bb60041b1
 
 org/apache/geode/internal/cache/EventID,4
 fromData,53,2a2bb80038b500042bb80038b800394d2a2cb8003ab500092a2cb8003ab5000b2a2bb9003b0100b5000c2a2bb9003c0100b50001b1
@@ -1015,20 +1015,20 @@ fromData,210,bb013159b701324d2c2bb801332a2cb500202ab4000d2bb80134b900300200572ab
 toData,181,2ab40020c001312bb8013d2ab4000d2ab40023b401182bb8013e2ab400052bb8013f2ab400072bb8013f2ab400092bb8013f2ab4000e2ab40023b401182bb8013e2ab400062bb8013f2ab400082bb8013f2ab4000a2bb8013f2ab4000f4d2cb900b901003e1d2bb801402cb900ae0100b900af01003a041904b900b001009900361904b900b10100c000b23a051905b9011b0100c0003c3a061905b900b30100c000843a0719062bb8014119072bb8013da7ffc6b1
 
 org/apache/geode/internal/cache/FilterProfile$OperationMessage,2
-fromData,129,2a2bb700512a2bb900520100b500092a2bb900530100b500402ab800542bb90055010032b500222a2bb900560100b500282a2bb900570100b500492ab40022b8004b99002c2a2bb900530100b500312ab40022b2004da5000d2ab40022b2004ea600202a2bb80058b50032a700152a2bb900570100b500242a2bb80059b50026b1
-toData,133,2a2bb700442b2ab40009b9004502002b2ab40040b9004602002b2ab40022b60023b9004702002b2ab40028b9004802002b2ab40049b9004a03002ab40022b8004b9900312b2ab40032b9004c0100b9004602002ab40022b2004da5000d2ab40022b2004ea600202ab400322bb8004fa700152b2ab40024b9004a03002ab400262bb80050b1
+fromData,129,2a2bb700522a2bb900530100b500092a2bb900540100b500412ab800552bb90056010032b500232a2bb900570100b500292a2bb900580100b5004a2ab40023b8004c99002c2a2bb900540100b500322ab40023b2004ea5000d2ab40023b2004fa600202a2bb80059b50033a700152a2bb900580100b500252a2bb8005ab50027b1
+toData,133,2a2bb700452b2ab40009b9004602002b2ab40041b9004702002b2ab40023b60024b9004802002b2ab40029b9004902002b2ab4004ab9004b03002ab40023b8004c9900312b2ab40033b9004d0100b9004702002ab40023b2004ea5000d2ab40023b2004fa600202ab400332bb80050a700152b2ab40025b9004b03002ab400272bb80051b1
 
 org/apache/geode/internal/cache/FilterRoutingInfo,4
-fromData,86,014db8001e4e2dc600082db6001f4d2bb900200100360403360515051504a200372bb800213a06bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffc8b1
-fromDataPre_GFE_7_1_0_0,95,014db8001e4e2dc600082db6001f4d2bb900200100360403360515051504a20040bb002559b700293a0619062bb80022bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffbfb1
+fromData,88,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a200372bb800213a06bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffc8b1
+fromDataPre_GFE_7_1_0_0,97,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a20040bb002559b700293a0619062bb80022bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffbfb1
 toData,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb600261904b9001c0100c000083a0619062bb80027a7ffc8b1
 toDataPre_GFE_7_1_0_0,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb800271904b9001c0100c000083a0619062bb80027a7ffc8b1
 
 org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4
 fromData,9,2a2bb80014b50015b1
-fromDataPre_GFE_8_0_0_0,50,b800269900162a2bb80027b500282a2bb80014b50015a7001b2a2bb80029b500012a2bb8002ab5000e2a2bb8002ab50012b1
-toData,253,10093e1d2ab4000ec7000707a700112ab4000eb9001601001008680860603e1d2ab40012c7000707a700112ab40012b9001601001008680860603e1d2ab40001c7000703a7000d2ab40001b60017100c68603ebb0018591d01b700194d2ab40001c7000b2c03b6001aa7005d2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701003a041904b9000801009900351904b900090100c0000a3a051905b9000b0100c0001cb6001d2cb8001e1905b9000c0100c0001fb60020852cb8001ea7ffc72ab4000e2ab400212cb800222ab400122ab400212cb800222bc1001899000e2bc000182cb60023a7000f2cb600243a0419042bb80025b1
-toDataPre_GFE_8_0_0_0,211,b800269900afbb0018591103e82bb8002bb700194d2ab40001c7000b2c03b6001aa7005a2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701004e2db9000801009900342db900090100c0000a3a041904b9000b0100c0001cb6001d2cb8001e1904b9000c0100c0001fb60020852cb8001ea7ffc92ab4000e2ab400212cb800222ab400122ab400212cb800222bc1001899000e2bc000182cb60023a7000d2cb600244e2d2bb80025a700232ab400012bb8002c2ab4000e2ab400212bb800222ab400122ab400212bb80022b1
+fromDataPre_GFE_8_0_0_0,50,b800279900162a2bb80028b500292a2bb80014b50015a7001b2a2bb8002ab500012a2bb8002bb5000e2a2bb8002bb50012b1
+toData,255,10093e1d2ab4000ec7000707a700112ab4000eb9001601001008680860603e1d2ab40012c7000707a700112ab40012b9001601001008680860603e1d2ab40001c7000703a7000d2ab40001b60017100c68603ebb0018591d01b700194d2ab40001c7000b2c03b6001aa7005d2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701003a041904b9000801009900351904b900090100c0000a3a051905b9000b0100c0001cb6001d2cb8001e1905b9000c0100c0001fb60020852cb8001ea7ffc72ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000f2cb600253a0419042bb80026b1
+toDataPre_GFE_8_0_0_0,213,b800279900b1bb0018591103e82bb8002cb700194d2ab40001c7000b2c03b6001aa7005a2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701004e2db9000801009900342db900090100c0000a3a041904b9000b0100c0001cb6001d2cb8001e1904b9000c0100c0001fb60020852cb8001ea7ffc92ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000d2cb600254e2d2bb80026a700232ab400012bb8002d2ab4000e2ab400212bb800222ab400122ab400212bb80022b1
 
 org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
 fromData,24,2a2bb7001e2a2bb9001f0100b500052a2bb80020b50006b1
@@ -1178,8 +1178,8 @@ org/apache/geode/internal/cache/QueuedOperation,1
 toData,78,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900312ab400032bb800372ab40002b600169a000d2ab40002b600159900152b2ab40006b9003602002ab400042bb80038b1
 
 org/apache/geode/internal/cache/RegionEventImpl,2
-fromData,48,2a2bb80025b500092a2bb80026b500022a2bb900270100b80028b5000a2a2bb900290100b500032a2bb8002ab5000bb1
-toData,51,2ab400092bb8001e2ab400022bb8001f2b2ab4000ab40020b9002102002b2ab40003b9002202002ab4000bc000232bb80024b1
+fromData,48,2a2bb80023b500092a2bb80024b500022a2bb900250100b80026b5000a2a2bb900270100b500032a2bb80028b5000bb1
+toData,51,2ab400092bb8001c2ab400022bb8001d2b2ab4000ab4001eb9001f02002b2ab40003b9002002002ab4000bc000212bb80022b1
 
 org/apache/geode/internal/cache/ReleaseClearLockMessage,2
 fromData,24,2a2bb700212a2bb80022b500022a2bb900230100b50003b1
@@ -1230,8 +1230,8 @@ fromData,52,2a2bb700242bb9002501003d1c047e99000704a70004033e1c057e99000704a70004
 toData,57,2a2bb70020033d2ab40003c600081c0480913d2ab40003c100219900081c0580913d2b1cb9002202002ab40003c6000b2ab400032bb80023b1
 
 org/apache/geode/internal/cache/RemoteOperationMessage,2
-fromData,43,2a2bb7005a2a2bb9005b0100b5005c2a2ab4005c2bb6005d2a2bb8005eb5000a2a2bb9005f0100b50006b1
-toData,103,2a2bb700602ab600613d2b1cb9006202002ab4000c99000d2b2ab4000cb9006302002ab4006499000d2b2ab40064b9006502002ab60015029f000d2b2ab60015b9006302002ab60016c6000b2ab600162bb800662ab4000a2bb800672b2ab40006b900680200b1
+fromData,43,2a2bb700562a2bb900570100b500582a2ab400582bb600592a2bb8005ab5000a2a2bb9005b0100b50006b1
+toData,103,2a2bb7005c2ab6005d3d2b1cb9005e02002ab4000c99000d2b2ab4000cb9005f02002ab4006099000d2b2ab40060b9006102002ab60015029f000d2b2ab60015b9005f02002ab60016c6000b2ab600162bb800622ab4000a2bb800632b2ab40006b900640200b1
 
 org/apache/geode/internal/cache/RemotePutAllMessage,2
 fromData,223,2a2bb700502a2bb80051c00052b500382a2bb80051b5003a2a2ab4005310087e99000704a7000403b500052ab4005310407e99000e2a2bb80051c00054b5004e2a2ab400531100807e99000704a7000403b500042a2bb8005588b500072a2ab40007bd0056b500062ab400079e00722bb800574dbb005859b700594e03360415042ab40007a200202ab400061504bb0056592b2ab4003815042c2db7005a53840401a7ffdd2bb9005b01003604150499002f2bb8005c3a0503360615062ab40007a2001d2ab4000615063219051506b6005dc0001fb50020840601a7ffe0b1
@@ -1242,8 +1242,8 @@ fromData,17,2a2bb700192a2bb8001ac0001bb50001b1
 toData,14,2a2bb7001c2ab400012bb8001db1
 
 org/apache/geode/internal/cache/RemotePutMessage,2
-fromData,223,2a2bb700732a2bb80074b600752bb9007601003d2a1cb200777e91b500072a2bb80074b500202a2bb900780100b500212a2bb900790100b8007ab500231cb2007b7e99000e2a2bb80074c0007cb500251cb2007d7e99000e2a2bb80074c0003eb5007e2abb007f59b70080b500272ab400272bb800812ab400821120007e99000b2a2bb80074b500112ab4000a99001e2a2bb90079010004a0000704a7000403b500082a2bb80083b700842a2bb80083b700852ab400821104007e9900102a04b5000c2a2bb80083b500861cb200877e99000e2a2bb80074c00088b5002cb1
-toData,252,2a03b5000b2a2bb7008a2ab6008b2bb8008c2ab400073d2ab40025c600091cb2007b803d2ab4007ec600091cb2007d803d2ab4002cc600091cb20087803d2b1cb9008d02002ab6008e2bb8008c2b2ab40021b9008f03002b2ab40023b40090b9008d02002ab40025c6000b2ab400252bb8008c2ab4007ec6000b2ab4007e2bb8008c2ab400272bb800912ab40011c6000b2ab400112bb8008c2ab4000a99002a2b2ab4000899000704a7000403b9008d02002ab40008b800923e1d2ab700932ab600942bb800952ab400072ab400702ab600962bb800952ab4000eb60097c6000e2ab4000eb600972bb800982ab4002cc6000b2ab4002c2bb8008cb1
+fromData,223,2a2bb700722a2bb80073b600742bb9007501003d2a1cb200767e91b500072a2bb80073b500202a2bb900770100b500212a2bb900780100b80079b500231cb2007a7e99000e2a2bb80073c0007bb500251cb2007c7e99000e2a2bb80073c0003eb5007d2abb007e59b7007fb500272ab400272bb800802ab400811120007e99000b2a2bb80073b500112ab4000a99001e2a2bb90078010004a0000704a7000403b500082a2bb80082b700832a2bb80082b700842ab400811104007e9900102a04b5000c2a2bb80082b500851cb200867e99000e2a2bb80073c00087b5002cb1
+toData,252,2a03b5000b2a2bb700892ab6008a2bb8008b2ab400073d2ab40025c600091cb2007a803d2ab4007dc600091cb2007c803d2ab4002cc600091cb20086803d2b1cb9008c02002ab6008d2bb8008b2b2ab40021b9008e03002b2ab40023b4008fb9008c02002ab40025c6000b2ab400252bb8008b2ab4007dc6000b2ab4007d2bb8008b2ab400272bb800902ab40011c6000b2ab400112bb8008b2ab4000a99002a2b2ab4000899000704a7000403b9008c02002ab40008b800913e1d2ab700922ab600932bb800942ab400072ab400702ab600952bb800942ab4000eb60096c6000e2ab4000eb600962bb800972ab4002cc6000b2ab4002c2bb8008bb1
 
 org/apache/geode/internal/cache/RemotePutMessage$PutReplyMessage,2
 fromData,81,2a2bb700252bb9002601001100ff7e913d2a1c047e99000704a7000403b500032a2bb900260100b80027b500022a2bb80028b500061c057e9900181c077e99000704a70004033e2a1d2bb80029b50007b1
@@ -1322,8 +1322,8 @@ fromData,20,2a2bb8000fb500072a2ab40007b80008b50009b1
 toData,9,2ab400072bb80010b1
 
 org/apache/geode/internal/cache/TXCommitMessage,2
-fromData,211,2bb900f501003d2ab700049900122a1cb5009d2ab4009db800f6a700082a02b5009d2a2bb800f7b500152bb900f8010099000b2a2bb800f9b500162bb900f501003e2a2bb800fab5001f2a2bb900fb0100b500202a2bb900fb0100b500212a2bb900f80100b800fcb500022bb900f5010036042abb00d8591504b700dab500172abb00d8591db700dab500ad03360515051504a2002fbb0025592ab700fd3a0619062bb600fea7000c3a072a1907b600bbb12ab400171906b6004857840501a7ffd02a2bb800ffb500032a2bb80100b5001bb1
-toData,292,2b2ab4009db9010102002ab400152bb801022ab40016c6000704a70004033d2b1cb9010302001c99000b2ab400162bb80102033d033e2ab40017c600362ab40017b600d93d03360415042ab40017b600d9a2001f2ab400171504b60104c000253a051d1905b40105603e840401a7ffdb2b1db9010102002ab40009c6002b2ab40009b601062bb801072b2ab40009b60108b9010903002b2ab40009b6010ab901090300a7001f2ab4001f2bb801072b2ab40020b9010903002b2ab40021b9010903002ab40009c600142ab40009b6010bb800fc2bb8010ca7000b2ab400022bb8010c2b1cb9010102001c9e0029033e1d2ab40017b600d9a2001c2ab400171db60104c000253a0419042bb6010d840301a7ffdf2ab400032bb8010e2ab4001b2bb8010fb1
+fromData,211,2bb900ee01003d2ab700049900122a1cb500942ab40094b800efa700082a02b500942a2bb800f0b500152bb900f1010099000b2a2bb800f2b500162bb900ee01003e2a2bb800f3b5001f2a2bb900f40100b500202a2bb900f40100b500212a2bb900f10100b800f5b500022bb900ee010036042abb00d0591504b700d2b500172abb00d0591db700d2b500a403360515051504a2002fbb0025592ab700f63a0619062bb600f7a7000c3a072a1907b600b3b12ab400171906b6004957840501a7ffd02a2bb800f8b500032a2bb800f9b5001bb1
+toData,292,2b2ab40094b900fa02002ab400152bb800fb2ab40016c6000704a70004033d2b1cb900fc02001c99000b2ab400162bb800fb033d033e2ab40017c600362ab40017b600d13d03360415042ab40017b600d1a2001f2ab400171504b600fdc000253a051d1905b400fe603e840401a7ffdb2b1db900fa02002ab40009c6002b2ab40009b600ff2bb801002b2ab40009b60101b9010203002b2ab40009b60103b901020300a7001f2ab4001f2bb801002b2ab40020b9010203002b2ab40021b9010203002ab40009c600142ab40009b60104b800f52bb80105a7000b2ab400022bb801052b1cb900fa02001c9e0029033e1d2ab40017b600d1a2001c2ab400171db600fdc000253a0419042bb60106840301a7ffdf2ab400032bb801072ab4001b2bb80108b1
 
 org/apache/geode/internal/cache/TXCommitMessage$CommitProcessForLockIdMessage,2
 fromData,26,2a2bb80010b500022ab40002c6000704a70004031203b80004b1
@@ -1343,7 +1343,7 @@ toData,16,2a2bb700062b2ab40002b900070200b1
 
 org/apache/geode/internal/cache/TXCommitMessage$RegionCommit,2
 fromData,181,2a2bb80059b5000b2a2bb80059b500202bb9005a01003d1c9e009c2abb0054591cb70055b500522abb0054591cb70055b500562bb9005b01003e2a2bb8005cc0005db5005e03360415041ca20069bb005f592ab700603a0519052b1d2ab40002b60061b9006201009a000704a7000403b600631905b80032c600162ab4005ec6000f1905b800322ab4005eb600642ab400021905b600652ab400521905b4002cb60057572ab400561905b6005757840401a7ff97b1
-toData,77,2ab40005c600152ab40005b600832ab400052bb60084a700362ab4000404a400292bb800854dbb0086591104002cb700874e2a2db700882a2db500052ab400052bb60084a700082a2bb70088b1
+toData,77,2ab40005c600152ab40005b600842ab400052bb60085a700362ab4000404a400292bb800864dbb0087591104002cb700884e2a2db700892a2db500052ab400052bb60085a700082a2bb70089b1
 
 org/apache/geode/internal/cache/TXCommitMessage$RegionCommit$FarSideEntryOp,2
 fromData,168,2a2bb80006b500072a2bb900080100b80009b5000a1c9900102a2bb9000b0100b5000ca7000d2a2bb900080100b5000c2a2bb80006b5000d2a2bb80006c0000eb500032a2bb80006c0000fb500021d99000d2a2bb900100100b500012a2bb9000b0100b500112ab4000ab600129a003a2a2bb900130100b500142ab4000ab600159a00262bb9001301003604150499000e2a2bb80006b50016a7000e2a2bb80017b80018b50016b1
@@ -1366,8 +1366,8 @@ fromData,37,2a2bb7004f2a2bb900500100b500052a2bb900500100b500032a2bb80051c00052b5
 toData,34,2a2bb7004c2b2ab40005b9004d02002b2ab40003b9004d02002ab400022bb8004eb1
 
 org/apache/geode/internal/cache/TXRegionLockRequestImpl,2
-fromData,62,2a2bb8000cb500032a03b7000d4d2bb8000e3e2cc600161d9e00122a2c2ab40003b6000fc00010b500022a2a1d2bb70011b50004a700094e2a01b50004b1
-toData,17,2ab6001d2bb8001e2ab400042bb8001fb1
+fromData,64,2a2bb8000cb500032a03b7000d4d2bb8000e3e2cc600181d9e00142a2c2ab40003b9000f0200c00010b500022a2a1d2bb70011b50004a700094e2a01b50004b1
+toData,17,2ab6001e2bb8001f2ab400042bb80020b1
 
 org/apache/geode/internal/cache/TXRemoteCommitMessage$TXRemoteCommitReplyMessage,2
 fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
@@ -1744,8 +1744,8 @@ fromData,48,2a2bb700252a2bb900260100b500032a2bb900270100b80028b500022a2bb80029b5
 toData,54,2a2bb7002b2b2ab40003b9002c02002b2ab40002b4002db9002e02002ab6002f4d2b2ab6002f2ab40030b800312ab400072bb80032b1
 
 org/apache/geode/internal/cache/partitioned/QueryMessage,2
-fromData,63,2a2bb7007c2a2bb8007db5000a2a2bb8007eb5000b2a2bb8007fb5000c2a2bb80080b60081b5000e2a2bb80080b60081b5007a2a2bb80080b60081b50011b1
-toData,63,2a2bb700822ab4000a2bb800832ab4000bc000022bb800842ab4000c2bb800852ab4000eb800862bb8008704b800862bb800872ab40011b800862bb80087b1
+fromData,63,2a2bb700752a2bb80076b500092a2bb80077b5000a2a2bb80078b5000b2a2bb80079b6007ab5000d2a2bb80079b6007ab500732a2bb80079b6007ab50010b1
+toData,63,2a2bb7007b2ab400092bb8007c2ab4000ac000022bb8007d2ab4000b2bb8007e2ab4000db8007f2bb8008004b8007f2bb800802ab40010b8007f2bb80080b1
 
 org/apache/geode/internal/cache/partitioned/RegionAdvisor$BucketProfileAndId,2
 fromData,61,2a2bb900070100b500032a2bb900080100b500022ab400029900112abb000659b70009b50005a7000e2abb000459b7000ab500052ab400052bb8000bb1
@@ -1951,7 +1951,7 @@ toData,40,2ab400023d2a59b400022ab4000460b500022ab400032b1c2ab400042ab400052ab400
 toDataPre_GFE_8_0_0_0,20,2ab400029a000a2ab40003b8000c2a2bb6000db1
 
 org/apache/geode/internal/cache/tx/DistTxEntryEvent,2
-fromData,116,2a2bb80018c00019b500042bb8001a4db8001b4e2a2d2cb6001cc0001db500062a2bb9001e0100b8001fb500082bb800183a042bb800203a052abb002159190401011905b70022b5000c2a2bb80018b600232bb80024b6002536061506047e9900082a2bb700261506057e9900082a2bb70027b1
+fromData,118,2a2bb80018c00019b500042bb8001a4db8001b4e2a2d2cb9001c0200c0001db500062a2bb9001e0100b8001fb500082bb800183a042bb800203a052abb002159190401011905b70022b5000c2a2bb80018b600232bb80024b6002536061506047e9900082a2bb700261506057e9900082a2bb70027b1
 toData,121,2ab400042bb800052ab40006b600072bb800052b2ab40008b40009b9000a02002ab6000b2bb800052ab4000cb6000db8000e2bb8000f2ab600102bb80005033d2ab40011c600081c0480913d2ab40013c600081c0580913d1cb800142bb800152ab40011c600082a2bb700162ab40013c600082a2bb70017b1
 
 org/apache/geode/internal/cache/versions/RVVException,2

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
index 07e3171..f680b63 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
@@ -215,7 +215,8 @@ public abstract class CqQueryImpl implements InternalCqQuery {
     }
 
     // Set Query ExecutionContext, that will be used in later execution.
-    this.setQueryExecutionContext(new QueryExecutionContext(null, this.cqService.getCache()));
+    this.setQueryExecutionContext(
+        new QueryExecutionContext(null, (InternalCache) this.cqService.getCache()));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
index c484105..2f13fac 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
@@ -44,7 +44,7 @@ import org.apache.geode.cache.query.internal.CompiledSelect;
 import org.apache.geode.cache.query.internal.CqStateImpl;
 import org.apache.geode.cache.query.internal.DefaultQuery;
 import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.Token;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
@@ -216,7 +216,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
       }
     }
 
-    // this.cqService.addToCqEventKeysMap(this);
     this.updateCqCreateStats();
 
     // Initialize the state of CQ.
@@ -283,7 +282,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
    * @return String modified query.
    */
   private Query constructServerSideQuery() throws QueryException {
-    GemFireCacheImpl cache = (GemFireCacheImpl) cqService.getCache();
+    InternalCache cache = cqService.getInternalCache();
     DefaultQuery locQuery = (DefaultQuery) cache.getLocalQueryService().newQuery(this.queryString);
     CompiledSelect select = locQuery.getSimpleSelect();
     CompiledIteratorDef from = (CompiledIteratorDef) select.getIterators().get(0);
@@ -371,8 +370,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
     if (!CqServiceProvider.MAINTAIN_KEYS) {
       return;
     }
-    // this.logger.fine("Marking key in Results Cache For CQ :" +
-    // this.cqName + " key :" + key);
 
     if (this.cqResultKeys != null) {
       synchronized (this.cqResultKeys) {

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
index 8bdef9b..9eada5b 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
@@ -14,32 +14,39 @@
  */
 package org.apache.geode.cache.lucene.internal;
 
-import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.lucene.LuceneServiceProvider;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Collection;
 
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.lucene.LuceneServiceProvider;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.logging.LogService;
+
 public class DestroyLuceneIndexMessage extends PooledDistributionMessage
     implements MessageWithReply {
 
+  private static final Logger logger = LogService.getLogger();
+
   private int processorId;
 
   private String regionPath;
 
   private String indexName;
 
-  private static final Logger logger = LogService.getLogger();
-
   /* For serialization */
-  public DestroyLuceneIndexMessage() {}
+  public DestroyLuceneIndexMessage() {
+    // nothing
+  }
 
   protected DestroyLuceneIndexMessage(Collection recipients, int processorId, String regionPath,
       String indexName) {
@@ -59,7 +66,7 @@ public class DestroyLuceneIndexMessage extends PooledDistributionMessage
             + "; indexName=" + this.indexName);
       }
       try {
-        Cache cache = GemFireCacheImpl.getInstance();
+        InternalCache cache = GemFireCacheImpl.getInstance();
         LuceneServiceImpl impl = (LuceneServiceImpl) LuceneServiceProvider.get(cache);
         impl.destroyIndex(this.indexName, this.regionPath, false);
         if (logger.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 3756b81..5ae62b9 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -15,7 +15,6 @@
 package org.apache.geode.cache.lucene.internal.cli;
 
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.execute.Execution;
 import org.apache.geode.cache.execute.Function;
@@ -27,6 +26,7 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneDestroyIndexFu
 import org.apache.geode.cache.lucene.internal.cli.functions.LuceneListIndexFunction;
 import org.apache.geode.cache.lucene.internal.cli.functions.LuceneSearchIndexFunction;
 import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.execute.AbstractExecution;
 import org.apache.geode.internal.lang.StringUtils;
 import org.apache.geode.internal.security.IntegratedSecurityService;
@@ -61,8 +61,7 @@ import java.util.stream.Collectors;
 /**
  * The LuceneIndexCommands class encapsulates all Geode shell (Gfsh) commands related to Lucene
  * indexes defined in Geode.
- * </p>
- * 
+ *
  * @see AbstractCommandsSupport
  * @see LuceneIndexDetails
  * @see LuceneListIndexFunction
@@ -187,7 +186,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
 
     this.securityService.authorizeRegionManage(regionPath);
     try {
-      final Cache cache = getCache();
+      final InternalCache cache = getCache();
       LuceneIndexInfo indexInfo = new LuceneIndexInfo(indexName, regionPath, fields, analyzers);
       final ResultCollector<?, ?> rc =
           this.executeFunctionOnAllMembers(createIndexFunction, indexInfo);
@@ -383,7 +382,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
     // region members. Then send the function to the remaining members to handle the case where
     // the index has been created, but not the region
     XmlEntity xmlEntity = null;
-    Cache cache = getCache();
+    InternalCache cache = getCache();
     Set<DistributedMember> regionMembers = getRegionMembers(cache, regionPath);
     Set<DistributedMember> normalMembers = getNormalMembers(cache);
     LuceneDestroyIndexInfo indexInfo = new LuceneDestroyIndexInfo(indexName, regionPath);
@@ -422,11 +421,11 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
     return xmlEntity;
   }
 
-  protected Set<DistributedMember> getRegionMembers(Cache cache, String regionPath) {
+  protected Set<DistributedMember> getRegionMembers(InternalCache cache, String regionPath) {
     return CliUtil.getMembersForeRegionViaFunction(cache, regionPath, true);
   }
 
-  protected Set<DistributedMember> getNormalMembers(Cache cache) {
+  protected Set<DistributedMember> getNormalMembers(InternalCache cache) {
     return CliUtil.getAllNormalMembers(cache);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index e4b4b4f..d4dca4a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -16,7 +16,10 @@ package org.apache.geode.cache.lucene.internal.cli;
 
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.eq;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,7 +32,6 @@ import java.util.Set;
 
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -39,7 +41,6 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 
-import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.execute.Execution;
 import org.apache.geode.cache.execute.ResultCollector;
 import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
@@ -48,10 +49,12 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneDescribeIndexF
 import org.apache.geode.cache.lucene.internal.cli.functions.LuceneDestroyIndexFunction;
 import org.apache.geode.cache.lucene.internal.cli.functions.LuceneListIndexFunction;
 import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.execute.AbstractExecution;
 import org.apache.geode.internal.util.CollectionUtils;
 import org.apache.geode.management.cli.Result.Status;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.result.CommandResult;
 import org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.cli.result.TabularResultData;
@@ -61,11 +64,10 @@ import org.apache.geode.test.junit.categories.UnitTest;
 /**
  * The LuceneIndexCommandsJUnitTest class is a test suite of test cases testing the contract and
  * functionality of the LuceneIndexCommands class.
- * </p>
- * 
+ *
  * @see LuceneIndexCommands
  * @see LuceneIndexDetails
- * @see org.apache.geode.cache.lucene.internal.cli.functions.LuceneListIndexFunction
+ * @see LuceneListIndexFunction
  * @see org.jmock.Expectations
  * @see org.jmock.Mockery
  * @see org.jmock.lib.legacy.ClassImposteriser
@@ -79,8 +81,7 @@ public class LuceneIndexCommandsJUnitTest {
 
   @Test
   public void testListIndexWithoutStats() {
-
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final String serverName = "mockServer";
     final AbstractExecution mockFunctionExecutor =
         mock(AbstractExecution.class, "Function Executor");
@@ -102,7 +103,6 @@ public class LuceneIndexCommandsJUnitTest {
 
     results.add(CollectionUtils.asSet(indexDetails2, indexDetails1, indexDetails3));
 
-
     when(mockFunctionExecutor.execute(isA(LuceneListIndexFunction.class)))
         .thenReturn(mockResultCollector);
     when(mockResultCollector.getResult()).thenReturn(results);
@@ -128,8 +128,7 @@ public class LuceneIndexCommandsJUnitTest {
 
   @Test
   public void testListIndexWithStats() {
-
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final String serverName = "mockServer";
     final AbstractExecution mockFunctionExecutor =
         mock(AbstractExecution.class, "Function Executor");
@@ -180,7 +179,7 @@ public class LuceneIndexCommandsJUnitTest {
 
   @Test
   public void testCreateIndex() throws Exception {
-    final Cache mockCache = mock(Cache.class);
+    final InternalCache mockCache = mock(InternalCache.class);
     final ResultCollector mockResultCollector = mock(ResultCollector.class);
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
 
@@ -206,13 +205,11 @@ public class LuceneIndexCommandsJUnitTest {
     assertEquals(Arrays.asList("member1", "member2", "member3"), data.retrieveAllValues("Member"));
     assertEquals(Arrays.asList("Successfully created lucene index", "Failed: Index creation failed",
         "Successfully created lucene index"), data.retrieveAllValues("Status"));
-
   }
 
   @Test
   public void testDescribeIndex() throws Exception {
-
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final String serverName = "mockServer";
     final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -249,8 +246,7 @@ public class LuceneIndexCommandsJUnitTest {
 
   @Test
   public void testSearchIndex() throws Exception {
-
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
 
@@ -275,7 +271,7 @@ public class LuceneIndexCommandsJUnitTest {
 
   @Test
   public void testSearchIndexWithPaging() throws Exception {
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final Gfsh mockGfsh = mock(Gfsh.class);
     final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -339,13 +335,11 @@ public class LuceneIndexCommandsJUnitTest {
 
     assertEquals(expectedPage1, actualPageResults.get(18));
     assertEquals("\t\tPage 1 of 4", actualPageResults.get(19));
-
   }
 
   @Test
   public void testSearchIndexWithKeysOnly() throws Exception {
-
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
 
@@ -368,8 +362,7 @@ public class LuceneIndexCommandsJUnitTest {
 
   @Test
   public void testSearchIndexWhenSearchResultsHaveSameScore() throws Exception {
-
-    final Cache mockCache = mock(Cache.class, "Cache");
+    final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
     final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
 
@@ -546,7 +539,7 @@ public class LuceneIndexCommandsJUnitTest {
   }
 
   private LuceneIndexCommands createTestLuceneIndexCommandsForDestroyIndex() {
-    final Cache mockCache = mock(Cache.class);
+    final InternalCache mockCache = mock(InternalCache.class);
     final ResultCollector mockResultCollector = mock(ResultCollector.class);
     final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
 
@@ -584,22 +577,21 @@ public class LuceneIndexCommandsJUnitTest {
       data.accumulate("score", expectedResults[i].getScore());
     }
     CommandResult commandResult = (CommandResult) ResultBuilder.buildResult(data);
-    StringBuffer buffer = new StringBuffer();
-    while (commandResult.hasNextLine())
+    StringBuilder buffer = new StringBuilder();
+    while (commandResult.hasNextLine()) {
       buffer.append(commandResult.nextLine());
+    }
     return buffer.toString();
   }
 
   private List<Set<LuceneSearchResults>> getSearchResults(LuceneSearchResults... results) {
     final List<Set<LuceneSearchResults>> queryResultsList = new ArrayList<>();
     HashSet<LuceneSearchResults> queryResults = new HashSet<>();
-    for (LuceneSearchResults result : results)
-      queryResults.add(result);
+    Collections.addAll(queryResults, results);
     queryResultsList.add(queryResults);
     return queryResultsList;
   }
 
-
   private LuceneIndexStats getMockIndexStats(int queries, int commits, int updates, int docs) {
     LuceneIndexStats mockIndexStats = mock(LuceneIndexStats.class);
     when(mockIndexStats.getQueryExecutions()).thenReturn(queries);
@@ -609,7 +601,7 @@ public class LuceneIndexCommandsJUnitTest {
     return mockIndexStats;
   }
 
-  private LuceneIndexCommands createIndexCommands(final Cache cache,
+  private LuceneIndexCommands createIndexCommands(final InternalCache cache,
       final Execution functionExecutor) {
     return new LuceneTestIndexCommands(cache, functionExecutor);
   }
@@ -635,22 +627,22 @@ public class LuceneIndexCommandsJUnitTest {
 
   private static class LuceneTestIndexCommands extends LuceneIndexCommands {
 
-    private final Cache cache;
+    private final InternalCache cache;
     private final Execution functionExecutor;
 
-    protected LuceneTestIndexCommands(final Cache cache, final Execution functionExecutor) {
-      assert cache != null : "The Cache cannot be null!";
+    protected LuceneTestIndexCommands(final InternalCache cache, final Execution functionExecutor) {
+      assert cache != null : "The InternalCache cannot be null!";
       this.cache = cache;
       this.functionExecutor = functionExecutor;
     }
 
     @Override
-    protected Cache getCache() {
+    protected InternalCache getCache() {
       return this.cache;
     }
 
     @Override
-    protected Set<DistributedMember> getMembers(final Cache cache) {
+    protected Set<DistributedMember> getMembers(final InternalCache cache) {
       assertSame(getCache(), cache);
       return Collections.emptySet();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
index ab8b5b0..0f1a995 100644
--- a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
+++ b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
@@ -443,6 +443,7 @@ public class AutoBalancer implements Declarable {
     }
 
     InternalCache getCache() {
+      // TODO: delete this double-checking
       if (cache == null) {
         synchronized (this) {
           if (cache == null) {
@@ -461,6 +462,7 @@ public class AutoBalancer implements Declarable {
 
     @Override
     public boolean acquireAutoBalanceLock() {
+      // TODO: delete this double-checking
       if (!isLockAcquired.get()) {
         synchronized (isLockAcquired) {
           if (!isLockAcquired.get()) {
@@ -501,7 +503,7 @@ public class AutoBalancer implements Declarable {
     }
   }
 
-  private class SystemClockTimeProvider implements TimeProvider {
+  private static class SystemClockTimeProvider implements TimeProvider {
     @Override
     public long currentTimeMillis() {
       return System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
index eb46258..a5c09d3 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
@@ -18,19 +18,18 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.wan.GatewayReceiver;
 import org.apache.geode.cache.wan.GatewayReceiverFactory;
 import org.apache.geode.cache.wan.GatewayTransportFilter;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ResourceEvent;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.xmlcache.CacheCreation;
 import org.apache.geode.internal.cache.xmlcache.GatewayReceiverCreation;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
- * 
  * @since GemFire 7.0
  */
 public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
@@ -51,13 +50,13 @@ public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
 
   private List<GatewayTransportFilter> filters = new ArrayList<GatewayTransportFilter>();
 
-  private Cache cache;
+  private InternalCache cache;
 
   public GatewayReceiverFactoryImpl() {
-
+    // nothing
   }
 
-  public GatewayReceiverFactoryImpl(Cache cache) {
+  public GatewayReceiverFactoryImpl(InternalCache cache) {
     this.cache = cache;
   }
 
@@ -116,7 +115,7 @@ public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
       recv = new GatewayReceiverImpl(this.cache, this.startPort, this.endPort, this.timeBetPings,
           this.socketBuffSize, this.bindAdd, this.filters, this.hostnameForSenders,
           this.manualStart);
-      ((GemFireCacheImpl) cache).addGatewayReceiver(recv);
+      this.cache.addGatewayReceiver(recv);
       InternalDistributedSystem system =
           (InternalDistributedSystem) this.cache.getDistributedSystem();
       system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_CREATE, recv);
@@ -134,7 +133,7 @@ public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
       recv = new GatewayReceiverCreation(this.cache, this.startPort, this.endPort,
           this.timeBetPings, this.socketBuffSize, this.bindAdd, this.filters,
           this.hostnameForSenders, this.manualStart);
-      ((CacheCreation) cache).addGatewayReceiver(recv);
+      this.cache.addGatewayReceiver(recv);
     }
     return recv;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
index d953d7f..5e26a46 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
@@ -23,16 +23,15 @@ import java.util.List;
 
 import org.apache.logging.log4j.Logger;
 
-import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.wan.GatewayReceiver;
 import org.apache.geode.cache.wan.GatewayTransportFilter;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ResourceEvent;
 import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.net.SocketCreator;
 import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -65,12 +64,12 @@ public class GatewayReceiverImpl implements GatewayReceiver {
 
   private CacheServer receiver;
 
-  private final GemFireCacheImpl cache;
+  private final InternalCache cache;
 
-  public GatewayReceiverImpl(Cache cache, int startPort, int endPort, int timeBetPings,
+  public GatewayReceiverImpl(InternalCache cache, int startPort, int endPort, int timeBetPings,
       int buffSize, String bindAdd, List<GatewayTransportFilter> filters, String hostnameForSenders,
       boolean manualStart) {
-    this.cache = (GemFireCacheImpl) cache;
+    this.cache = cache;
 
     /*
      * If user has set hostNameForSenders then it should take precedence over bindAddress. If user
@@ -151,17 +150,17 @@ public class GatewayReceiverImpl implements GatewayReceiver {
       receiver.setMaximumTimeBetweenPings(timeBetPings);
       receiver.setHostnameForClients(host);
       receiver.setBindAddress(bindAdd);
-      receiver.setGroups(new String[] {GatewayReceiverImpl.RECEIVER_GROUP});
+      receiver.setGroups(new String[] {GatewayReceiver.RECEIVER_GROUP});
       ((CacheServerImpl) receiver).setGatewayTransportFilter(this.filters);
       try {
-        ((CacheServerImpl) receiver).start();
+        receiver.start();
         started = true;
       } catch (BindException be) {
         if (be.getCause() != null
             && be.getCause().getMessage().contains("assign requested address")) {
           throw new GatewayReceiverException(
               LocalizedStrings.SocketCreator_FAILED_TO_CREATE_SERVER_SOCKET_ON_0_1
-                  .toLocalizedString(new Object[] {bindAdd, Integer.valueOf(this.port)}));
+                  .toLocalizedString(new Object[] {bindAdd, this.port}));
         }
         // ignore as this port might have been used by other threads.
         logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use,
@@ -208,11 +207,6 @@ public class GatewayReceiverImpl implements GatewayReceiver {
           LocalizedStrings.GatewayReceiver_IS_NOT_RUNNING.toLocalizedString());
     }
     receiver.stop();
-
-    // InternalDistributedSystem system = ((GemFireCacheImpl) this.cache)
-    // .getDistributedSystem();
-    // system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_STOP, this);
-
   }
 
   public String getHost() {
@@ -237,7 +231,7 @@ public class GatewayReceiverImpl implements GatewayReceiver {
         .append("; maximumTimeBetweenPings=").append(getMaximumTimeBetweenPings())
         .append("; socketBufferSize=").append(getSocketBufferSize()).append("; isManualStart=")
         .append(isManualStart()).append("; group=")
-        .append(Arrays.toString(new String[] {GatewayReceiverImpl.RECEIVER_GROUP})).append("]")
+        .append(Arrays.toString(new String[] {GatewayReceiver.RECEIVER_GROUP})).append("]")
         .toString();
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 8da5613..3eec101 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -14,38 +14,35 @@
  */
 package org.apache.geode.internal.cache.wan;
 
-
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.geode.GemFireIOException;
-import org.apache.geode.internal.cache.tier.sockets.MessageTooLargeException;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.CancelException;
-import org.apache.geode.cache.Cache;
+import org.apache.geode.GemFireIOException;
 import org.apache.geode.cache.RegionDestroyedException;
 import org.apache.geode.cache.client.ServerConnectivityException;
 import org.apache.geode.cache.client.ServerOperationException;
 import org.apache.geode.cache.client.internal.Connection;
+import org.apache.geode.cache.client.internal.SenderProxy;
 import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedException;
 import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.UpdateAttributesProcessor;
+import org.apache.geode.internal.cache.tier.sockets.MessageTooLargeException;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.pdx.PdxRegistryMismatchException;
 import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.cache.client.internal.SenderProxy;
 
 /**
  * @since GemFire 7.0
- *
  */
 public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDispatcher {
 
@@ -326,7 +323,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
 
     // Here we might wait on a connection to another server if I was secondary
     // so don't start waiting until I am primary
-    Cache cache = this.sender.getCache();
+    InternalCache cache = this.sender.getCache();
     if (cache != null && !cache.isClosed()) {
       if (this.sender.isPrimary() && (this.connection != null)) {
         if (this.ackReaderThread == null || !this.ackReaderThread.isRunning()) {
@@ -551,7 +548,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
      */
     private volatile boolean shutdown = false;
 
-    private final GemFireCacheImpl cache;
+    private final InternalCache cache;
 
     private volatile boolean ackReaderThreadRunning = false;
 
@@ -562,7 +559,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
     public AckReaderThread(GatewaySender sender, String name) {
       super("AckReaderThread for : " + name);
       this.setDaemon(true);
-      this.cache = (GemFireCacheImpl) ((AbstractGatewaySender) sender).getCache();
+      this.cache = ((AbstractGatewaySender) sender).getCache();
     }
 
     public void waitForRunningAckReaderThreadRunningState() {
@@ -671,13 +668,8 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
         }
         ackReaderThreadRunning = false;
       }
-
     }
 
-    /**
-     * @param exception
-     * 
-     */
     protected void logBatchExceptions(BatchException70 exception) {
       try {
         for (BatchException70 be : exception.getExceptions()) {
@@ -785,7 +777,6 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
       } catch (ConnectionDestroyedException e) {
         logger.info("AckReader shutting down and connection already destroyed");
       }
-
     }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
index 2c7925b..467c622 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -221,11 +221,6 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
     }
 
     if (this.attrs.isParallel()) {
-      // if(this.attrs.getDispatcherThreads() != 1){
-      // throw new GatewaySenderException(
-      // LocalizedStrings.GatewaySenderImpl_PARALLEL_GATEWAY_SENDER_0_CANNOT_BE_CREATED_WITH_DISPATCHER_THREADS_OTHER_THAN_1
-      // .toLocalizedString(id));
-      // }
       if ((this.attrs.getOrderPolicy() != null)
           && this.attrs.getOrderPolicy().equals(OrderPolicy.THREAD)) {
         throw new GatewaySenderException(
@@ -234,14 +229,14 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
       }
       if (this.cache instanceof GemFireCacheImpl) {
         sender = new ParallelGatewaySenderImpl(this.cache, this.attrs);
-        ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
 
         if (!this.attrs.isManualStart()) {
           sender.start();
         }
       } else if (this.cache instanceof CacheCreation) {
         sender = new ParallelGatewaySenderCreation(this.cache, this.attrs);
-        ((CacheCreation) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
       }
     } else {
       if (this.attrs.getAsyncEventListeners().size() > 0) {
@@ -254,14 +249,14 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
       }
       if (this.cache instanceof GemFireCacheImpl) {
         sender = new SerialGatewaySenderImpl(this.cache, this.attrs);
-        ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
 
         if (!this.attrs.isManualStart()) {
           sender.start();
         }
       } else if (this.cache instanceof CacheCreation) {
         sender = new SerialGatewaySenderCreation(this.cache, this.attrs);
-        ((CacheCreation) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
       }
     }
     return sender;
@@ -287,13 +282,13 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
 
       if (this.cache instanceof GemFireCacheImpl) {
         sender = new ParallelGatewaySenderImpl(this.cache, this.attrs);
-        ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
         if (!this.attrs.isManualStart()) {
           sender.start();
         }
       } else if (this.cache instanceof CacheCreation) {
         sender = new ParallelGatewaySenderCreation(this.cache, this.attrs);
-        ((CacheCreation) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
       }
     } else {
       if (this.attrs.getOrderPolicy() == null && this.attrs.getDispatcherThreads() > 1) {
@@ -301,13 +296,13 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
       }
       if (this.cache instanceof GemFireCacheImpl) {
         sender = new SerialGatewaySenderImpl(this.cache, this.attrs);
-        ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
         if (!this.attrs.isManualStart()) {
           sender.start();
         }
       } else if (this.cache instanceof CacheCreation) {
         sender = new SerialGatewaySenderCreation(this.cache, this.attrs);
-        ((CacheCreation) this.cache).addGatewaySender(sender);
+        this.cache.addGatewaySender(sender);
       }
     }
     return sender;

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index c2d4673..daeeb6f 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -18,6 +18,7 @@ import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.cache.EntryOperation;
 import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+import org.apache.geode.cache.wan.GatewayEventFilter;
 import org.apache.geode.cache.wan.GatewayTransportFilter;
 import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -25,7 +26,6 @@ import org.apache.geode.distributed.internal.ResourceEvent;
 import org.apache.geode.internal.cache.DistributedRegion;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.cache.UpdateAttributesProcessor;
@@ -79,7 +79,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
 
       // Only notify the type registry if this is a WAN gateway queue
       if (!isAsyncEventQueue()) {
-        ((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
+        getCache().getPdxRegistry().gatewaySenderStarted(this);
       }
       new UpdateAttributesProcessor(this).distribute(false);
 
@@ -135,11 +135,11 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append("ParallelGatewaySender{");
-    sb.append("id=" + getId());
-    sb.append(",remoteDsId=" + getRemoteDSId());
-    sb.append(",isRunning =" + isRunning());
+    sb.append("id=").append(getId());
+    sb.append(",remoteDsId=").append(getRemoteDSId());
+    sb.append(",isRunning =").append(isRunning());
     sb.append("}");
     return sb.toString();
   }
@@ -158,7 +158,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
     pf.manualStart = isManualStart();
     pf.dispatcherThreads = getDispatcherThreads();
     pf.orderPolicy = getOrderPolicy();
-    for (org.apache.geode.cache.wan.GatewayEventFilter filter : getGatewayEventFilters()) {
+    for (GatewayEventFilter filter : getGatewayEventFilters()) {
       pf.eventFiltersClassNames.add(filter.getClass().getName());
     }
     for (GatewayTransportFilter filter : getGatewayTransportFilters()) {

http://git-wip-us.apache.org/repos/asf/geode/blob/654d65b5/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index b300460..fe83d60 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ResourceEvent;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.RegionQueue;
 import org.apache.geode.internal.cache.UpdateAttributesProcessor;
@@ -93,7 +92,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
 
       // Only notify the type registry if this is a WAN gateway queue
       if (!isAsyncEventQueue()) {
-        ((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
+        getCache().getPdxRegistry().gatewaySenderStarted(this);
       }
       new UpdateAttributesProcessor(this).distribute(false);
 
@@ -178,12 +177,12 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append("SerialGatewaySender{");
-    sb.append("id=" + getId());
-    sb.append(",remoteDsId=" + getRemoteDSId());
-    sb.append(",isRunning =" + isRunning());
-    sb.append(",isPrimary =" + isPrimary());
+    sb.append("id=").append(getId());
+    sb.append(",remoteDsId=").append(getRemoteDSId());
+    sb.append(",isRunning =").append(isRunning());
+    sb.append(",isPrimary =").append(isPrimary());
     sb.append("}");
     return sb.toString();
   }


Mime
View raw message