http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
index dab476a..1b327cb 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java
@@ -65,7 +65,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if <code>aListener</code> is null
    * @see AttributesFactory#addCacheListener
    */
-  public ClientRegionFactory<K, V> addCacheListener(CacheListener<K, V> 
aListener);
+  ClientRegionFactory<K, V> addCacheListener(CacheListener<K, V> aListener);
 
   /**
    * Removes all cache listeners and then adds each listener in the specified 
array. for the next
@@ -76,7 +76,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if the <code>newListeners</code> array 
has a null element
    * @see AttributesFactory#initCacheListeners
    */
-  public ClientRegionFactory<K, V> initCacheListeners(CacheListener<K, V>[] 
newListeners);
+  ClientRegionFactory<K, V> initCacheListeners(CacheListener<K, V>[] 
newListeners);
 
   /**
    * Sets the eviction attributes that controls growth of the Region to be 
created.
@@ -84,7 +84,7 @@ public interface ClientRegionFactory<K, V> {
    * @param evictionAttributes for the Region to create
    * @return a reference to this ClientRegionFactory object
    */
-  public ClientRegionFactory<K, V> setEvictionAttributes(EvictionAttributes 
evictionAttributes);
+  ClientRegionFactory<K, V> setEvictionAttributes(EvictionAttributes 
evictionAttributes);
 
   /**
    * Sets the idleTimeout expiration attributes for region entries for the next
@@ -95,7 +95,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if idleTimeout is null
    * @see AttributesFactory#setEntryIdleTimeout
    */
-  public ClientRegionFactory<K, V> setEntryIdleTimeout(ExpirationAttributes 
idleTimeout);
+  ClientRegionFactory<K, V> setEntryIdleTimeout(ExpirationAttributes 
idleTimeout);
 
   /**
    * Sets the custom idleTimeout for the next <code>RegionAttributes</code> 
created.
@@ -104,7 +104,7 @@ public interface ClientRegionFactory<K, V> {
    * @return the receiver
    * @see AttributesFactory#setCustomEntryIdleTimeout(CustomExpiry)
    */
-  public ClientRegionFactory<K, V> setCustomEntryIdleTimeout(CustomExpiry<K, 
V> custom);
+  ClientRegionFactory<K, V> setCustomEntryIdleTimeout(CustomExpiry<K, V> 
custom);
 
   /**
    * Sets the timeToLive expiration attributes for region entries for the next
@@ -115,7 +115,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if timeToLive is null
    * @see AttributesFactory#setEntryTimeToLive
    */
-  public ClientRegionFactory<K, V> setEntryTimeToLive(ExpirationAttributes 
timeToLive);
+  ClientRegionFactory<K, V> setEntryTimeToLive(ExpirationAttributes 
timeToLive);
 
   /**
    * Sets the custom timeToLive expiration method for the next 
<code>RegionAttributes</code>
@@ -125,7 +125,7 @@ public interface ClientRegionFactory<K, V> {
    * @return the receiver
    * @see AttributesFactory#setCustomEntryTimeToLive(CustomExpiry)
    */
-  public ClientRegionFactory<K, V> setCustomEntryTimeToLive(CustomExpiry<K, V> 
custom);
+  ClientRegionFactory<K, V> setCustomEntryTimeToLive(CustomExpiry<K, V> 
custom);
 
   /**
    * Sets the idleTimeout expiration attributes for the region itself for the 
next
@@ -136,7 +136,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if idleTimeout is null
    * @see AttributesFactory#setRegionIdleTimeout
    */
-  public ClientRegionFactory<K, V> setRegionIdleTimeout(ExpirationAttributes 
idleTimeout);
+  ClientRegionFactory<K, V> setRegionIdleTimeout(ExpirationAttributes 
idleTimeout);
 
   /**
    * Sets the timeToLive expiration attributes for the region itself for the 
next
@@ -147,7 +147,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if timeToLive is null
    * @see AttributesFactory#setRegionTimeToLive
    */
-  public ClientRegionFactory<K, V> setRegionTimeToLive(ExpirationAttributes 
timeToLive);
+  ClientRegionFactory<K, V> setRegionTimeToLive(ExpirationAttributes 
timeToLive);
 
   /**
    * Sets the key constraint for the next <code>RegionAttributes</code> 
created. Keys in the region
@@ -160,7 +160,7 @@ public interface ClientRegionFactory<K, V> {
    *         type
    * @see AttributesFactory#setKeyConstraint
    */
-  public ClientRegionFactory<K, V> setKeyConstraint(Class<K> keyConstraint);
+  ClientRegionFactory<K, V> setKeyConstraint(Class<K> keyConstraint);
 
   /**
    * Sets the value constraint for the next <code>RegionAttributes</code> 
created. Values in the
@@ -173,7 +173,7 @@ public interface ClientRegionFactory<K, V> {
    *         primitive type
    * @see AttributesFactory#setValueConstraint
    */
-  public ClientRegionFactory<K, V> setValueConstraint(Class<V> 
valueConstraint);
+  ClientRegionFactory<K, V> setValueConstraint(Class<V> valueConstraint);
 
   /**
    * Sets the entry initial capacity for the next 
<code>RegionAttributes</code> created. This value
@@ -185,7 +185,7 @@ public interface ClientRegionFactory<K, V> {
    * @see java.util.HashMap
    * @see AttributesFactory#setInitialCapacity
    */
-  public ClientRegionFactory<K, V> setInitialCapacity(int initialCapacity);
+  ClientRegionFactory<K, V> setInitialCapacity(int initialCapacity);
 
   /**
    * Sets the entry load factor for the next <code>RegionAttributes</code> 
created. This value is
@@ -197,7 +197,7 @@ public interface ClientRegionFactory<K, V> {
    * @see java.util.HashMap
    * @see AttributesFactory#setLoadFactor
    */
-  public ClientRegionFactory<K, V> setLoadFactor(float loadFactor);
+  ClientRegionFactory<K, V> setLoadFactor(float loadFactor);
 
   /**
    * Sets the concurrency level tof the next <code>RegionAttributes</code> 
created. This value is
@@ -208,7 +208,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalArgumentException if concurrencyLevel is nonpositive
    * @see AttributesFactory#setConcurrencyLevel
    */
-  public ClientRegionFactory<K, V> setConcurrencyLevel(int concurrencyLevel);
+  ClientRegionFactory<K, V> setConcurrencyLevel(int concurrencyLevel);
 
   /**
    * Enables or disabled concurrent modification checks
@@ -216,7 +216,7 @@ public interface ClientRegionFactory<K, V> {
    * @since GemFire 7.0
    * @param concurrencyChecksEnabled whether to perform concurrency checks on 
operations
    */
-  public void setConcurrencyChecksEnabled(boolean concurrencyChecksEnabled);
+  void setConcurrencyChecksEnabled(boolean concurrencyChecksEnabled);
 
   /**
    * Sets the DiskStore name attribute. This causes the region to belong to 
the DiskStore.
@@ -226,7 +226,7 @@ public interface ClientRegionFactory<K, V> {
    * 
    * @see AttributesFactory#setDiskStoreName
    */
-  public ClientRegionFactory<K, V> setDiskStoreName(String name);
+  ClientRegionFactory<K, V> setDiskStoreName(String name);
 
   /**
    * Sets whether or not the writing to the disk is synchronous.
@@ -234,7 +234,7 @@ public interface ClientRegionFactory<K, V> {
    * @param isSynchronous boolean if true indicates synchronous writes
    * @return a reference to this ClientRegionFactory object
    */
-  public ClientRegionFactory<K, V> setDiskSynchronous(boolean isSynchronous);
+  ClientRegionFactory<K, V> setDiskSynchronous(boolean isSynchronous);
 
   /**
    * Sets whether statistics are enabled for this region and its entries.
@@ -243,7 +243,7 @@ public interface ClientRegionFactory<K, V> {
    * @return a reference to this ClientRegionFactory object
    * @see AttributesFactory#setStatisticsEnabled
    */
-  public ClientRegionFactory<K, V> setStatisticsEnabled(boolean 
statisticsEnabled);
+  ClientRegionFactory<K, V> setStatisticsEnabled(boolean statisticsEnabled);
 
   /**
    * Sets cloning on region Note: off-heap regions always behave as if cloning 
is enabled.
@@ -252,7 +252,7 @@ public interface ClientRegionFactory<K, V> {
    * @return a reference to this ClientRegionFactory object
    * @see AttributesFactory#setCloningEnabled
    */
-  public ClientRegionFactory<K, V> setCloningEnabled(boolean cloningEnable);
+  ClientRegionFactory<K, V> setCloningEnabled(boolean cloningEnable);
 
   /**
    * Sets the pool name attribute. This causes regions that use these 
attributes to be a client
@@ -266,7 +266,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws IllegalStateException if a cache loader or cache writer has 
already been set.
    * @see PoolManager
    */
-  public ClientRegionFactory<K, V> setPoolName(String poolName);
+  ClientRegionFactory<K, V> setPoolName(String poolName);
 
   /**
    * Set the compressor to be used by this region for compressing region entry 
values.
@@ -275,7 +275,7 @@ public interface ClientRegionFactory<K, V> {
    * @return a reference to this RegionFactory instance
    * @since GemFire 8.0
    */
-  public ClientRegionFactory<K, V> setCompressor(Compressor compressor);
+  ClientRegionFactory<K, V> setCompressor(Compressor compressor);
 
   /**
    * Creates a region in the {@link ClientCache} using the configuration 
contained in this
@@ -288,7 +288,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws RegionExistsException if a region with the given name already 
exists in this cache
    * @throws CacheClosedException if the cache is closed
    */
-  public Region<K, V> create(String name) throws RegionExistsException;
+  Region<K, V> create(String name) throws RegionExistsException;
 
   /**
    * Creates a sub-region in the {@link ClientCache} using the configuration 
contained in this
@@ -304,8 +304,7 @@ public interface ClientRegionFactory<K, V> {
    * @throws CacheClosedException if the cache is closed
    * @since GemFire 7.0
    */
-  public Region<K, V> createSubregion(Region<?, ?> parent, String name)
-      throws RegionExistsException;
+  Region<K, V> createSubregion(Region<?, ?> parent, String name) throws 
RegionExistsException;
 
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java 
b/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
index e910e01..6a19a5a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java
@@ -59,7 +59,7 @@ public interface Pool {
    * @return the name of the pool
    * @see PoolFactory#create
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the socket connect timeout of this pool.
@@ -73,84 +73,84 @@ public interface Pool {
    * 
    * @see PoolFactory#setFreeConnectionTimeout
    */
-  public int getFreeConnectionTimeout();
+  int getFreeConnectionTimeout();
 
   /**
    * Returns the load conditioning interval of this pool.
    * 
    * @see PoolFactory#setLoadConditioningInterval
    */
-  public int getLoadConditioningInterval();
+  int getLoadConditioningInterval();
 
   /**
    * Returns the socket buffer size of this pool.
    * 
    * @see PoolFactory#setSocketBufferSize
    */
-  public int getSocketBufferSize();
+  int getSocketBufferSize();
 
   /**
    * Returns the read timeout of this pool.
    * 
    * @see PoolFactory#setReadTimeout
    */
-  public int getReadTimeout();
+  int getReadTimeout();
 
   /**
    * Get the minimum connections for this pool.
    * 
    * @see PoolFactory#setMinConnections(int)
    */
-  public int getMinConnections();
+  int getMinConnections();
 
   /**
    * Get the maximum connections for this pool.
    * 
    * @see PoolFactory#setMaxConnections(int)
    */
-  public int getMaxConnections();
+  int getMaxConnections();
 
   /**
    * Get the maximum connections for this pool.
    * 
    * @see PoolFactory#setIdleTimeout(long)
    */
-  public long getIdleTimeout();
+  long getIdleTimeout();
 
   /**
    * Get the ping interval for this pool.
    * 
    * @see PoolFactory#setPingInterval(long)
    */
-  public long getPingInterval();
+  long getPingInterval();
 
   /**
    * Get the statistic interval for this pool.
    * 
    * @see PoolFactory#setStatisticInterval(int)
    */
-  public int getStatisticInterval();
+  int getStatisticInterval();
 
   /**
    * Get the retry attempts for this pool.
    * 
    * @see PoolFactory#setRetryAttempts(int)
    */
-  public int getRetryAttempts();
+  int getRetryAttempts();
 
   /**
    * Returns <code>true</code> if thread local connections are enabled on this 
pool.
    * 
    * @see PoolFactory#setThreadLocalConnections
    */
-  public boolean getThreadLocalConnections();
+  boolean getThreadLocalConnections();
 
   /**
    * Returns the true if a server-to-client subscriptions are enabled on this 
pool.
    * 
    * @see PoolFactory#setSubscriptionEnabled
    */
-  public boolean getSubscriptionEnabled();
+  boolean getSubscriptionEnabled();
 
   /**
    * Returns true if single-hop optimisation is enabled on this pool.
@@ -158,35 +158,35 @@ public interface Pool {
    * @see PoolFactory#setPRSingleHopEnabled
    * @since GemFire 6.5
    */
-  public boolean getPRSingleHopEnabled();
+  boolean getPRSingleHopEnabled();
 
   /**
    * Returns the subscription redundancy level of this pool.
    * 
    * @see PoolFactory#setSubscriptionRedundancy
    */
-  public int getSubscriptionRedundancy();
+  int getSubscriptionRedundancy();
 
   /**
    * Returns the subscription message tracking timeout of this pool.
    * 
    * @see PoolFactory#setSubscriptionMessageTrackingTimeout
    */
-  public int getSubscriptionMessageTrackingTimeout();
+  int getSubscriptionMessageTrackingTimeout();
 
   /**
    * Returns the subscription ack interval of this pool.
    * 
    * @see PoolFactory#setSubscriptionAckInterval(int)
    */
-  public int getSubscriptionAckInterval();
+  int getSubscriptionAckInterval();
 
   /**
    * Returns the server group of this pool.
    * 
    * @see PoolFactory#setServerGroup
    */
-  public String getServerGroup();
+  String getServerGroup();
 
   /**
    * Returns true if multiuser mode is enabled on this pool.
@@ -194,7 +194,7 @@ public interface Pool {
    * @see PoolFactory#setMultiuserAuthentication(boolean)
    * @since GemFire 6.5
    */
-  public boolean getMultiuserAuthentication();
+  boolean getMultiuserAuthentication();
 
 
   /**
@@ -204,7 +204,7 @@ public interface Pool {
    * <p>
    * If a pool has no locators then it can not discover servers or locators at 
runtime.
    */
-  public java.util.List<InetSocketAddress> getLocators();
+  java.util.List<InetSocketAddress> getLocators();
 
   /**
    * Returns an unmodifiable list of {@link java.net.InetSocketAddress} of the 
locators this pool is
@@ -214,14 +214,14 @@ public interface Pool {
    * The returned locator list may be slightly old information. If the locator 
does not exist, an
    * empty list is returned.
    */
-  public java.util.List<InetSocketAddress> getOnlineLocators();
+  java.util.List<InetSocketAddress> getOnlineLocators();
 
   /**
    * Returns an unmodifiable list of {@link java.net.InetSocketAddress} of the 
servers this pool is
    * using. These servers where either {@link PoolFactory#addServer added 
explicitly} when the pool
    * was created or were discovered using this pools {@link #getLocators 
locators}.
    */
-  public java.util.List<InetSocketAddress> getServers();
+  java.util.List<InetSocketAddress> getServers();
 
   /**
    * Destroys this pool closing any connections it produced.
@@ -230,21 +230,21 @@ public interface Pool {
    *        the timeout period
    * @throws IllegalStateException if the pool is still in use
    */
-  public void destroy(boolean keepAlive);
+  void destroy(boolean keepAlive);
 
   /**
    * Destroys this pool closing any connections it produced.
    * 
    * @throws IllegalStateException if the pool is still in use
    */
-  public void destroy();
+  void destroy();
 
   /**
    * Indicates whether this Pool has been destroyed.
    * 
    * @return true if the pool has been destroyed
    */
-  public boolean isDestroyed();
+  boolean isDestroyed();
 
   /**
    * If this pool was configured to to use thread local connections, then this 
method will release
@@ -253,7 +253,7 @@ public interface Pool {
    * 
    * If this pool is not using thread local connections, this method will have 
no effect.
    */
-  public void releaseThreadLocalConnection();
+  void releaseThreadLocalConnection();
 
   /**
    * Returns the QueryService for this Pool. The query operations performed 
using this QueryService
@@ -261,7 +261,7 @@ public interface Pool {
    * 
    * @return the QueryService
    */
-  public QueryService getQueryService();
+  QueryService getQueryService();
 
   /**
    * Returns the approximate number of pending subscription events maintained 
at server for this
@@ -291,6 +291,6 @@ public interface Pool {
    *         invocation of {@link ClientCache#readyForEvents()}.
    * @since GemFire 8.1
    */
-  public int getPendingEventCount();
+  int getPendingEventCount();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
index c5bb863..6ce2ce1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/PoolFactory.java
@@ -68,7 +68,7 @@ public interface PoolFactory {
    * <p>
    * Current value: <code>10000</code>.
    */
-  public static final int DEFAULT_FREE_CONNECTION_TIMEOUT = 10000;
+  int DEFAULT_FREE_CONNECTION_TIMEOUT = 10000;
 
   /**
    * The default interval in which the pool will check to see if a connection 
to a given server
@@ -76,63 +76,63 @@ public interface PoolFactory {
    * <p>
    * Current value: <code>300,000</code> (which is 5 minutes).
    */
-  public static final int DEFAULT_LOAD_CONDITIONING_INTERVAL = 1000 * 60 * 5;
+  int DEFAULT_LOAD_CONDITIONING_INTERVAL = 1000 * 60 * 5;
 
   /**
    * Default size in bytes of the socket buffer on each connection established.
    * <p>
    * Current value: <code>32768</code>.
    */
-  public static final int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
+  int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
 
   /**
    * The default amount of time, in milliseconds, to wait for a response from 
a server
    * <p>
    * Current value: <code>10000</code>.
    */
-  public static final int DEFAULT_READ_TIMEOUT = 10000;
+  int DEFAULT_READ_TIMEOUT = 10000;
 
   /**
    * The default number of connections to initially create
    * <p>
    * Current value: <code>1</code>.
    */
-  public static final int DEFAULT_MIN_CONNECTIONS = 1;
+  int DEFAULT_MIN_CONNECTIONS = 1;
 
   /**
    * The default maximum number of connections to create
    * <p>
    * Current value: <code>-1</code>.
    */
-  public static final int DEFAULT_MAX_CONNECTIONS = -1;
+  int DEFAULT_MAX_CONNECTIONS = -1;
 
   /**
    * The default amount of time in milliseconds, to wait for a connection to 
become idle
    * <p>
    * Current value: <code>5000</code>.
    */
-  public static final long DEFAULT_IDLE_TIMEOUT = 5000;
+  long DEFAULT_IDLE_TIMEOUT = 5000;
 
   /**
    * The default number of times to retry an operation after a timeout or 
exception.
    * <p>
    * Current value: <code>-1</code>.
    */
-  public static final int DEFAULT_RETRY_ATTEMPTS = -1;
+  int DEFAULT_RETRY_ATTEMPTS = -1;
 
   /**
    * The default frequency, in milliseconds, to ping servers.
    * <p>
    * Current value: <code>10000</code>.
    */
-  public static final long DEFAULT_PING_INTERVAL = 10000;
+  long DEFAULT_PING_INTERVAL = 10000;
 
   /**
    * The default frequency, in milliseconds, that client statistics will be 
sent to the server.
    * <p>
    * Current value: <code>-1</code>.
    */
-  public static final int DEFAULT_STATISTIC_INTERVAL = -1;
+  int DEFAULT_STATISTIC_INTERVAL = -1;
 
   /**
    * The default value for whether connections should have affinity to the 
thread that last used
@@ -140,21 +140,21 @@ public interface PoolFactory {
    * <p>
    * Current value: <code>false</code>.
    */
-  public static final boolean DEFAULT_THREAD_LOCAL_CONNECTIONS = false;
+  boolean DEFAULT_THREAD_LOCAL_CONNECTIONS = false;
 
   /**
    * The default value for whether to establish a server to client 
subscription.
    * <p>
    * Current value: <code>false</code>.
    */
-  public static final boolean DEFAULT_SUBSCRIPTION_ENABLED = false;
+  boolean DEFAULT_SUBSCRIPTION_ENABLED = false;
 
   /**
    * The default redundancy for servers holding subscriptions established by 
this client
    * <p>
    * Current value: <code>0</code>.
    */
-  public static final int DEFAULT_SUBSCRIPTION_REDUNDANCY = 0;
+  int DEFAULT_SUBSCRIPTION_REDUNDANCY = 0;
 
   /**
    * The default amount of time, in milliseconds, that messages sent from a 
server to a client will
@@ -162,7 +162,7 @@ public interface PoolFactory {
    * <p>
    * Current value: <code>900000</code>.
    */
-  public static final int DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT = 
900000;
+  int DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT = 900000;
 
   /**
    * The default amount of time, in milliseconds, to wait before sending an 
acknowledgement to the
@@ -170,14 +170,14 @@ public interface PoolFactory {
    * <p>
    * Current value: <code>100</code>.
    */
-  public static final int DEFAULT_SUBSCRIPTION_ACK_INTERVAL = 100;
+  int DEFAULT_SUBSCRIPTION_ACK_INTERVAL = 100;
 
   /**
    * The default server group.
    * <p>
    * Current value: <code>""</code>.
    */
-  public static final String DEFAULT_SERVER_GROUP = "";
+  String DEFAULT_SERVER_GROUP = "";
 
   /**
    * The default value for whether to have single hop optimisations enabled.
@@ -186,7 +186,7 @@ public interface PoolFactory {
    * 
    * @since GemFire 6.5
    */
-  public static final boolean DEFAULT_PR_SINGLE_HOP_ENABLED = true;
+  boolean DEFAULT_PR_SINGLE_HOP_ENABLED = true;
   /**
    * The default value for whether to use multiuser mode.
    * <p>
@@ -194,7 +194,7 @@ public interface PoolFactory {
    * 
    * @since GemFire 6.5
    */
-  public static final boolean DEFAULT_MULTIUSER_AUTHENTICATION = false;
+  boolean DEFAULT_MULTIUSER_AUTHENTICATION = false;
 
   /**
    * Sets the socket connect timeout for this pool. The number of milli 
seconds specified as socket
@@ -221,7 +221,7 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>connectionTimeout</code> is 
less than or equal to
    *         <code>0</code>.
    */
-  public PoolFactory setFreeConnectionTimeout(int connectionTimeout);
+  PoolFactory setFreeConnectionTimeout(int connectionTimeout);
 
   /**
    * Sets the load conditioning interval for this pool. This interval controls 
how frequently the
@@ -235,7 +235,7 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>connectionLifetime</code> is 
less than
    *         <code>-1</code>.
    */
-  public PoolFactory setLoadConditioningInterval(int loadConditioningInterval);
+  PoolFactory setLoadConditioningInterval(int loadConditioningInterval);
 
   /**
    * Sets the socket buffer size for each connection made in this pool. Large 
messages can be
@@ -248,7 +248,7 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>bufferSize</code> is less than 
or equal to
    *         <code>0</code>.
    */
-  public PoolFactory setSocketBufferSize(int bufferSize);
+  PoolFactory setSocketBufferSize(int bufferSize);
 
   /**
    * Sets the thread local connections policy for this pool. If 
<code>true</code> then any time a
@@ -264,7 +264,7 @@ public interface PoolFactory {
    * @param threadLocalConnections if <code>true</code> then enable thread 
local connections.
    * @return a reference to <code>this</code>
    */
-  public PoolFactory setThreadLocalConnections(boolean threadLocalConnections);
+  PoolFactory setThreadLocalConnections(boolean threadLocalConnections);
 
   /**
    * Sets the number of milliseconds to wait for a response from a server 
before timing out the
@@ -274,7 +274,7 @@ public interface PoolFactory {
    * @return a reference to <code>this</code>
    * @throws IllegalArgumentException if <code>timeout</code> is less than 
<code>0</code>.
    */
-  public PoolFactory setReadTimeout(int timeout);
+  PoolFactory setReadTimeout(int timeout);
 
   /**
    * Set the minimum number of connections to keep available at all times. 
When the pool is created,
@@ -285,7 +285,7 @@ public interface PoolFactory {
    * @return a reference to <code>this</code>
    * @throws IllegalArgumentException if <code>minConnections</code> is less 
than <code>0</code>.
    */
-  public PoolFactory setMinConnections(int minConnections);
+  PoolFactory setMinConnections(int minConnections);
 
   /**
    * Set the max number of client to server connections that the pool will 
create. If all of the
@@ -299,7 +299,7 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>maxConnections</code> is less 
than
    *         <code>minConnections</code>.
    */
-  public PoolFactory setMaxConnections(int maxConnections);
+  PoolFactory setMaxConnections(int maxConnections);
 
   /**
    * Set the amount of time a connection can be idle before expiring the 
connection. If the pool
@@ -311,7 +311,7 @@ public interface PoolFactory {
    * @return a reference to <code>this</code>
    * @throws IllegalArgumentException if <code>idleTimout</code> is less than 
<code>-1</code>.
    */
-  public PoolFactory setIdleTimeout(long idleTimeout);
+  PoolFactory setIdleTimeout(long idleTimeout);
 
   /**
    * Set the number of times to retry a request after timeout/exception.
@@ -321,7 +321,7 @@ public interface PoolFactory {
    * @return a reference to <code>this</code>
    * @throws IllegalArgumentException if <code>retryAttempts</code> is less 
than <code>-1</code>.
    */
-  public PoolFactory setRetryAttempts(int retryAttempts);
+  PoolFactory setRetryAttempts(int retryAttempts);
 
   /**
    * How often to ping servers to verify that they are still alive. Each 
server will be sent a ping
@@ -336,7 +336,7 @@ public interface PoolFactory {
    *         <code>0</code>.
    * @see CacheServer#setMaximumTimeBetweenPings(int)
    */
-  public PoolFactory setPingInterval(long pingInterval);
+  PoolFactory setPingInterval(long pingInterval);
 
   /**
    * How often to send client statistics to the server. Doing this allows 
<code>gfmon</code> to
@@ -350,7 +350,7 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>statisticInterval</code> is 
less than
    *         <code>-1</code>.
    */
-  public PoolFactory setStatisticInterval(int statisticInterval);
+  PoolFactory setStatisticInterval(int statisticInterval);
 
   /**
    * Configures the group that all servers this pool connects to must belong 
to.
@@ -359,7 +359,7 @@ public interface PoolFactory {
    *        <code>""</code> then all servers will be connected to.
    * @return a reference to <code>this</code>
    */
-  public PoolFactory setServerGroup(String group);
+  PoolFactory setServerGroup(String group);
 
   /**
    * Add a locator, given its host and port, to this factory. The locator must 
be a server locator
@@ -374,7 +374,7 @@ public interface PoolFactory {
    * @throws IllegalStateException if a server has already been {@link 
#addServer added} to this
    *         factory.
    */
-  public PoolFactory addLocator(String host, int port);
+  PoolFactory addLocator(String host, int port);
 
   /**
    * Add a server, given its host and port, to this factory. The server must 
be a cache server and
@@ -389,7 +389,7 @@ public interface PoolFactory {
    * @throws IllegalStateException if a locator has already been {@link 
#addLocator added} to this
    *         factory.
    */
-  public PoolFactory addServer(String host, int port);
+  PoolFactory addServer(String host, int port);
 
   /**
    * If set to <code>true</code> then the created pool will have 
server-to-client subscriptions
@@ -398,7 +398,7 @@ public interface PoolFactory {
    * 
    * @return a reference to <code>this</code>
    */
-  public PoolFactory setSubscriptionEnabled(boolean enabled);
+  PoolFactory setSubscriptionEnabled(boolean enabled);
 
   /**
    * Sets the redundancy level for this pools server-to-client subscriptions. 
If <code>0</code> then
@@ -410,7 +410,7 @@ public interface PoolFactory {
    * @return a reference to <code>this</code>
    * @throws IllegalArgumentException if <code>redundancyLevel</code> is less 
than <code>-1</code>.
    */
-  public PoolFactory setSubscriptionRedundancy(int redundancy);
+  PoolFactory setSubscriptionRedundancy(int redundancy);
 
   /**
    * Sets the messageTrackingTimeout attribute which is the time-to-live 
period, in milliseconds,
@@ -423,7 +423,7 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>messageTrackingTimeout</code> 
is less than or equal
    *         to <code>0</code>.
    */
-  public PoolFactory setSubscriptionMessageTrackingTimeout(int 
messageTrackingTimeout);
+  PoolFactory setSubscriptionMessageTrackingTimeout(int 
messageTrackingTimeout);
 
   /**
    * Sets the interval in milliseconds to wait before sending acknowledgements 
to the cache server
@@ -434,14 +434,14 @@ public interface PoolFactory {
    * @throws IllegalArgumentException if <code>ackInterval</code> is less than 
or equal to
    *         <code>0</code>.
    */
-  public PoolFactory setSubscriptionAckInterval(int ackInterval);
+  PoolFactory setSubscriptionAckInterval(int ackInterval);
 
   /**
    * Resets the configuration of this factory to its defaults.
    * 
    * @return a reference to <code>this</code>
    */
-  public PoolFactory reset();
+  PoolFactory reset();
 
   /**
    * Create a new Pool for connecting a client to a set of GemFire Cache 
Servers. using this
@@ -452,7 +452,7 @@ public interface PoolFactory {
    * @throws IllegalStateException if a locator or server has not been added.
    * @return the newly created pool.
    */
-  public Pool create(String name);
+  Pool create(String name);
 
   /**
    * By default setPRSingleHopEnabled is <code>true</code> in which case the 
client is aware of the
@@ -475,7 +475,7 @@ public interface PoolFactory {
    * @return a reference to <code>this</code>
    * @since GemFire 6.5
    */
-  public PoolFactory setPRSingleHopEnabled(boolean enabled);
+  PoolFactory setPRSingleHopEnabled(boolean enabled);
 
   /**
    * If set to <code>true</code> then the created pool can be used by multiple 
authenticated users.
@@ -491,6 +491,6 @@ public interface PoolFactory {
    * @see ClientCache#createAuthenticatedView(java.util.Properties)
    * @since GemFire 6.5
    */
-  public PoolFactory setMultiuserAuthentication(boolean enabled);
+  PoolFactory setMultiuserAuthentication(boolean enabled);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
index 7af4f4f..d711b88 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
@@ -311,7 +311,7 @@ public abstract class AbstractOp implements Op {
      * 
      * @param msg the current chunk to handle
      */
-    public void handle(ChunkedMessage msg) throws Exception;
+    void handle(ChunkedMessage msg) throws Exception;
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientUpdater.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientUpdater.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientUpdater.java
index c993984..38159b5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientUpdater.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientUpdater.java
@@ -25,9 +25,9 @@ public interface ClientUpdater {
 
   void join(long wait) throws InterruptedException;
 
-  public void setFailedUpdater(ClientUpdater failedUpdater);
+  void setFailedUpdater(ClientUpdater failedUpdater);
 
-  public boolean isProcessing();
+  boolean isProcessing();
 
-  public boolean isPrimary();
+  boolean isPrimary();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
index 2fc524a..a5cfa00 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
@@ -30,24 +30,24 @@ import 
org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
  * @since GemFire 5.7
  */
 public interface Connection {
-  public static final long DEFAULT_CONNECTION_ID = 26739;
+  long DEFAULT_CONNECTION_ID = 26739;
 
-  public Socket getSocket();
+  Socket getSocket();
 
-  public ByteBuffer getCommBuffer() throws SocketException;
+  ByteBuffer getCommBuffer() throws SocketException;
 
-  public ConnectionStats getStats();
+  ConnectionStats getStats();
 
   /**
    * Forcefully close the resources used by this connection. This should be 
called if the connection
    * or the server dies.
    */
-  public void destroy();
+  void destroy();
 
   /**
    * Return true if this connection has been destroyed
    */
-  public boolean isDestroyed();
+  boolean isDestroyed();
 
   /**
    * Gracefully close the connection by notifying the server. It is not 
necessary to call destroy
@@ -57,29 +57,29 @@ public interface Connection {
    * @throws Exception if there was an error notifying the server. The 
connection will still be
    *         destroyed.
    */
-  public void close(boolean keepAlive) throws Exception;
+  void close(boolean keepAlive) throws Exception;
 
-  public ServerLocation getServer();
+  ServerLocation getServer();
 
-  public Endpoint getEndpoint();
+  Endpoint getEndpoint();
 
-  public ServerQueueStatus getQueueStatus();
+  ServerQueueStatus getQueueStatus();
 
-  public Object execute(Op op) throws Exception;
+  Object execute(Op op) throws Exception;
 
-  public void emergencyClose();
+  void emergencyClose();
 
-  public short getWanSiteVersion();
+  short getWanSiteVersion();
 
-  public void setWanSiteVersion(short wanSiteVersion);
+  void setWanSiteVersion(short wanSiteVersion);
 
-  public int getDistributedSystemId();
+  int getDistributedSystemId();
 
-  public OutputStream getOutputStream();
+  OutputStream getOutputStream();
 
-  public InputStream getInputStream();
+  InputStream getInputStream();
 
-  public void setConnectionID(long id);
+  void setConnectionID(long id);
 
-  public long getConnectionID();
+  long getConnectionID();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
index 3fc37a3..68b5227 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManager.java
@@ -66,14 +66,14 @@ public interface EndpointManager {
    * 
    * @return a map of ServerLocation-> ConnectionStats
    */
-  public Map getAllStats();
+  Map getAllStats();
 
   /**
    * Test hook that returns the number of servers we currently have 
connections to.
    */
-  public int getConnectedServerCount();
+  int getConnectedServerCount();
 
-  public static interface EndpointListener {
+  interface EndpointListener {
 
     void endpointNoLongerInUse(Endpoint endpoint);
 
@@ -82,7 +82,7 @@ public interface EndpointManager {
     void endpointNowInUse(Endpoint endpoint);
   }
 
-  public static class EndpointListenerAdapter implements EndpointListener {
+  class EndpointListenerAdapter implements EndpointListener {
 
     public void endpointCrashed(Endpoint endpoint) {}
 
@@ -91,5 +91,5 @@ public interface EndpointManager {
     public void endpointNowInUse(Endpoint endpoint) {}
   }
 
-  public String getPoolName();
+  String getPoolName();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
index 3da550a..edf16e6 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecutablePool.java
@@ -32,7 +32,7 @@ public interface ExecutablePool {
    * @return the result of execution if any; null if not
    * @since GemFire 5.7
    */
-  public Object execute(Op op);
+  Object execute(Op op);
 
   /**
    * Execute the given op on the servers that this pool connects to. This 
method is responsible for
@@ -42,7 +42,7 @@ public interface ExecutablePool {
    * @return the result of execution if any; null if not
    * @since GemFire 5.7
    */
-  public Object execute(Op op, int retryAttempts);
+  Object execute(Op op, int retryAttempts);
 
   /**
    * Execute the given op on all the servers that have server-to-client queues 
for this pool The
@@ -53,7 +53,7 @@ public interface ExecutablePool {
    * @throws NoSubscriptionServersAvailableException if we have no queue server
    * @throws SubscriptionNotEnabledException If the pool does not have queues 
enabled
    */
-  public void executeOnAllQueueServers(Op op)
+  void executeOnAllQueueServers(Op op)
       throws NoSubscriptionServersAvailableException, 
SubscriptionNotEnabledException;
 
   /**
@@ -67,7 +67,7 @@ public interface ExecutablePool {
    * @throws SubscriptionNotEnabledException If the pool does not have queues 
enabled
    * @since GemFire 5.7
    */
-  public Object executeOnQueuesAndReturnPrimaryResult(Op op)
+  Object executeOnQueuesAndReturnPrimaryResult(Op op)
       throws NoSubscriptionServersAvailableException, 
SubscriptionNotEnabledException;
 
   /**
@@ -77,7 +77,7 @@ public interface ExecutablePool {
    * @param op the operation to execute
    * @return the result of execution if any; null if not
    */
-  public Object executeOn(ServerLocation server, Op op);
+  Object executeOn(ServerLocation server, Op op);
 
   /**
    * Execute the given op on the given server.
@@ -87,8 +87,7 @@ public interface ExecutablePool {
    * @param accessed true if the connection is accessed by this execute
    * @return the result of execution if any; null if not
    */
-  public Object executeOn(ServerLocation server, Op op, boolean accessed,
-      boolean onlyUseExistingCnx);
+  Object executeOn(ServerLocation server, Op op, boolean accessed, boolean 
onlyUseExistingCnx);
 
   /**
    * Execute the given op on the given connection.
@@ -97,7 +96,7 @@ public interface ExecutablePool {
    * @param op the operation to execute
    * @return the result of execution if any; null if not
    */
-  public Object executeOn(Connection con, Op op);
+  Object executeOn(Connection con, Op op);
 
   /**
    * Execute the given op on the given connection.
@@ -107,7 +106,7 @@ public interface ExecutablePool {
    * @param timeoutFatal true if a timeout exception should be treated as a 
fatal one
    * @return the result of execution if any; null if not
    */
-  public Object executeOn(Connection con, Op op, boolean timeoutFatal);
+  Object executeOn(Connection con, Op op, boolean timeoutFatal);
 
   /**
    * Execute the given op on the current primary server.
@@ -115,9 +114,9 @@ public interface ExecutablePool {
    * @param op the operation to execute
    * @return the result of execution if any; null if not
    */
-  public Object executeOnPrimary(Op op);
+  Object executeOnPrimary(Op op);
 
-  public RegisterInterestTracker getRITracker();
+  RegisterInterestTracker getRITracker();
 
   /**
    * Release the connection held by the calling thread if we're using thread 
local connections
@@ -132,14 +131,14 @@ public interface ExecutablePool {
    *        unreachable. Affinity to the new server will be maintained
    * @since GemFire 6.6
    */
-  public void setupServerAffinity(boolean allowFailover);
+  void setupServerAffinity(boolean allowFailover);
 
   /**
    * Release the server affinity established by {@link 
#setupServerAffinity(boolean)}
    * 
    * @since GemFire 6.6
    */
-  public void releaseServerAffinity();
+  void releaseServerAffinity();
 
   /**
    * When server affinity is enabled by this thread, returns the server 
against which all ops in
@@ -149,7 +148,7 @@ public interface ExecutablePool {
    * @since GemFire 6.6
    * @see ExecutablePool#setupServerAffinity(boolean)
    */
-  public ServerLocation getServerAffinityLocation();
+  ServerLocation getServerAffinityLocation();
 
   /**
    * All subsequent operations by this thread will be performed on the given 
ServerLocation. Used
@@ -158,5 +157,5 @@ public interface ExecutablePool {
    * @param serverLocation
    * @since GemFire 6.6
    */
-  public void setServerAffinityLocation(ServerLocation serverLocation);
+  void setServerAffinityLocation(ServerLocation serverLocation);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
index 9704bbb..a0e37c2 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManager.java
@@ -26,15 +26,15 @@ import org.apache.geode.internal.logging.InternalLogWriter;
  */
 public interface QueueManager {
 
-  public QueueConnections getAllConnectionsNoWait();
+  QueueConnections getAllConnectionsNoWait();
 
-  public QueueConnections getAllConnections();
+  QueueConnections getAllConnections();
 
   void start(ScheduledExecutorService background);
 
   void close(boolean keepAlive);
 
-  public static interface QueueConnections {
+  interface QueueConnections {
     Connection getPrimary();
 
     List/* <Connection> */ getBackups();
@@ -42,15 +42,15 @@ public interface QueueManager {
     QueueConnectionImpl getConnection(Endpoint endpoint);
   }
 
-  public QueueState getState();
+  QueueState getState();
 
-  public InternalPool getPool();
+  InternalPool getPool();
 
-  public InternalLogWriter getSecurityLogger();
+  InternalLogWriter getSecurityLogger();
 
-  public void readyForEvents(InternalDistributedSystem system);
+  void readyForEvents(InternalDistributedSystem system);
 
-  public void emergencyClose();
+  void emergencyClose();
 
-  public void checkEndpoint(ClientUpdater qc, Endpoint endpoint);
+  void checkEndpoint(ClientUpdater qc, Endpoint endpoint);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
index 6b537c3..e16636a 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueState.java
@@ -19,20 +19,20 @@ import org.apache.geode.internal.cache.EventID;
 
 public interface QueueState {
 
-  public void processMarker();
+  void processMarker();
 
-  public boolean getProcessedMarker();
+  boolean getProcessedMarker();
 
-  public void incrementInvalidatedStats();
+  void incrementInvalidatedStats();
 
-  public boolean verifyIfDuplicate(EventID eventId, boolean addToMap);
+  boolean verifyIfDuplicate(EventID eventId, boolean addToMap);
 
-  public boolean verifyIfDuplicate(EventID eventId);
+  boolean verifyIfDuplicate(EventID eventId);
 
   /**
    * test hook
    */
-  public java.util.Map getThreadIdToSequenceIdMap();
+  java.util.Map getThreadIdToSequenceIdMap();
 
-  public void start(ScheduledExecutorService timer, int interval);
+  void start(ScheduledExecutorService timer, int interval);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
index 3f4b38f..3112c8d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerBlackList.java
@@ -144,10 +144,10 @@ public class ServerBlackList {
     }
   }
 
-  public static interface BlackListListener {
-    public void serverAdded(ServerLocation location);
+  public interface BlackListListener {
+    void serverAdded(ServerLocation location);
 
-    public void serverRemoved(ServerLocation location);
+    void serverRemoved(ServerLocation location);
   }
 
   public static class BlackListListenerAdapter implements BlackListListener {

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
index e11284e..a3b1078 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerRegionDataAccess.java
@@ -38,7 +38,7 @@ public interface ServerRegionDataAccess {
    * @param clientEvent the client event, if any, for version propagation
    * @return the entry value found by the get if any
    */
-  public abstract Object get(Object key, Object callbackArg, EntryEventImpl 
clientEvent);
+  Object get(Object key, Object callbackArg, EntryEventImpl clientEvent);
 
   /**
    * Does a region put on the server
@@ -52,9 +52,8 @@ public interface ServerRegionDataAccess {
    * @param callbackArg an optional callback arg to pass to any cache callbacks
    * @param isCreateFwd
    */
-  public abstract Object put(Object key, Object value, byte[] deltaBytes,
-      EntryEventImpl clientEvent, Operation op, boolean requireOldValue, 
Object expectedOldValue,
-      Object callbackArg, boolean isCreateFwd);
+  Object put(Object key, Object value, byte[] deltaBytes, EntryEventImpl 
clientEvent, Operation op,
+      boolean requireOldValue, Object expectedOldValue, Object callbackArg, 
boolean isCreateFwd);
 
 
   /**
@@ -66,7 +65,7 @@ public interface ServerRegionDataAccess {
    * @param clientEvent the client event, if any, for version propagation
    * @param callbackArg an optional callback arg to pass to any cache callbacks
    */
-  public abstract Object destroy(Object key, Object expectedOldValue, 
Operation operation,
+  Object destroy(Object key, Object expectedOldValue, Operation operation,
       EntryEventImpl clientEvent, Object callbackArg);
 
 
@@ -75,7 +74,7 @@ public interface ServerRegionDataAccess {
    * 
    * @param event the entryEventImpl that represents the invalidate
    */
-  public abstract void invalidate(EntryEventImpl event);
+  void invalidate(EntryEventImpl event);
 
 
   /**
@@ -84,7 +83,7 @@ public interface ServerRegionDataAccess {
    * @param eventId the event id for this clear
    * @param callbackArg an optional callback arg to pass to any cache callbacks
    */
-  public abstract void clear(EventID eventId, Object callbackArg);
+  void clear(EventID eventId, Object callbackArg);
 
 
   /**
@@ -92,14 +91,14 @@ public interface ServerRegionDataAccess {
    * 
    * @param key the entry key to do the containsKey on
    */
-  public abstract boolean containsKey(Object key);
+  boolean containsKey(Object key);
 
   /**
    * Does a region containsKey on a server
    * 
    * @param key the entry key to do the containsKey on
    */
-  public abstract boolean containsValueForKey(Object key);
+  boolean containsValueForKey(Object key);
 
 
   /**
@@ -107,23 +106,21 @@ public interface ServerRegionDataAccess {
    * 
    * @param value the entry value to search for
    */
-  public boolean containsValue(Object value);
+  boolean containsValue(Object value);
 
 
   /**
    * Does a region keySet on a server
    */
-  public abstract Set keySet();
+  Set keySet();
 
-  public abstract VersionedObjectList putAll(Map map, EventID eventId, boolean 
skipCallbacks,
-      Object callbackArg);
+  VersionedObjectList putAll(Map map, EventID eventId, boolean skipCallbacks, 
Object callbackArg);
 
-  public abstract VersionedObjectList removeAll(Collection<Object> keys, 
EventID eventId,
-      Object callbackArg);
+  VersionedObjectList removeAll(Collection<Object> keys, EventID eventId, 
Object callbackArg);
 
-  public abstract VersionedObjectList getAll(List keys, Object callback);
+  VersionedObjectList getAll(List keys, Object callback);
 
-  public int size();
+  int size();
 
   /**
    * gets an entry from the server, does not invoke loaders
@@ -131,7 +128,7 @@ public interface ServerRegionDataAccess {
    * @param key
    * @return an {@link EntrySnapshot} for the given key
    */
-  public Entry getEntry(Object key);
+  Entry getEntry(Object key);
   // public boolean containsValue(Object value);
   // public Set entries(boolean recursive) {
   // public void invalidate(Object key) throws TimeoutException,
@@ -140,12 +137,12 @@ public interface ServerRegionDataAccess {
   /**
    * returns the name of the region to which this interface provides access
    */
-  public String getRegionName();
+  String getRegionName();
 
   /**
    * returns the region to which this interface provides access. This may be 
null in an admin system
    */
-  public Region getRegion();
+  Region getRegion();
 
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
index bc5e1d5..7a45b95 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorMembershipListener.java
@@ -29,11 +29,11 @@ import java.util.concurrent.ConcurrentMap;
  */
 public interface LocatorMembershipListener {
 
-  public Object handleRequest(Object request);
+  Object handleRequest(Object request);
 
-  public void setPort(int port);
+  void setPort(int port);
 
-  public void setConfig(DistributionConfig config);
+  void setConfig(DistributionConfig config);
 
   /**
    * When the new locator is added to remote locator metadata, inform all 
other locators in remote
@@ -41,14 +41,14 @@ public interface LocatorMembershipListener {
    * 
    * @param locator
    */
-  public void locatorJoined(int distributedSystemId, DistributionLocatorId 
locator,
+  void locatorJoined(int distributedSystemId, DistributionLocatorId locator,
       DistributionLocatorId sourceLocator);
 
-  public Set<String> getRemoteLocatorInfo(int dsId);
+  Set<String> getRemoteLocatorInfo(int dsId);
 
-  public ConcurrentMap<Integer, Set<DistributionLocatorId>> 
getAllLocatorsInfo();
+  ConcurrentMap<Integer, Set<DistributionLocatorId>> getAllLocatorsInfo();
 
-  public ConcurrentMap<Integer, Set<String>> getAllServerLocatorsInfo();
+  ConcurrentMap<Integer, Set<String>> getAllServerLocatorsInfo();
 
-  public void clearLocatorInfo();
+  void clearLocatorInfo();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
index a624883..2ba4445 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManager.java
@@ -99,19 +99,19 @@ public interface ConnectionManager {
   /**
    * Test hook to find out current number of connections this manager has.
    */
-  public int getConnectionCount();
+  int getConnectionCount();
 
   void emergencyClose();
 
   /**
    * Used to active a thread local connection
    */
-  public void activate(Connection conn);
+  void activate(Connection conn);
 
   /**
    * Used to passivate a thread local connection
    */
-  public void passivate(Connection conn, boolean accessed);
+  void passivate(Connection conn, boolean accessed);
 
-  public Connection getConnection(Connection conn);
+  Connection getConnection(Connection conn);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
index d0537e4..fb7b4c9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceFactory.java
@@ -47,12 +47,12 @@ public interface RebalanceFactory {
    * used by this member will be rebalanced. Operation may queue as needed for 
resources in
    * contention by other active rebalance operations.
    */
-  public RebalanceOperation start();
+  RebalanceOperation start();
 
   /**
    * Simulates a rebalance of the GemFire controlled cache resources on this 
member. This operation
    * will not make any actual changes. It will only produce a report of what 
the results would have
    * been had this been a real rebalance operation.
    */
-  public RebalanceOperation simulate();
+  RebalanceOperation simulate();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
 
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
index fd8297f..156099f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceOperation.java
@@ -31,12 +31,12 @@ public interface RebalanceOperation {
   /**
    * Returns true if this operation was cancelled before it completed.
    */
-  public boolean isCancelled();
+  boolean isCancelled();
 
   /**
    * Returns true if this operation completed.
    */
-  public boolean isDone();
+  boolean isDone();
 
   /**
    * Cancels this rebalance operation. The rebalance operation will find a 
safe point and then stop.
@@ -44,7 +44,7 @@ public interface RebalanceOperation {
    * @return false if this operation could not be cancelled, typically because 
it has already
    *         completed; true otherwise
    */
-  public boolean cancel();
+  boolean cancel();
 
   /**
    * Wait for this operation to complete and return the results.
@@ -53,7 +53,7 @@ public interface RebalanceOperation {
    * @throws CancellationException if the operation was cancelled
    * @throws InterruptedException if the wait was interrupted
    */
-  public RebalanceResults getResults() throws CancellationException, 
InterruptedException;
+  RebalanceResults getResults() throws CancellationException, 
InterruptedException;
 
   /**
    * Wait for this operation to complete and return the results.
@@ -65,6 +65,6 @@ public interface RebalanceOperation {
    * @throws TimeoutException if the wait timed out
    * @throws InterruptedException if the wait was interrupted
    */
-  public RebalanceResults getResults(long timeout, TimeUnit unit)
+  RebalanceResults getResults(long timeout, TimeUnit unit)
       throws CancellationException, TimeoutException, InterruptedException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java 
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
index c33cc3d..8cfaaaf 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
@@ -33,21 +33,21 @@ public interface RebalanceResults {
    * @return a <code>Set</code> of detailed information about each partitioned 
region that was
    *         rebalanced
    */
-  public Set<PartitionRebalanceInfo> getPartitionRebalanceDetails();
+  Set<PartitionRebalanceInfo> getPartitionRebalanceDetails();
 
   /**
    * Returns the total time, in milliseconds, that the rebalance operation 
took.
    * 
    * @return the total time, in milliseconds, that the rebalance operation took
    */
-  public long getTotalTime();
+  long getTotalTime();
 
   /**
    * Returns the total number of buckets created during the rebalance 
operation.
    * 
    * @return the total number of buckets created during the rebalance operation
    */
-  public int getTotalBucketCreatesCompleted();
+  int getTotalBucketCreatesCompleted();
 
   /**
    * Returns the total size, in bytes, of all of the buckets that were created 
as part of the
@@ -56,47 +56,47 @@ public interface RebalanceResults {
    * @return the total size, in bytes, of all of the buckets that were created 
as part of the
    *         rebalance operation
    */
-  public long getTotalBucketCreateBytes();
+  long getTotalBucketCreateBytes();
 
   /**
    * Returns the total time, in milliseconds, taken to create buckets.
    * 
    * @return the total time, in milliseconds, taken to create buckets
    */
-  public long getTotalBucketCreateTime();
+  long getTotalBucketCreateTime();
 
   /**
    * Returns the total number of buckets transferred.
    * 
    * @return the total number of buckets transferred
    */
-  public int getTotalBucketTransfersCompleted();
+  int getTotalBucketTransfersCompleted();
 
   /**
    * Returns the total size, in bytes, of buckets that were transferred.
    * 
    * @return the total size, in bytes, of buckets that were transferred
    */
-  public long getTotalBucketTransferBytes();
+  long getTotalBucketTransferBytes();
 
   /**
    * Returns the total amount of time, in milliseconds, it took to transfer 
buckets.
    * 
    * @return the total amount of time, in milliseconds, it took to transfer 
buckets
    */
-  public long getTotalBucketTransferTime();
+  long getTotalBucketTransferTime();
 
   /**
    * Returns the total number of primaries that were transferred.
    * 
    * @return the total number of primaries that were transferred
    */
-  public int getTotalPrimaryTransfersCompleted();
+  int getTotalPrimaryTransfersCompleted();
 
   /**
    * Returns the total time, in milliseconds, spent transferring primaries.
    * 
    * @return the total time, in milliseconds, spent transferring primaries
    */
-  public long getTotalPrimaryTransferTime();
+  long getTotalPrimaryTransferTime();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java 
b/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
index 37ebe5e..b455ca3 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/control/ResourceManager.java
@@ -48,7 +48,7 @@ public interface ResourceManager {
    * @see ResourceManager#setCriticalHeapPercentage(float)
    * @see ResourceManager#getCriticalHeapPercentage()
    */
-  public static final float DEFAULT_CRITICAL_PERCENTAGE = 0.0f;
+  float DEFAULT_CRITICAL_PERCENTAGE = 0.0f;
 
   /**
    * The default percent of heap memory at which the VM should begin evicting 
data. Current value is
@@ -60,14 +60,14 @@ public interface ResourceManager {
    * @see ResourceManager#setEvictionHeapPercentage(float)
    * @see ResourceManager#getEvictionHeapPercentage()
    */
-  public static final float DEFAULT_EVICTION_PERCENTAGE = 0.0f;
+  float DEFAULT_EVICTION_PERCENTAGE = 0.0f;
 
   /**
    * Creates a factory for defining and starting {@link RebalanceOperation 
RebalanceOperations}.
    * 
    * @return a factory for defining and starting RebalanceOperations
    */
-  public RebalanceFactory createRebalanceFactory();
+  RebalanceFactory createRebalanceFactory();
 
   /**
    * Returns a set of all active {@link RebalanceOperation 
RebalanceOperations} that were started
@@ -75,7 +75,7 @@ public interface ResourceManager {
    *
    * @return a set of all active RebalanceOperations started locally
    */
-  public Set<RebalanceOperation> getRebalanceOperations();
+  Set<RebalanceOperation> getRebalanceOperations();
 
   /**
    * Set the percentage of heap at or above which the cache is considered in 
danger of becoming
@@ -128,7 +128,7 @@ public interface ResourceManager {
    * @see #getEvictionHeapPercentage()
    * @since GemFire 6.0
    */
-  public void setCriticalHeapPercentage(float heapPercentage);
+  void setCriticalHeapPercentage(float heapPercentage);
 
   /**
    * Get the percentage of heap at or above which the cache is considered in 
danger of becoming
@@ -138,7 +138,7 @@ public interface ResourceManager {
    * @see #setCriticalHeapPercentage(float)
    * @since GemFire 6.0
    */
-  public float getCriticalHeapPercentage();
+  float getCriticalHeapPercentage();
 
   /**
    * Set the percentage of off-heap at or above which the cache is considered 
in danger of becoming
@@ -169,7 +169,7 @@ public interface ResourceManager {
    * @see #getEvictionOffHeapPercentage()
    * @since Geode 1.0
    */
-  public void setCriticalOffHeapPercentage(float offHeapPercentage);
+  void setCriticalOffHeapPercentage(float offHeapPercentage);
 
   /**
    * Get the percentage of off-heap at or above which the cache is considered 
in danger of becoming
@@ -179,7 +179,7 @@ public interface ResourceManager {
    * @see #setCriticalOffHeapPercentage(float)
    * @since Geode 1.0
    */
-  public float getCriticalOffHeapPercentage();
+  float getCriticalOffHeapPercentage();
 
   /**
    * Set the percentage of heap at or above which the eviction should begin on 
Regions configured
@@ -203,7 +203,7 @@ public interface ResourceManager {
    * @see #getCriticalHeapPercentage()
    * @since GemFire 6.0
    */
-  public void setEvictionHeapPercentage(float heapPercentage);
+  void setEvictionHeapPercentage(float heapPercentage);
 
   /**
    * Get the percentage of heap at or above which the eviction should begin on 
Regions configured
@@ -213,7 +213,7 @@ public interface ResourceManager {
    * @see #setEvictionHeapPercentage(float)
    * @since GemFire 6.0
    */
-  public float getEvictionHeapPercentage();
+  float getEvictionHeapPercentage();
 
   /**
    * Set the percentage of off-heap at or above which the eviction should 
begin on Regions
@@ -233,7 +233,7 @@ public interface ResourceManager {
    * @see #getCriticalOffHeapPercentage()
    * @since Geode 1.0
    */
-  public void setEvictionOffHeapPercentage(float offHeapPercentage);
+  void setEvictionOffHeapPercentage(float offHeapPercentage);
 
   /**
    * Get the percentage of off-heap at or above which the eviction should 
begin on Regions
@@ -243,5 +243,5 @@ public interface ResourceManager {
    * @see #setEvictionOffHeapPercentage(float)
    * @since Geode 1.0
    */
-  public float getEvictionOffHeapPercentage();
+  float getEvictionOffHeapPercentage();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java 
b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
index 5b97da9..0b48e8e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
@@ -51,7 +51,7 @@ public interface Execution<IN, OUT, AGG> {
    *         {@link FunctionService#onRegion(org.apache.geode.cache.Region)}
    * @since GemFire 6.0
    */
-  public Execution<IN, OUT, AGG> withFilter(Set<?> filter);
+  Execution<IN, OUT, AGG> withFilter(Set<?> filter);
 
   /**
    * Specifies the user data passed to the function when it is executed. The 
function can retrieve
@@ -63,7 +63,7 @@ public interface Execution<IN, OUT, AGG> {
    * @since Geode 1.2
    * 
    */
-  public Execution<IN, OUT, AGG> setArguments(IN args);
+  Execution<IN, OUT, AGG> setArguments(IN args);
 
   /**
    * Specifies the user data passed to the function when it is executed. The 
function can retrieve
@@ -76,7 +76,7 @@ public interface Execution<IN, OUT, AGG> {
    * @deprecated use {@link #setArguments(Object)} instead
    *
    */
-  public Execution<IN, OUT, AGG> withArgs(IN args);
+  Execution<IN, OUT, AGG> withArgs(IN args);
 
   /**
    * Specifies the {@link ResultCollector} that will receive the results after 
the function has been
@@ -88,7 +88,7 @@ public interface Execution<IN, OUT, AGG> {
    * @see ResultCollector
    * @since GemFire 6.0
    */
-  public Execution<IN, OUT, AGG> withCollector(ResultCollector<OUT, AGG> rc);
+  Execution<IN, OUT, AGG> withCollector(ResultCollector<OUT, AGG> rc);
 
   /**
    * Executes the function using its {@linkplain Function#getId() id}
@@ -104,7 +104,7 @@ public interface Execution<IN, OUT, AGG> {
    * 
    * @since GemFire 6.0
    */
-  public ResultCollector<OUT, AGG> execute(String functionId) throws 
FunctionException;
+  ResultCollector<OUT, AGG> execute(String functionId) throws 
FunctionException;
 
   /**
    * Executes the function instance provided.
@@ -121,5 +121,5 @@ public interface Execution<IN, OUT, AGG> {
    * 
    * @since GemFire 6.0
    */
-  public ResultCollector<OUT, AGG> execute(Function function) throws 
FunctionException;
+  ResultCollector<OUT, AGG> execute(Function function) throws 
FunctionException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java 
b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
index 25ba4e3..9f19f99 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
@@ -54,7 +54,7 @@ public interface Function<T> extends Identifiable<String> {
    * @return whether this function returns a Result back to the caller.
    * @since GemFire 6.0
    */
-  public default boolean hasResult() {
+  default boolean hasResult() {
     return true;
   }
 
@@ -68,7 +68,7 @@ public interface Function<T> extends Identifiable<String> {
    * @param context as created by {@link Execution}
    * @since GemFire 6.0
    */
-  public void execute(FunctionContext<T> context);
+  void execute(FunctionContext<T> context);
 
   /**
    * Return a unique function identifier, used to register the function with 
{@link FunctionService}
@@ -76,7 +76,7 @@ public interface Function<T> extends Identifiable<String> {
    * @return string identifying this function
    * @since GemFire 6.0
    */
-  public default String getId() {
+  default String getId() {
     return getClass().getCanonicalName();
   }
 
@@ -102,7 +102,7 @@ public interface Function<T> extends Identifiable<String> {
    * @since GemFire 6.0
    * @see FunctionService
    */
-  public default boolean optimizeForWrite() {
+  default boolean optimizeForWrite() {
     return false;
   }
 
@@ -114,7 +114,7 @@ public interface Function<T> extends Identifiable<String> {
    * 
    * @since GemFire 6.5
    */
-  public default boolean isHA() {
+  default boolean isHA() {
     return true;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java 
b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
index 74f05c5..6de99dc 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java
@@ -40,7 +40,7 @@ public interface FunctionContext<T1> {
    * @return the arguments or null if there are no arguments
    * @since GemFire 6.0
    */
-  public T1 getArguments();
+  T1 getArguments();
 
   /**
    * Returns the identifier of the function.
@@ -49,7 +49,7 @@ public interface FunctionContext<T1> {
    * @see Function#getId()
    * @since GemFire 6.0
    */
-  public String getFunctionId();
+  String getFunctionId();
 
   /**
    * Returns the ResultSender which is used to add the ability for an execute 
method to send a
@@ -63,7 +63,7 @@ public interface FunctionContext<T1> {
    * @since GemFire 6.0
    */
 
-  public <T2> ResultSender<T2> getResultSender();
+  <T2> ResultSender<T2> getResultSender();
 
   /**
    * Returns a boolean to identify whether this is a re-execute. Returns true 
if it is a re-execute
@@ -74,5 +74,5 @@ public interface FunctionContext<T1> {
    * @since GemFire 6.5
    * @see Function#isHA()
    */
-  public boolean isPossibleDuplicate();
+  boolean isPossibleDuplicate();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
 
b/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
index 5bf7cd9..cdeef98 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/execute/RegionFunctionContext.java
@@ -49,7 +49,7 @@ public interface RegionFunctionContext extends 
FunctionContext {
    * @return the objects that caused the function to be routed to this cluster 
member
    * @since GemFire 6.0
    */
-  public Set<?> getFilter();
+  Set<?> getFilter();
 
   /**
    * Returns the reference to the Region on which the function is executed
@@ -60,6 +60,6 @@ public interface RegionFunctionContext extends 
FunctionContext {
    * 
    * @since GemFire 6.0
    */
-  public <K, V> Region<K, V> getDataSet();
+  <K, V> Region<K, V> getDataSet();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java 
b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
index 605d4f1..05ddc69 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java
@@ -68,7 +68,7 @@ public interface ResultCollector<T, S> {
    * @throws FunctionException if result retrieval fails
    * @since GemFire 6.0
    */
-  public S getResult() throws FunctionException;
+  S getResult() throws FunctionException;
 
   /**
    * Method used to pull results from the ResultCollector. It returns the 
result of function
@@ -83,7 +83,7 @@ public interface ResultCollector<T, S> {
    * @since GemFire 6.0
    * 
    */
-  public S getResult(long timeout, TimeUnit unit) throws FunctionException, 
InterruptedException;
+  S getResult(long timeout, TimeUnit unit) throws FunctionException, 
InterruptedException;
 
   /**
    * Method used to feed result to the ResultCollector. It adds a single 
function execution result
@@ -93,7 +93,7 @@ public interface ResultCollector<T, S> {
    * @since GemFire 6.0
    * @param memberID DistributedMember ID to which result belongs
    */
-  public void addResult(DistributedMember memberID, T resultOfSingleExecution);
+  void addResult(DistributedMember memberID, T resultOfSingleExecution);
 
   /**
    * GemFire will invoke this method when function execution has completed and 
all results for the
@@ -106,7 +106,7 @@ public interface ResultCollector<T, S> {
    * 
    * @see ResultSender#lastResult(Object)
    */
-  public void endResults();
+  void endResults();
 
   /**
    * GemFire will invoke this method before re-executing function (in case of 
Function Execution
@@ -114,6 +114,6 @@ public interface ResultCollector<T, S> {
    * 
    * @since GemFire 6.5
    */
-  public void clearResults();
+  void clearResults();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java 
b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
index 5d33bd1..1f81157 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultSender.java
@@ -55,7 +55,7 @@ public interface ResultSender<T> {
    * 
    * @param oneResult
    */
-  public void sendResult(T oneResult);
+  void sendResult(T oneResult);
 
   /**
    * Sends a result back to the FunctionService calling thread and invokes
@@ -68,7 +68,7 @@ public interface ResultSender<T> {
    * 
    * @see ResultCollector#endResults()
    */
-  public void lastResult(T lastResult);
+  void lastResult(T lastResult);
 
   /**
    * Sends an Exception back to the FunctionService calling thread. 
sendException adds exception to
@@ -81,5 +81,5 @@ public interface ResultSender<T> {
    * @see #lastResult(Object)
    * @since GemFire 6.3
    */
-  public void sendException(Throwable t);
+  void sendException(Throwable t);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
 
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
index deb319f..ea44c0d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListener.java
@@ -68,7 +68,7 @@ public interface PartitionListener {
    * @param bucketId id of the bucket which became primary
    * @since GemFire 6.5
    */
-  public void afterPrimary(int bucketId);
+  void afterPrimary(int bucketId);
 
   /**
    * Callback invoked when any bucket in a partitioned region stops being 
primary
@@ -76,7 +76,7 @@ public interface PartitionListener {
    * @param bucketId id of the bucket which stopped being primary
    * @since Geode 1.1
    */
-  default public void afterSecondary(int bucketId) {
+  default void afterSecondary(int bucketId) {
 
   }
 
@@ -86,7 +86,7 @@ public interface PartitionListener {
    * @param region handle of the region which is created
    * @since GemFire 6.5
    */
-  public void afterRegionCreate(Region<?, ?> region);
+  void afterRegionCreate(Region<?, ?> region);
 
   /**
    * Callback invoked after a bucket has been removed from a member (e.g. 
during rebalancing). This
@@ -96,7 +96,7 @@ public interface PartitionListener {
    * @param keys keys in the bucket removed
    * @since GemFire 6.6.1
    */
-  public void afterBucketRemoved(int bucketId, Iterable<?> keys);
+  void afterBucketRemoved(int bucketId, Iterable<?> keys);
 
   /**
    * Callback invoked after a bucket has been created in a member (e.g. during 
rebalancing). This
@@ -108,6 +108,6 @@ public interface PartitionListener {
    * @param keys keys in the bucket created
    * @since GemFire 6.6.1
    */
-  public void afterBucketCreated(int bucketId, Iterable<?> keys);
+  void afterBucketCreated(int bucketId, Iterable<?> keys);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
 
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
index 250da6b..d1e1918 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionMemberInfo.java
@@ -31,7 +31,7 @@ public interface PartitionMemberInfo {
    * 
    * @return the member for which these details pertain to
    */
-  public DistributedMember getDistributedMember();
+  DistributedMember getDistributedMember();
 
   /**
    * Returns the {@link 
org.apache.geode.cache.PartitionAttributes#getLocalMaxMemory() max memory}
@@ -40,7 +40,7 @@ public interface PartitionMemberInfo {
    * 
    * @return the max memory in bytes that the member was configured to provide 
for storage
    */
-  public long getConfiguredMaxMemory(); // in bytes
+  long getConfiguredMaxMemory(); // in bytes
 
   /**
    * The total size in bytes of memory being used by the member for storage of 
actual data in the
@@ -48,7 +48,7 @@ public interface PartitionMemberInfo {
    * 
    * @return size in bytes of memory being used by the member for storage
    */
-  public long getSize(); // in bytes
+  long getSize(); // in bytes
 
   /**
    * Returns the number of buckets hosted within the member's partition space 
for the partitioned
@@ -56,7 +56,7 @@ public interface PartitionMemberInfo {
    * 
    * @return the number of buckets hosted within the member
    */
-  public int getBucketCount();
+  int getBucketCount();
 
   /**
    * The number of hosted buckets for which the member is hosting the primary 
copy. Other copies are
@@ -64,5 +64,5 @@ public interface PartitionMemberInfo {
    * 
    * @return the number of hosted buckets for which the member is hosting the 
primary copy
    */
-  public int getPrimaryCount();
+  int getPrimaryCount();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
 
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
index c70ab88..02f2955 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
@@ -30,7 +30,7 @@ public interface PartitionRebalanceInfo {
    * 
    * @return the full name of partioned region that these details describe.
    */
-  public String getRegionPath();
+  String getRegionPath();
 
   /**
    * Returns a <code>Set</code> of detailed information about each member that 
had rebalancable
@@ -39,7 +39,7 @@ public interface PartitionRebalanceInfo {
    * @return a <code>Set</code> of detailed information about each member that 
had rebalancable
    *         resources at the time that the rebalance started
    */
-  public Set<PartitionMemberInfo> getPartitionMemberDetailsBefore();
+  Set<PartitionMemberInfo> getPartitionMemberDetailsBefore();
 
   /**
    * Returns a <code>Set</code> of detailed information about each member that 
had rebalancable
@@ -48,21 +48,21 @@ public interface PartitionRebalanceInfo {
    * @return a <code>Set</code> of detailed information about each member that 
had rebalancable
    *         resources at the time that the rebalance completed
    */
-  public Set<PartitionMemberInfo> getPartitionMemberDetailsAfter();
+  Set<PartitionMemberInfo> getPartitionMemberDetailsAfter();
 
   /**
    * Returns the time, in milliseconds, that the rebalance operation took for 
this region.
    * 
    * @return the time, in milliseconds, that the rebalance operation took for 
this region.
    */
-  public long getTime();
+  long getTime();
 
   /**
    * Returns the number of buckets created during the rebalance operation.
    * 
    * @return the number of buckets created during the rebalance operation
    */
-  public int getBucketCreatesCompleted();
+  int getBucketCreatesCompleted();
 
   /**
    * Returns the size, in bytes, of all of the buckets that were created as 
part of the rebalance
@@ -71,21 +71,21 @@ public interface PartitionRebalanceInfo {
    * @return the size, in bytes, of all of the buckets that were created as 
part of the rebalance
    *         operation
    */
-  public long getBucketCreateBytes();
+  long getBucketCreateBytes();
 
   /**
    * Returns the time, in milliseconds, taken to create buckets for this 
region.
    * 
    * @return the time, in milliseconds, taken to create buckets for this region
    */
-  public long getBucketCreateTime();
+  long getBucketCreateTime();
 
   /**
    * Returns the number of buckets removed during the rebalance operation.
    * 
    * @return the number of buckets removed during the rebalance operation
    */
-  public int getBucketRemovesCompleted();
+  int getBucketRemovesCompleted();
 
   /**
    * Returns the size, in bytes, of all of the buckets that were removed as 
part of the rebalance
@@ -94,47 +94,47 @@ public interface PartitionRebalanceInfo {
    * @return the size, in bytes, of all of the buckets that were removed as 
part of the rebalance
    *         operation
    */
-  public long getBucketRemoveBytes();
+  long getBucketRemoveBytes();
 
   /**
    * Returns the time, in milliseconds, taken to remove buckets for this 
region.
    * 
    * @return the time, in milliseconds, taken to remove buckets for this region
    */
-  public long getBucketRemoveTime();
+  long getBucketRemoveTime();
 
   /**
    * Returns the number of buckets transferred for this region.
    * 
    * @return the number of buckets transferred for this region
    */
-  public int getBucketTransfersCompleted();
+  int getBucketTransfersCompleted();
 
   /**
    * Returns the size, in bytes, of buckets that were transferred for this 
region.
    * 
    * @return the size, in bytes, of buckets that were transferred for this 
region
    */
-  public long getBucketTransferBytes();
+  long getBucketTransferBytes();
 
   /**
    * Returns the amount of time, in milliseconds, it took to transfer buckets 
for this region.
    * 
    * @return the amount of time, in milliseconds, it took to transfer buckets 
for this region
    */
-  public long getBucketTransferTime();
+  long getBucketTransferTime();
 
   /**
    * Returns the number of primaries that were transferred for this region.
    * 
    * @return the number of primaries that were transferred for this region
    */
-  public int getPrimaryTransfersCompleted();
+  int getPrimaryTransfersCompleted();
 
   /**
    * Returns the time, in milliseconds, spent transferring primaries for this 
region.
    * 
    * @return the time, in milliseconds, spent transferring primaries for this 
region
    */
-  public long getPrimaryTransferTime();
+  long getPrimaryTransferTime();
 }

Reply via email to