geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [33/40] geode git commit: GEODE-2980: remove unnecessary explicit keywords from interfaces
Date Thu, 15 Jun 2017 21:55:06 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
index bd00170..ed9db5d 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
@@ -37,7 +37,7 @@ public interface CacheServer {
   /**
    * The default port on which a <Code>CacheServer</code> is configured to serve.
    */
-  public static final int DEFAULT_PORT = 40404;
+  int DEFAULT_PORT = 40404;
 
   /**
    * The default number of sockets accepted by a CacheServer. When the maximum is reached the cache
@@ -45,7 +45,7 @@ public interface CacheServer {
    * 
    * @since GemFire 5.7
    */
-  public static final int DEFAULT_MAX_CONNECTIONS = 800;
+  int DEFAULT_MAX_CONNECTIONS = 800;
   // Value derived from common file descriptor limits for Unix sytems (1024)...
 
   /**
@@ -58,35 +58,35 @@ public interface CacheServer {
    * 
    * @since GemFire 5.7
    */
-  public static final int DEFAULT_MAX_THREADS = 0;
+  int DEFAULT_MAX_THREADS = 0;
 
   /**
    * The default notify-by-subscription value which tells the <Code>CacheServer</code> whether or
    * not to notify clients based on key subscription.
    */
-  public static final boolean DEFAULT_NOTIFY_BY_SUBSCRIPTION = true;
+  boolean DEFAULT_NOTIFY_BY_SUBSCRIPTION = true;
 
   /**
    * The default socket buffer size for socket buffers from the cache server to the client.
    */
-  public static final int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
+  int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
 
   /**
    * The default maximum amount of time between client pings. This value is used by the
    * <code>ClientHealthMonitor</code> to determine the health of this <code>CacheServer</code>'s
    * clients.
    */
-  public static final int DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS = 60000;
+  int DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS = 60000;
 
   /**
    * The default maximum number of messages that can be enqueued in a client-queue.
    */
-  public static final int DEFAULT_MAXIMUM_MESSAGE_COUNT = 230000;
+  int DEFAULT_MAXIMUM_MESSAGE_COUNT = 230000;
 
   /**
    * The default time (in seconds ) after which a message in the client queue will expire.
    */
-  public static final int DEFAULT_MESSAGE_TIME_TO_LIVE = 180;
+  int DEFAULT_MESSAGE_TIME_TO_LIVE = 180;
 
   /**
    * The default list of server groups a cache server belongs to. The current default is an empty
@@ -95,7 +95,7 @@ public interface CacheServer {
    * @since GemFire 5.7
    * @deprecated as of 7.0 use the groups gemfire property
    */
-  public static final String[] DEFAULT_GROUPS = new String[0];
+  String[] DEFAULT_GROUPS = new String[0];
 
   /**
    * The default load balancing probe. The default load balancing probe reports the connections
@@ -104,7 +104,7 @@ public interface CacheServer {
    * @since GemFire 5.7
    * 
    */
-  public static final ServerLoadProbe DEFAULT_LOAD_PROBE = new ConnectionCountProbe();
+  ServerLoadProbe DEFAULT_LOAD_PROBE = new ConnectionCountProbe();
 
   /**
    * The default frequency at which to poll the load probe for the load on this cache server.
@@ -112,7 +112,7 @@ public interface CacheServer {
    * 
    * @since GemFire 5.7
    */
-  public static final long DEFAULT_LOAD_POLL_INTERVAL = 5000;
+  long DEFAULT_LOAD_POLL_INTERVAL = 5000;
 
   /**
    * The default ip address or host name that the cache server's socket will listen on for client
@@ -120,7 +120,7 @@ public interface CacheServer {
    * 
    * @since GemFire 5.7
    */
-  public static final String DEFAULT_BIND_ADDRESS = "";
+  String DEFAULT_BIND_ADDRESS = "";
 
   /**
    * The default ip address or host name that will be given to clients as the host this cache server
@@ -128,24 +128,24 @@ public interface CacheServer {
    * 
    * @since GemFire 5.7
    */
-  public static final String DEFAULT_HOSTNAME_FOR_CLIENTS = "";
+  String DEFAULT_HOSTNAME_FOR_CLIENTS = "";
 
   /**
    * The default setting for outgoing tcp/ip connections. By default the product enables tcpNoDelay.
    */
-  public static final boolean DEFAULT_TCP_NO_DELAY = true;
+  boolean DEFAULT_TCP_NO_DELAY = true;
 
   /**
    * Returns the port on which this cache server listens for clients.
    */
-  public int getPort();
+  int getPort();
 
   /**
    * Sets the port on which this cache server listens for clients.
    *
    * @throws IllegalStateException If this cache server is running
    */
-  public void setPort(int port);
+  void setPort(int port);
 
   /**
    * Returns a string representing the ip address or host name that this cache server will listen
@@ -155,7 +155,7 @@ public interface CacheServer {
    * @see #DEFAULT_BIND_ADDRESS
    * @since GemFire 5.7
    */
-  public String getBindAddress();
+  String getBindAddress();
 
   /**
    * Sets the ip address or host name that this cache server is to listen on for client connections.
@@ -176,7 +176,7 @@ public interface CacheServer {
    * @see #DEFAULT_BIND_ADDRESS
    * @since GemFire 5.7
    */
-  public void setBindAddress(String address);
+  void setBindAddress(String address);
 
   /**
    * Returns a string representing the ip address or host name that server locators will tell
@@ -186,7 +186,7 @@ public interface CacheServer {
    * @see #DEFAULT_HOSTNAME_FOR_CLIENTS
    * @since GemFire 5.7
    */
-  public String getHostnameForClients();
+  String getHostnameForClients();
 
   /**
    * Sets the ip address or host name that this cache server is to listen on for client connections.
@@ -205,7 +205,7 @@ public interface CacheServer {
    * @see #DEFAULT_HOSTNAME_FOR_CLIENTS
    * @since GemFire 5.7
    */
-  public void setHostnameForClients(String name);
+  void setHostnameForClients(String name);
 
   /**
    * Sets whether or not this cache server should notify clients based on key subscription.
@@ -225,7 +225,7 @@ public interface CacheServer {
    *             attribute is set to true.
    */
   @Deprecated
-  public void setNotifyBySubscription(boolean b);
+  void setNotifyBySubscription(boolean b);
 
   /**
    * Answers whether or not this cache server should notify clients based on key subscription.
@@ -235,7 +235,7 @@ public interface CacheServer {
    *             attribute is set to true.
    */
   @Deprecated
-  public boolean getNotifyBySubscription();
+  boolean getNotifyBySubscription();
 
   /**
    * Sets the buffer size in bytes of the socket connection for this <code>CacheServer</code>. The
@@ -245,7 +245,7 @@ public interface CacheServer {
    *
    * @since GemFire 4.2.1
    */
-  public void setSocketBufferSize(int socketBufferSize);
+  void setSocketBufferSize(int socketBufferSize);
 
   /**
    * Returns the configured buffer size of the socket connection for this <code>CacheServer</code>.
@@ -255,7 +255,7 @@ public interface CacheServer {
    *
    * @since GemFire 4.2.1
    */
-  public int getSocketBufferSize();
+  int getSocketBufferSize();
 
   /**
    * Sets the maximum amount of time between client pings. This value is used by the
@@ -266,7 +266,7 @@ public interface CacheServer {
    *
    * @since GemFire 4.2.3
    */
-  public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings);
+  void setMaximumTimeBetweenPings(int maximumTimeBetweenPings);
 
   /**
    * Returns the maximum amount of time between client pings. This value is used by the
@@ -277,7 +277,7 @@ public interface CacheServer {
    *
    * @since GemFire 4.2.3
    */
-  public int getMaximumTimeBetweenPings();
+  int getMaximumTimeBetweenPings();
 
   /**
    * Starts this cache server. Once the cache server is running, its configuration cannot be
@@ -285,23 +285,23 @@ public interface CacheServer {
    *
    * @throws IOException If an error occurs while starting the cache server
    */
-  public void start() throws IOException;
+  void start() throws IOException;
 
   /**
    * Returns whether or not this cache server is running
    */
-  public boolean isRunning();
+  boolean isRunning();
 
   /**
    * Stops this cache server. Note that the <code>CacheServer</code> can be reconfigured and
    * restarted if desired.
    */
-  public void stop();
+  void stop();
 
   /**
    * Returns the maximum allowed client connections
    */
-  public int getMaxConnections();
+  int getMaxConnections();
 
   /**
    * Sets the maxium number of client connections allowed. When the maximum is reached the cache
@@ -309,7 +309,7 @@ public interface CacheServer {
    * 
    * @see #DEFAULT_MAX_CONNECTIONS
    */
-  public void setMaxConnections(int maxCons);
+  void setMaxConnections(int maxCons);
 
   /**
    * Returns the maxium number of threads allowed in this cache server to service client requests.
@@ -318,7 +318,7 @@ public interface CacheServer {
    * 
    * @since GemFire 5.1
    */
-  public int getMaxThreads();
+  int getMaxThreads();
 
   /**
    * Sets the maxium number of threads allowed in this cache server to service client requests. The
@@ -328,31 +328,31 @@ public interface CacheServer {
    * @see #DEFAULT_MAX_THREADS
    * @since GemFire 5.1
    */
-  public void setMaxThreads(int maxThreads);
+  void setMaxThreads(int maxThreads);
 
   /**
    * Returns the maximum number of messages that can be enqueued in a client-queue.
    */
-  public int getMaximumMessageCount();
+  int getMaximumMessageCount();
 
   /**
    * Sets maximum number of messages that can be enqueued in a client-queue.
    * 
    * @see #DEFAULT_MAXIMUM_MESSAGE_COUNT
    */
-  public void setMaximumMessageCount(int maxMessageCount);
+  void setMaximumMessageCount(int maxMessageCount);
 
   /**
    * Returns the time (in seconds ) after which a message in the client queue will expire.
    */
-  public int getMessageTimeToLive();
+  int getMessageTimeToLive();
 
   /**
    * Sets the time (in seconds ) after which a message in the client queue will expire.
    * 
    * @see #DEFAULT_MESSAGE_TIME_TO_LIVE
    */
-  public void setMessageTimeToLive(int messageTimeToLive);
+  void setMessageTimeToLive(int messageTimeToLive);
 
   /**
    * Sets the list of server groups this cache server will belong to. By default cache servers
@@ -364,7 +364,7 @@ public interface CacheServer {
    * @since GemFire 5.7
    * @deprecated as of 7.0 use the groups gemfire property
    */
-  public void setGroups(String[] groups);
+  void setGroups(String[] groups);
 
   /**
    * Returns the list of server groups that this cache server belongs to.
@@ -375,7 +375,7 @@ public interface CacheServer {
    * @since GemFire 5.7
    * @deprecated as of 7.0 use the groups gemfire property
    */
-  public String[] getGroups();
+  String[] getGroups();
 
   /**
    * Get the load probe for this cache server. See {@link ServerLoadProbe} for details on the load
@@ -384,7 +384,7 @@ public interface CacheServer {
    * @return the load probe used by this cache server.
    * @since GemFire 5.7
    */
-  public ServerLoadProbe getLoadProbe();
+  ServerLoadProbe getLoadProbe();
 
   /**
    * Set the load probe for this cache server. See {@link ServerLoadProbe} for details on how to
@@ -393,14 +393,14 @@ public interface CacheServer {
    * @param loadProbe the load probe to use for this cache server.
    * @since GemFire 5.7
    */
-  public void setLoadProbe(ServerLoadProbe loadProbe);
+  void setLoadProbe(ServerLoadProbe loadProbe);
 
   /**
    * Get the frequency in milliseconds to poll the load probe on this cache server.
    * 
    * @return the frequency in milliseconds that we will poll the load probe.
    */
-  public long getLoadPollInterval();
+  long getLoadPollInterval();
 
   /**
    * Set the frequency in milliseconds to poll the load probe on this cache server
@@ -408,7 +408,7 @@ public interface CacheServer {
    * @param loadPollInterval the frequency in milliseconds to poll the load probe. Must be greater
    *        than 0.
    */
-  public void setLoadPollInterval(long loadPollInterval);
+  void setLoadPollInterval(long loadPollInterval);
 
   /**
    * Get the outgoing connection tcp-no-delay setting. If it is set to true (the default) this cache
@@ -417,7 +417,7 @@ public interface CacheServer {
    * 
    * @return the tcp-no-delay setting
    */
-  public boolean getTcpNoDelay();
+  boolean getTcpNoDelay();
 
   /**
    * Configures the tcpNoDelay setting of sockets used to send messages to clients. TcpNoDelay is
@@ -425,7 +425,7 @@ public interface CacheServer {
    * 
    * @param noDelay if false, sets tcp-no-delay to false on out-going connections
    */
-  public void setTcpNoDelay(boolean noDelay);
+  void setTcpNoDelay(boolean noDelay);
 
   /**
    * Get the ClientSubscriptionConfig for this cache server. See {@link ClientSubscriptionConfig}
@@ -434,7 +434,7 @@ public interface CacheServer {
    * @return ClientSubscriptionConfig
    * @since GemFire 5.7
    */
-  public ClientSubscriptionConfig getClientSubscriptionConfig();
+  ClientSubscriptionConfig getClientSubscriptionConfig();
 
   /**
    * Returns the <code>ClientSession</code> associated with the <code>DistributedMember</code>
@@ -442,7 +442,7 @@ public interface CacheServer {
    * @return the <code>ClientSession</code> associated with the <code>DistributedMember</code>
    * @since GemFire 6.0
    */
-  public ClientSession getClientSession(DistributedMember member);
+  ClientSession getClientSession(DistributedMember member);
 
   /**
    * Returns the <code>ClientSession</code> associated with the durable client id
@@ -450,7 +450,7 @@ public interface CacheServer {
    * @return the <code>ClientSession</code> associated with the durable
    * @since GemFire 6.0
    */
-  public ClientSession getClientSession(String durableClientId);
+  ClientSession getClientSession(String durableClientId);
 
   /**
    * Returns a set of all <code>ClientSession</code>s
@@ -458,7 +458,7 @@ public interface CacheServer {
    * @return a set of all <code>ClientSession</code>s
    * @since GemFire 6.0
    */
-  public Set<ClientSession> getAllClientSessions();
+  Set<ClientSession> getAllClientSessions();
 
   /**
    * Registers a new <code>InterestRegistrationListener</code> with the set of
@@ -468,7 +468,7 @@ public interface CacheServer {
    * 
    * @since GemFire 6.0
    */
-  public void registerInterestRegistrationListener(InterestRegistrationListener listener);
+  void registerInterestRegistrationListener(InterestRegistrationListener listener);
 
   /**
    * Unregisters an existing <code>InterestRegistrationListener</code> from the set of
@@ -478,7 +478,7 @@ public interface CacheServer {
    * 
    * @since GemFire 6.0
    */
-  public void unregisterInterestRegistrationListener(InterestRegistrationListener listener);
+  void unregisterInterestRegistrationListener(InterestRegistrationListener listener);
 
   /**
    * Returns a read-only set of <code>InterestRegistrationListener</code>s registered with this
@@ -489,6 +489,6 @@ public interface CacheServer {
    * 
    * @since GemFire 6.0
    */
-  public Set<InterestRegistrationListener> getInterestRegistrationListeners();
+  Set<InterestRegistrationListener> getInterestRegistrationListeners();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java b/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
index 1cd99a1..b28a704 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
@@ -68,17 +68,17 @@ public interface ClientSubscriptionConfig {
   /**
    * The default limit that is assigned to client subscription.
    */
-  public static final int DEFAULT_CAPACITY = 1;
+  int DEFAULT_CAPACITY = 1;
 
   /**
    * The default eviction policy that is assigned to client subscription.
    */
-  public static final String DEFAULT_EVICTION_POLICY = "none";
+  String DEFAULT_EVICTION_POLICY = "none";
 
   /**
    * The default overflow directory that is assigned to client subscription.
    */
-  public static final String DEFAULT_OVERFLOW_DIRECTORY = ".";
+  String DEFAULT_OVERFLOW_DIRECTORY = ".";
 
   /**
    * Returns the capacity of the client queue. will be in MB for eviction-policy <b>mem</b> else
@@ -87,7 +87,7 @@ public interface ClientSubscriptionConfig {
    * @see #DEFAULT_CAPACITY
    * @since GemFire 5.7
    */
-  public int getCapacity();
+  int getCapacity();
 
   /**
    * Sets the capacity of the client queue. will be in MB for eviction-policy <b>mem</b> else number
@@ -96,7 +96,7 @@ public interface ClientSubscriptionConfig {
    * @see #DEFAULT_CAPACITY
    * @since GemFire 5.7
    */
-  public void setCapacity(int capacity);
+  void setCapacity(int capacity);
 
   /**
    * Returns the eviction policy that is executed when capacity of the client queue is reached.
@@ -104,7 +104,7 @@ public interface ClientSubscriptionConfig {
    * @see #DEFAULT_EVICTION_POLICY
    * @since GemFire 5.7
    */
-  public String getEvictionPolicy();
+  String getEvictionPolicy();
 
   /**
    * Sets the eviction policy that is executed when capacity of the client queue is reached.
@@ -112,7 +112,7 @@ public interface ClientSubscriptionConfig {
    * @see #DEFAULT_EVICTION_POLICY
    * @since GemFire 5.7
    */
-  public void setEvictionPolicy(String policy);
+  void setEvictionPolicy(String policy);
 
   /**
    * Sets the overflow directory for a client queue
@@ -121,7 +121,7 @@ public interface ClientSubscriptionConfig {
    * @since GemFire 5.7
    * @deprecated as of 6.5 use {@link #setDiskStoreName(String)} instead
    */
-  public void setOverflowDirectory(String overflowDirectory);
+  void setOverflowDirectory(String overflowDirectory);
 
   /**
    * Answers the overflow directory for a client queue's overflowed client queue entries.
@@ -130,7 +130,7 @@ public interface ClientSubscriptionConfig {
    * @since GemFire 5.7
    * @deprecated as of 6.5 use {@link #getDiskStoreName} instead
    */
-  public String getOverflowDirectory();
+  String getOverflowDirectory();
 
   /**
    * Sets the disk store name for overflow
@@ -138,12 +138,12 @@ public interface ClientSubscriptionConfig {
    * @param diskStoreName
    * @since GemFire 6.5
    */
-  public void setDiskStoreName(String diskStoreName);
+  void setDiskStoreName(String diskStoreName);
 
   /**
    * get the diskStoreName for overflow
    * 
    * @since GemFire 6.5
    */
-  public String getDiskStoreName();
+  String getDiskStoreName();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
index 4c819b8..d5da311 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
@@ -34,7 +34,7 @@ public interface SnapshotOptions<K, V> extends Serializable {
    * 
    * @since GemFire 7.0
    */
-  public enum SnapshotFormat {
+  enum SnapshotFormat {
     /** an optimized binary format specific to GemFire */
     GEMFIRE
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
index a73cc51..369f8ef 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
@@ -22,10 +22,10 @@ package org.apache.geode.cache.util;
  */
 public interface GatewayConflictHelper {
   /** disallow the event */
-  public void disallowEvent();
+  void disallowEvent();
 
   /** modify the value stored in the cache */
-  public void changeEventValue(Object value);
+  void changeEventValue(Object value);
 }
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
index 4c9fee7..f9850bd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
@@ -46,6 +46,6 @@ public interface GatewayConflictResolver {
    * @param event the event that is in conflict with the current cache state
    * @param helper an object to be used in modifying the course of action for this event
    */
-  public void onEvent(TimestampedEntryEvent event, GatewayConflictHelper helper);
+  void onEvent(TimestampedEntryEvent event, GatewayConflictHelper helper);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
index c797e88..5b2864c 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
@@ -35,56 +35,56 @@ public interface GatewayEvent {
    * 
    * @return the <code>Region</code> associated with this <code>GatewayEvent</code>
    */
-  public Region<?, ?> getRegion();
+  Region<?, ?> getRegion();
 
   /**
    * Returns the <code>Operation</code> that triggered this event.
    * 
    * @return the <code>Operation</code> that triggered this event
    */
-  public Operation getOperation();
+  Operation getOperation();
 
   /**
    * Returns the callbackArgument associated with this event.
    * 
    * @return the callbackArgument associated with this event
    */
-  public Object getCallbackArgument();
+  Object getCallbackArgument();
 
   /**
    * Returns the key associated with this event.
    * 
    * @return the key associated with this event
    */
-  public Object getKey();
+  Object getKey();
 
   /**
    * Returns the deserialized value associated with this event.
    * 
    * @return the deserialized value associated with this event
    */
-  public Object getDeserializedValue();
+  Object getDeserializedValue();
 
   /**
    * Returns the serialized form of the value associated with this event.
    * 
    * @return the serialized form of the value associated with this event
    */
-  public byte[] getSerializedValue();
+  byte[] getSerializedValue();
 
   /**
    * Sets whether this event is a possible duplicate.
    * 
    * @param possibleDuplicate whether this event is a possible duplicate
    */
-  public void setPossibleDuplicate(boolean possibleDuplicate);
+  void setPossibleDuplicate(boolean possibleDuplicate);
 
   /**
    * Returns whether this event is a possible duplicate.
    * 
    * @return whether this event is a possible duplicate
    */
-  public boolean getPossibleDuplicate();
+  boolean getPossibleDuplicate();
 
   /**
    * Returns the creation timestamp in milliseconds.
@@ -93,5 +93,5 @@ public interface GatewayEvent {
    * 
    * @since GemFire 6.0
    */
-  public long getCreationTime();
+  long getCreationTime();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
index 0799863..000218a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
@@ -47,7 +47,7 @@ public interface ObjectSizer {
    * 
    * @since GemFire 6.5
    */
-  public static final ObjectSizer SIZE_CLASS_ONCE = SizeClassOnceObjectSizer.getInstance();
+  ObjectSizer SIZE_CLASS_ONCE = SizeClassOnceObjectSizer.getInstance();
 
   /**
    * An implementation of {@link ObjectSizer} that calculates an accurate size for each object that
@@ -61,7 +61,7 @@ public interface ObjectSizer {
    * 
    * @since GemFire 6.5
    */
-  public static final ObjectSizer REFLECTION_SIZE = ReflectionObjectSizer.getInstance();
+  ObjectSizer REFLECTION_SIZE = ReflectionObjectSizer.getInstance();
 
 
   /**
@@ -69,8 +69,8 @@ public interface ObjectSizer {
    * 
    * @since GemFire 6.5
    */
-  public static final ObjectSizer DEFAULT = SIZE_CLASS_ONCE;
+  ObjectSizer DEFAULT = SIZE_CLASS_ONCE;
 
-  public int sizeof(Object o);
+  int sizeof(Object o);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
index a4baa64..cfddc07 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
@@ -29,11 +29,11 @@ public interface TimestampedEntryEvent extends org.apache.geode.cache.EntryEvent
   // getOldValue(), getNewValue()
   // getSerializedOldValue(), getSerializedNewValue()
 
-  public int getNewDistributedSystemID();
+  int getNewDistributedSystemID();
 
-  public int getOldDistributedSystemID();
+  int getOldDistributedSystemID();
 
-  public long getNewTimestamp();
+  long getNewTimestamp();
 
-  public long getOldTimestamp();
+  long getOldTimestamp();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
index 2375ae4..07bd462 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java
@@ -32,7 +32,7 @@ public interface GatewayEventFilter extends CacheCallback {
    * @param event
    * @return true if event should be enqueued otherwise return false.
    */
-  public boolean beforeEnqueue(GatewayQueueEvent event);
+  boolean beforeEnqueue(GatewayQueueEvent event);
 
   /**
    * It will be invoked before dispatching event to remote GatewayReceiver <br>
@@ -44,7 +44,7 @@ public interface GatewayEventFilter extends CacheCallback {
    * @param event
    * @return true if event should be dispatched otherwise return false.
    */
-  public boolean beforeTransmit(GatewayQueueEvent event);
+  boolean beforeTransmit(GatewayQueueEvent event);
 
   /**
    * It will be invoked once GatewaySender receives an ack from remote GatewayReceiver <br>
@@ -53,6 +53,6 @@ public interface GatewayEventFilter extends CacheCallback {
    * 
    * @param event
    */
-  public void afterAcknowledgement(GatewayQueueEvent event);
+  void afterAcknowledgement(GatewayQueueEvent event);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
index 2d75326..0caeaee 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java
@@ -32,5 +32,5 @@ public interface GatewayEventSubstitutionFilter<K, V> extends CacheCallback {
    * @return the substitute value to be stored in the <code>GatewayQueueEvent</code> and enqueued in
    *         the <code>RegionQueue</code>
    */
-  public Object getSubstituteValue(EntryEvent<K, V> event);
+  Object getSubstituteValue(EntryEvent<K, V> event);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
index b441fad..559c7e8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java
@@ -31,28 +31,28 @@ public interface GatewayQueueEvent<K, V> {
    * @return the <code>Region</code> associated with this AsyncEvent OR null if <code>Region</code>
    *         not found (e.g. this can happen if it is destroyed).
    */
-  public Region<K, V> getRegion();
+  Region<K, V> getRegion();
 
   /**
    * Returns the <code>Operation</code> that triggered this event.
    * 
    * @return the <code>Operation</code> that triggered this event
    */
-  public Operation getOperation();
+  Operation getOperation();
 
   /**
    * Returns the callbackArgument associated with this event.
    * 
    * @return the callbackArgument associated with this event
    */
-  public Object getCallbackArgument();
+  Object getCallbackArgument();
 
   /**
    * Returns the key associated with this event.
    * 
    * @return the key associated with this event
    */
-  public K getKey();
+  K getKey();
 
   /**
    * Returns the deserialized value associated with this event.
@@ -62,7 +62,7 @@ public interface GatewayQueueEvent<K, V> {
    * @throws IllegalStateException may be thrown if the event's value was stored off-heap and
    *         {@link AsyncEventListener#processEvents(java.util.List)} has already returned.
    */
-  public V getDeserializedValue();
+  V getDeserializedValue();
 
   /**
    * Returns the serialized form of the value associated with this event.
@@ -72,5 +72,5 @@ public interface GatewayQueueEvent<K, V> {
    * @throws IllegalStateException may be thrown if the event's value was stored off-heap and
    *         {@link AsyncEventListener#processEvents(java.util.List)} has already returned.
    */
-  public byte[] getSerializedValue();
+  byte[] getSerializedValue();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
index 8c02af1..ba20d1b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
@@ -30,51 +30,51 @@ import java.util.List;
  */
 public interface GatewayReceiver {
 
-  public static final String RECEIVER_GROUP = "__recv__group";
+  String RECEIVER_GROUP = "__recv__group";
   /**
    * The default maximum amount of time between client pings. This value is used by the
    * <code>ClientHealthMonitor</code> to determine the health of this <code>GatewayReceiver</code>'s
    * clients.
    */
-  public static final int DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS = 60000;
+  int DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS = 60000;
 
   /**
    * Default start value of the port range from which the <code>GatewayReceiver</code>'s port will
    * be chosen
    */
-  public static final int DEFAULT_START_PORT = 5000;
+  int DEFAULT_START_PORT = 5000;
 
   /**
    * Default end value of the port range from which the <code>GatewayReceiver</code>'s port will be
    * chosen
    */
-  public static final int DEFAULT_END_PORT = 5500;
+  int DEFAULT_END_PORT = 5500;
 
   /**
    * The default buffer size for socket buffers for the <code>GatewayReceiver</code>.
    */
-  public static final int DEFAULT_SOCKET_BUFFER_SIZE = 524288;
+  int DEFAULT_SOCKET_BUFFER_SIZE = 524288;
 
   /**
    * The default ip address or host name that the receiver's socket will listen on for client
    * connections. The current default is an empty string.
    */
-  public static final String DEFAULT_BIND_ADDRESS = "";
+  String DEFAULT_BIND_ADDRESS = "";
 
-  public static final String DEFAULT_HOSTNAME_FOR_SENDERS = "";
+  String DEFAULT_HOSTNAME_FOR_SENDERS = "";
 
   /**
    * The default value (true) for manually starting a <code>GatewayReceiver</code>.
    * 
    * @since GemFire 8.1
    */
-  public static final boolean DEFAULT_MANUAL_START = false;
+  boolean DEFAULT_MANUAL_START = false;
 
   /**
    * If the batch already seen by this receiver, arrives again then whether it is to be re-applied
    * or not is decided by this attribute.
    */
-  public static final boolean APPLY_RETRIES =
+  boolean APPLY_RETRIES =
       Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "GatewayReceiver.ApplyRetries");
 
   /**
@@ -82,25 +82,25 @@ public interface GatewayReceiver {
    * 
    * @throws IOException If an error occurs while starting the receiver
    */
-  public void start() throws IOException;
+  void start() throws IOException;
 
   /**
    * Stops this receiver. Note that the <code>GatewayReceiver</code> can be reconfigured and
    * restarted if desired.
    */
-  public void stop();
+  void stop();
 
   /**
    * Returns whether or not this receiver is running
    */
-  public boolean isRunning();
+  boolean isRunning();
 
   /**
    * Returns the list of <code>GatewayTransportFilter</code> added to this GatewayReceiver.
    * 
    * @return the list of <code>GatewayTransportFilter</code> added to this GatewayReceiver.
    */
-  public List<GatewayTransportFilter> getGatewayTransportFilters();
+  List<GatewayTransportFilter> getGatewayTransportFilters();
 
   /**
    * Returns the maximum amount of time between client pings. This value is used by the
@@ -109,24 +109,24 @@ public interface GatewayReceiver {
    * 
    * @return the maximum amount of time between client pings.
    */
-  public int getMaximumTimeBetweenPings();
+  int getMaximumTimeBetweenPings();
 
   /**
    * Returns the port on which this <code>GatewayReceiver</code> listens for clients.
    */
-  public int getPort();
+  int getPort();
 
   /**
    * Returns start value of the port range from which the <code>GatewayReceiver</code>'s port will
    * be chosen.
    */
-  public int getStartPort();
+  int getStartPort();
 
   /**
    * Returns end value of the port range from which the <code>GatewayReceiver</code>'s port will be
    * chosen.
    */
-  public int getEndPort();
+  int getEndPort();
 
   /**
    * Returns a string representing the ip address or host name that server locators will tell
@@ -134,7 +134,7 @@ public interface GatewayReceiver {
    * 
    * @return the ip address or host name to give to clients so they can connect to this receiver
    */
-  public String getHost();
+  String getHost();
 
   /**
    * Returns the configured buffer size of the socket connection for this
@@ -143,7 +143,7 @@ public interface GatewayReceiver {
    * @return the configured buffer size of the socket connection for this
    *         <code>GatewayReceiver</code>
    */
-  public int getSocketBufferSize();
+  int getSocketBufferSize();
 
   /**
    * Returns a string representing the ip address or host name that this server will listen on.
@@ -151,7 +151,7 @@ public interface GatewayReceiver {
    * @return the ip address or host name that this server is to listen on
    * @see #DEFAULT_BIND_ADDRESS
    */
-  public String getBindAddress();
+  String getBindAddress();
 
   /**
    * Returns the manual start boolean property for this GatewayReceiver. Default is true i.e. the
@@ -160,11 +160,11 @@ public interface GatewayReceiver {
    * @return the manual start boolean property for this GatewayReceiver
    * 
    */
-  public boolean isManualStart();
+  boolean isManualStart();
 
   /**
    * Return the underlying Cacheserver
    */
-  public CacheServer getServer();
+  CacheServer getServer();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
index a2d4793..a33bc42 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java
@@ -26,7 +26,7 @@ public interface GatewayReceiverFactory {
    * 
    * @param startPort
    */
-  public GatewayReceiverFactory setStartPort(int startPort);
+  GatewayReceiverFactory setStartPort(int startPort);
 
   /**
    * Sets the end port for the GatewayReceiver. If set the GatewayReceiver will start at one of the
@@ -34,7 +34,7 @@ public interface GatewayReceiverFactory {
    * 
    * @param endPort
    */
-  public GatewayReceiverFactory setEndPort(int endPort);
+  GatewayReceiverFactory setEndPort(int endPort);
 
   /**
    * Sets the buffer size in bytes of the socket connection for this <code>GatewayReceiver</code>.
@@ -42,7 +42,7 @@ public interface GatewayReceiverFactory {
    * 
    * @param socketBufferSize The size in bytes of the socket buffer
    */
-  public GatewayReceiverFactory setSocketBufferSize(int socketBufferSize);
+  GatewayReceiverFactory setSocketBufferSize(int socketBufferSize);
 
   /**
    * Sets the ip address or host name that this <code>GatewayReceiver</code> is to listen on for
@@ -50,28 +50,28 @@ public interface GatewayReceiverFactory {
    * 
    * @param address String representing ip address or host name
    */
-  public GatewayReceiverFactory setBindAddress(String address);
+  GatewayReceiverFactory setBindAddress(String address);
 
   /**
    * Adds a <code>GatewayTransportFilter</code>
    * 
    * @param filter GatewayTransportFilter
    */
-  public GatewayReceiverFactory addGatewayTransportFilter(GatewayTransportFilter filter);
+  GatewayReceiverFactory addGatewayTransportFilter(GatewayTransportFilter filter);
 
   /**
    * Removes a <code>GatewayTransportFilter</code>
    * 
    * @param filter GatewayTransportFilter
    */
-  public GatewayReceiverFactory removeGatewayTransportFilter(GatewayTransportFilter filter);
+  GatewayReceiverFactory removeGatewayTransportFilter(GatewayTransportFilter filter);
 
   /**
    * Sets the maximum amount of time between client pings.The default is 60000 ms.
    * 
    * @param time The maximum amount of time between client pings
    */
-  public GatewayReceiverFactory setMaximumTimeBetweenPings(int time);
+  GatewayReceiverFactory setMaximumTimeBetweenPings(int time);
 
   /**
    * Sets the ip address or host name that server locators will tell GatewaySenders that this
@@ -79,7 +79,7 @@ public interface GatewayReceiverFactory {
    * 
    * @param address String representing ip address or host name
    */
-  public GatewayReceiverFactory setHostnameForSenders(String address);
+  GatewayReceiverFactory setHostnameForSenders(String address);
 
   /**
    * Sets the manual start boolean property for this <code>GatewayReceiver</code>.
@@ -91,13 +91,13 @@ public interface GatewayReceiverFactory {
    * 
    * @param start the manual start boolean property for this <code>GatewayReceiver</code>
    */
-  public GatewayReceiverFactory setManualStart(boolean start);
+  GatewayReceiverFactory setManualStart(boolean start);
 
   /**
    * Creates and returns an instance of <code>GatewayReceiver</code>
    * 
    * @return instance of GatewayReceiver
    */
-  public GatewayReceiver create();
+  GatewayReceiver create();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
index 1dc1fb1..5c37290 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
@@ -28,23 +28,23 @@ public interface GatewaySender {
   /**
    * The default value (false) for manually starting a <code>GatewaySender</code>.
    */
-  public static final boolean DEFAULT_MANUAL_START = false;
+  boolean DEFAULT_MANUAL_START = false;
 
   /**
    * The default value ( true) for writing to disk synchronously in case of persistence.
    */
-  public static final boolean DEFAULT_DISK_SYNCHRONOUS = true;
+  boolean DEFAULT_DISK_SYNCHRONOUS = true;
   /**
    * The default buffer size for socket buffers from a sending GatewaySender to its receiving
    * <code>GatewayReceiver</code>.
    */
-  public static final int DEFAULT_SOCKET_BUFFER_SIZE = 524288;
+  int DEFAULT_SOCKET_BUFFER_SIZE = 524288;
 
   /**
    * The default amount of time in milliseconds that a socket read between a sending
    * <code>Gateway</code> and its receiving <code>Gateway</code> will block.
    */
-  public static final int DEFAULT_SOCKET_READ_TIMEOUT = Integer
+  int DEFAULT_SOCKET_READ_TIMEOUT = Integer
       .getInteger(
           DistributionConfig.GEMFIRE_PREFIX + "cache.gatewaySender.default-socket-read-timeout", 0)
       .intValue();
@@ -52,12 +52,12 @@ public interface GatewaySender {
   /**
    * The default minimum socket read timeout.
    */
-  public static final int MINIMUM_SOCKET_READ_TIMEOUT = 30000;
+  int MINIMUM_SOCKET_READ_TIMEOUT = 30000;
 
   /**
    * Size of the oplog file used for the persistent queue in bytes
    */
-  static public final int QUEUE_OPLOG_SIZE =
+  int QUEUE_OPLOG_SIZE =
       Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "cache.gatewaySender.queueOpLogSize",
           1024 * 1024 * 100).intValue();
 
@@ -65,51 +65,50 @@ public interface GatewaySender {
   /**
    * The default value (false)of whether to persist queue data to disk or not.
    */
-  public static final boolean DEFAULT_PERSISTENCE_ENABLED = false;
+  boolean DEFAULT_PERSISTENCE_ENABLED = false;
 
 
   /**
    * The default batch conflation
    */
-  public static final boolean DEFAULT_BATCH_CONFLATION = false;
+  boolean DEFAULT_BATCH_CONFLATION = false;
 
   /**
    * The default batch size
    */
-  public static final int DEFAULT_BATCH_SIZE = 100;
+  int DEFAULT_BATCH_SIZE = 100;
 
   /**
    * The default batch time interval in milliseconds
    */
-  public static final int DEFAULT_BATCH_TIME_INTERVAL = 1000;
+  int DEFAULT_BATCH_TIME_INTERVAL = 1000;
 
   /**
    * The default alert threshold in milliseconds
    */
-  public static final int DEFAULT_ALERT_THRESHOLD = 0;
+  int DEFAULT_ALERT_THRESHOLD = 0;
 
-  public static final int DEFAULT_PARALLELISM_REPLICATED_REGION =
-      Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX
-          + "cache.gatewaySender.defaultParallelismForReplicatedRegion", 113).intValue();
+  int DEFAULT_PARALLELISM_REPLICATED_REGION = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX
+      + "cache.gatewaySender.defaultParallelismForReplicatedRegion", 113).intValue();
 
-  public static final int DEFAULT_DISTRIBUTED_SYSTEM_ID = -1;
+  int DEFAULT_DISTRIBUTED_SYSTEM_ID = -1;
 
-  public static final int DEFAULT_DISPATCHER_THREADS = 5;
+  int DEFAULT_DISPATCHER_THREADS = 5;
 
-  public static final boolean DEFAULT_FORWARD_EXPIRATION_DESTROY = false;
+  boolean DEFAULT_FORWARD_EXPIRATION_DESTROY = false;
 
-  public static final OrderPolicy DEFAULT_ORDER_POLICY = OrderPolicy.KEY;
+  OrderPolicy DEFAULT_ORDER_POLICY = OrderPolicy.KEY;
   /**
    * The default maximum amount of memory (MB) to allow in the queue before overflowing entries to
    * disk
    */
-  public static final int DEFAULT_MAXIMUM_QUEUE_MEMORY = 100;
+  int DEFAULT_MAXIMUM_QUEUE_MEMORY = 100;
 
   /**
    * Time, in seconds, that we allow before a <code>GatewaySender is considered dead and should be
    * aborted
    */
-  public static final long GATEWAY_SENDER_TIMEOUT = Integer
+  long GATEWAY_SENDER_TIMEOUT = Integer
       .getInteger(DistributionConfig.GEMFIRE_PREFIX + "GATEWAY_SENDER_TIMEOUT", 30).intValue();
 
 
@@ -117,10 +116,10 @@ public interface GatewaySender {
    * The obsolete socket read timeout java system property. Since customers have been given this
    * property, it is used to log a warning.
    */
-  public static final String GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY =
+  String GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY =
       DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.GATEWAY_CONNECTION_READ_TIMEOUT";
 
-  public static final int GATEWAY_CONNECTION_IDLE_TIMEOUT = Integer
+  int GATEWAY_CONNECTION_IDLE_TIMEOUT = Integer
       .getInteger(
           DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.GATEWAY_CONNECTION_IDLE_TIMEOUT", -1)
       .intValue();
@@ -128,24 +127,24 @@ public interface GatewaySender {
   /**
    * If the System property is set, use it. Otherwise, set default to 'true'.
    */
-  public static final boolean REMOVE_FROM_QUEUE_ON_EXCEPTION = (System.getProperty(
+  boolean REMOVE_FROM_QUEUE_ON_EXCEPTION = (System.getProperty(
       DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION") != null)
           ? Boolean.getBoolean(
               DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION")
           : true;
 
-  public static final boolean EARLY_ACK =
+  boolean EARLY_ACK =
       Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.EARLY_ACK");
 
-  public static final boolean DEFAULT_IS_PARALLEL = false;
+  boolean DEFAULT_IS_PARALLEL = false;
 
-  public static final boolean DEFAULT_IS_FOR_INTERNAL_USE = false;
+  boolean DEFAULT_IS_FOR_INTERNAL_USE = false;
 
   /**
    * Retry a connection from sender to receiver after specified time interval (in milliseconds) in
    * case receiver is not up and running. Default is set to 1000 milliseconds i.e. 1 second.
    */
-  public static final int CONNECTION_RETRY_INTERVAL = Integer
+  int CONNECTION_RETRY_INTERVAL = Integer
       .getInteger(DistributionConfig.GEMFIRE_PREFIX + "gateway-connection-retry-interval", 1000)
       .intValue();
 
@@ -154,7 +153,7 @@ public interface GatewaySender {
    * 
    * @since GemFire 6.5.1
    */
-  public enum OrderPolicy {
+  enum OrderPolicy {
     /**
      * Indicates that events will be parallelized based on the event's originating member and thread
      */
@@ -175,7 +174,7 @@ public interface GatewaySender {
    * Starts this GatewaySender. Once the GatewaySender is running, its configuration cannot be
    * changed.
    */
-  public void start();
+  void start();
 
   /**
    * Stops this GatewaySender. The scope of this operation is the VM on which it is invoked. In case
@@ -189,7 +188,7 @@ public interface GatewaySender {
    * 
    * @see GatewaySender#isParallel()
    */
-  public void stop();
+  void stop();
 
   /**
    * Pauses the dispatching of the events from the underlying queue. It should be kept in mind that
@@ -208,63 +207,63 @@ public interface GatewaySender {
    * @see GatewaySender#getBatchSize()
    * @see GatewaySender#resume()
    */
-  public void pause();
+  void pause();
 
   /**
    * Resumes this paused GatewaySender.
    */
-  public void resume();
+  void resume();
 
   /**
    * Rebalances this GatewaySender.
    */
-  public void rebalance();
+  void rebalance();
 
   /**
    * Returns whether or not this GatewaySender is running.
    */
-  public boolean isRunning();
+  boolean isRunning();
 
   /**
    * Returns whether or not this GatewaySender is paused.
    * 
    */
-  public boolean isPaused();
+  boolean isPaused();
 
   /**
    * Adds the provided <code>GatewayEventFilter</code> to this GatewaySender.
    * 
    * @param filter
    */
-  public void addGatewayEventFilter(GatewayEventFilter filter);
+  void addGatewayEventFilter(GatewayEventFilter filter);
 
   /**
    * Removes the provided <code>GatewayEventFilter</code> from this GatewaySender.
    * 
    * @param filter
    */
-  public void removeGatewayEventFilter(GatewayEventFilter filter);
+  void removeGatewayEventFilter(GatewayEventFilter filter);
 
   /**
    * Returns this <code>GatewaySender's</code> <code>GatewayEventSubstitutionFilter</code>.
    * 
    * @return this <code>GatewaySender's</code> <code>GatewayEventSubstitutionFilter</code>
    */
-  public GatewayEventSubstitutionFilter getGatewayEventSubstitutionFilter();
+  GatewayEventSubstitutionFilter getGatewayEventSubstitutionFilter();
 
   /**
    * Returns the id of this GatewaySender.
    * 
    * @return the id of this GatewaySender.
    */
-  public String getId();
+  String getId();
 
   /**
    * Returns the id of the remote <code>GatewayReceiver</code>'s DistributedSystem.
    * 
    * @return the id of the remote <code>GatewayReceiver</code>'s DistributedSystem.
    */
-  public int getRemoteDSId();
+  int getRemoteDSId();
 
   /**
    * Returns the configured buffer size of the socket connection between this GatewaySender and its
@@ -273,7 +272,7 @@ public interface GatewaySender {
    * @return the configured buffer size of the socket connection between this GatewaySender and its
    *         receiving <code>GatewayReceiver</code>
    */
-  public int getSocketBufferSize();
+  int getSocketBufferSize();
 
   /**
    * Returns the amount of time in milliseconds that a socket read between a sending GatewaySender
@@ -283,28 +282,28 @@ public interface GatewaySender {
    * @return the amount of time in milliseconds that a socket read between a sending GatewaySender
    *         and its receiving <code>GatewayReceiver</code> will block
    */
-  public int getSocketReadTimeout();
+  int getSocketReadTimeout();
 
   /**
    * Gets the disk store name for overflow or persistence.
    * 
    * @return disk store name
    */
-  public String getDiskStoreName();
+  String getDiskStoreName();
 
   /**
    * Returns the maximum amount of memory (in MB) for a GatewaySender's queue. The default is 100.
    * 
    * @return maximum amount of memory (in MB) for a GatewaySender's queue
    */
-  public int getMaximumQueueMemory();
+  int getMaximumQueueMemory();
 
   /**
    * Returns the batch size for this GatewaySender. Default batchSize is 100.
    * 
    * @return the batch size for this GatewaySender.
    */
-  public int getBatchSize();
+  int getBatchSize();
 
   /**
    * Returns the batch time interval for this GatewaySender. Default value of batchTimeInterval is
@@ -312,7 +311,7 @@ public interface GatewaySender {
    * 
    * @return the batch time interval for this GatewaySender
    */
-  public int getBatchTimeInterval();
+  int getBatchTimeInterval();
 
   /**
    * Answers whether to enable batch conflation for a GatewaySender 's queue. The default value is
@@ -321,7 +320,7 @@ public interface GatewaySender {
    * @return whether to enable batch conflation for batches sent from a GatewaySender to its
    *         corresponding <code>GatewayReceiver</code>.
    */
-  public boolean isBatchConflationEnabled();
+  boolean isBatchConflationEnabled();
 
   /**
    * Returns true if persistence is enabled for this GatewaySender, otherwise returns false. Default
@@ -329,7 +328,7 @@ public interface GatewaySender {
    * 
    * @return true if persistence is enabled for this GatewaySender
    */
-  public boolean isPersistenceEnabled();
+  boolean isPersistenceEnabled();
 
   /**
    * Returns the alert threshold in milliseconds for entries in a GatewaySender's queue. Default
@@ -338,14 +337,14 @@ public interface GatewaySender {
    * @return the alert threshold for entries in a GatewaySender's queue
    * 
    */
-  public int getAlertThreshold();
+  int getAlertThreshold();
 
   /**
    * Returns the list of <code>GatewayEventFilter</code> added to this GatewaySender.
    * 
    * @return the list of <code>GatewayEventFilter</code> added to this GatewaySender.
    */
-  public List<GatewayEventFilter> getGatewayEventFilters();
+  List<GatewayEventFilter> getGatewayEventFilters();
 
   /**
    * Returns the list of <code>GatewayTransportFilter</code> added to this GatewaySender.
@@ -353,7 +352,7 @@ public interface GatewaySender {
    * @return the list of <code>GatewayTransportFilter</code> added to this GatewaySender.
    */
 
-  public List<GatewayTransportFilter> getGatewayTransportFilters();
+  List<GatewayTransportFilter> getGatewayTransportFilters();
 
   /**
    * Returns isDiskSynchronous boolean property for this GatewaySender. Default value is true.
@@ -361,7 +360,7 @@ public interface GatewaySender {
    * @return isDiskSynchronous boolean property for this GatewaySender
    * 
    */
-  public boolean isDiskSynchronous();
+  boolean isDiskSynchronous();
 
   /**
    * Returns the manual start boolean property for this GatewaySender. Default is false i.e. the
@@ -370,7 +369,7 @@ public interface GatewaySender {
    * @return the manual start boolean property for this GatewaySender
    * 
    */
-  public boolean isManualStart();
+  boolean isManualStart();
 
   /**
    * Returns isParallel boolean property for this GatewaySender.
@@ -378,7 +377,7 @@ public interface GatewaySender {
    * @return isParallel boolean property for this GatewaySender
    * 
    */
-  public boolean isParallel();
+  boolean isParallel();
 
 
   /**
@@ -387,7 +386,7 @@ public interface GatewaySender {
    * 
    * @return the number of dispatcher threads working for this <code>GatewaySender</code>
    */
-  public int getDispatcherThreads();
+  int getDispatcherThreads();
 
   /**
    * Returns the order policy followed while dispatching the events to remote ds. Order policy is
@@ -396,9 +395,9 @@ public interface GatewaySender {
    * @return the order policy followed while dispatching the events to remote ds.
    */
 
-  public OrderPolicy getOrderPolicy();
+  OrderPolicy getOrderPolicy();
 
-  public int getMaxParallelismForReplicatedRegion();
+  int getMaxParallelismForReplicatedRegion();
 
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
index 415ec3a..fb53d12 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySenderFactory.java
@@ -33,21 +33,21 @@ public interface GatewaySenderFactory {
    *
    * @param isParallel boolean to indicate whether distribution policy is parallel
    */
-  public GatewaySenderFactory setParallel(boolean isParallel);
+  GatewaySenderFactory setParallel(boolean isParallel);
 
   /**
    * Adds a <code>GatewayEventFilter</code>
    * 
    * @param filter GatewayEventFilter
    */
-  public GatewaySenderFactory addGatewayEventFilter(GatewayEventFilter filter);
+  GatewaySenderFactory addGatewayEventFilter(GatewayEventFilter filter);
 
   /**
    * Adds a <code>GatewayTransportFilter</code>
    * 
    * @param filter GatewayTransportFilter
    */
-  public GatewaySenderFactory addGatewayTransportFilter(GatewayTransportFilter filter);
+  GatewaySenderFactory addGatewayTransportFilter(GatewayTransportFilter filter);
 
   /**
    * Sets the buffer size in bytes of the socket connection for this <code>GatewaySender</code>. The
@@ -55,7 +55,7 @@ public interface GatewaySenderFactory {
    * 
    * @param size The size in bytes of the socket buffer
    */
-  public GatewaySenderFactory setSocketBufferSize(int size);
+  GatewaySenderFactory setSocketBufferSize(int size);
 
   /**
    * Sets the number of milliseconds to wait for a response from a <code>GatewayReceiver</code>
@@ -65,28 +65,28 @@ public interface GatewaySenderFactory {
    * @param timeout number of milliseconds to wait for a response from a GatewayReceiver
    * @throws IllegalArgumentException if <code>timeout</code> is less than <code>0</code>.
    */
-  public GatewaySenderFactory setSocketReadTimeout(int timeout);
+  GatewaySenderFactory setSocketReadTimeout(int timeout);
 
   /**
    * Sets the disk store name for overflow or persistence
    * 
    * @param name
    */
-  public GatewaySenderFactory setDiskStoreName(String name);
+  GatewaySenderFactory setDiskStoreName(String name);
 
   /**
    * Sets the number of dispatcher thread. Default number of dispatcher threads is 5.
    * 
    * @param numThreads
    */
-  public GatewaySenderFactory setDispatcherThreads(int numThreads);
+  GatewaySenderFactory setDispatcherThreads(int numThreads);
 
   /**
    * Sets <code>OrderPolicy</code> for this GatewaySender. Default order policy is KEY.
    * 
    * @param policy
    */
-  public GatewaySenderFactory setOrderPolicy(OrderPolicy policy);
+  GatewaySenderFactory setOrderPolicy(OrderPolicy policy);
 
   /**
    * Sets the maximum amount of memory (in MB) for a <code>GatewaySender</code>'s queue. Default is
@@ -95,7 +95,7 @@ public interface GatewaySenderFactory {
    * @param maxQueueMemory The maximum amount of memory (in MB) for a <code>GatewaySender</code>'s
    *        queue.
    */
-  public GatewaySenderFactory setMaximumQueueMemory(int maxQueueMemory);
+  GatewaySenderFactory setMaximumQueueMemory(int maxQueueMemory);
 
   /**
    * Sets the batch size to be picked at the time of dispatching from a <code>GatewaySender</code>'s
@@ -104,7 +104,7 @@ public interface GatewaySenderFactory {
    * @param size The size of batches sent from a <code>GatewaySender</code> to its corresponding
    *        <code>GatewayReceiver</code>.
    */
-  public GatewaySenderFactory setBatchSize(int size);
+  GatewaySenderFactory setBatchSize(int size);
 
   /**
    * Sets a time interval in milliseconds to wait to form a batch to be dispatched from a
@@ -114,7 +114,7 @@ public interface GatewaySenderFactory {
    *        batch is sent from a <code>GatewaySender</code> to its corresponding
    *        <code>GatewayReceiver</code>.
    */
-  public GatewaySenderFactory setBatchTimeInterval(int interval);
+  GatewaySenderFactory setBatchTimeInterval(int interval);
 
   /**
    * Sets whether to enable batch conflation for a <code>GatewaySender</code>'s queue. Default is
@@ -123,14 +123,14 @@ public interface GatewaySenderFactory {
    * @param isConflation Whether or not to enable batch conflation for batches sent from a
    *        <code>GatewaySender</code> to its corresponding <code>GatewayReceiver</code>.
    */
-  public GatewaySenderFactory setBatchConflationEnabled(boolean isConflation);
+  GatewaySenderFactory setBatchConflationEnabled(boolean isConflation);
 
   /**
    * Sets whether to enable persistence for a <code>GatewaySender</code>'s queue. Default is false.
    * 
    * @param isPersistence Whether to enable persistence for a <code>GatewaySender</code>'s queue
    */
-  public GatewaySenderFactory setPersistenceEnabled(boolean isPersistence);
+  GatewaySenderFactory setPersistenceEnabled(boolean isPersistence);
 
   /**
    * Sets the alert threshold in milliseconds for entries in a <code>GatewaySender</code> 's queue.
@@ -138,7 +138,7 @@ public interface GatewaySenderFactory {
    * 
    * @param threshold the alert threshold for entries in a <code>GatewaySender</code>'s queue
    */
-  public GatewaySenderFactory setAlertThreshold(int threshold);
+  GatewaySenderFactory setAlertThreshold(int threshold);
 
   /**
    * Sets the manual start boolean property for this <code>GatewaySender</code>. Default is false
@@ -146,7 +146,7 @@ public interface GatewaySenderFactory {
    * 
    * @param start the manual start boolean property for this <code>GatewaySender</code>
    */
-  public GatewaySenderFactory setManualStart(boolean start);
+  GatewaySenderFactory setManualStart(boolean start);
 
   /**
    * Sets whether or not the writing to the disk is synchronous. Default is true.
@@ -154,31 +154,30 @@ public interface GatewaySenderFactory {
    * @param isSynchronous boolean if true indicates synchronous writes
    * 
    */
-  public GatewaySenderFactory setDiskSynchronous(boolean isSynchronous);
+  GatewaySenderFactory setDiskSynchronous(boolean isSynchronous);
 
   /**
    * Removes the provided <code>GatewayEventFilter</code> from this GatewaySender.
    * 
    * @param filter
    */
-  public GatewaySenderFactory removeGatewayEventFilter(GatewayEventFilter filter);
+  GatewaySenderFactory removeGatewayEventFilter(GatewayEventFilter filter);
 
   /**
    * Removes the provided <code>GatewayTransportFilter</code> from this GatewaySender.
    * 
    * @param filter
    */
-  public GatewaySenderFactory removeGatewayTransportFilter(GatewayTransportFilter filter);
+  GatewaySenderFactory removeGatewayTransportFilter(GatewayTransportFilter filter);
 
-  public GatewaySenderFactory setParallelFactorForReplicatedRegion(int parallel);
+  GatewaySenderFactory setParallelFactorForReplicatedRegion(int parallel);
 
   /**
    * Sets the provided <code>GatewayEventSubstitutionFilter</code> in this GatewaySenderFactory.
    * 
    * @param filter The <code>GatewayEventSubstitutionFilter</code>
    */
-  public GatewaySenderFactory setGatewayEventSubstitutionFilter(
-      GatewayEventSubstitutionFilter filter);
+  GatewaySenderFactory setGatewayEventSubstitutionFilter(GatewayEventSubstitutionFilter filter);
 
   /**
    * Creates a <code>GatewaySender</code> to communicate with remote distributed system
@@ -189,6 +188,6 @@ public interface GatewaySenderFactory {
    * @throws IllegalStateException If the GatewaySender creation fails during validation due to
    *         mismatch of attributes of GatewaySender created on other nodes with same id
    */
-  public GatewaySender create(String id, int remoteDSId);
+  GatewaySender create(String id, int remoteDSId);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayTransportFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayTransportFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayTransportFilter.java
index c338204..41ab475 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayTransportFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayTransportFilter.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
 import org.apache.geode.cache.CacheCallback;
 
 public interface GatewayTransportFilter extends CacheCallback {
-  public InputStream getInputStream(InputStream stream);
+  InputStream getInputStream(InputStream stream);
 
-  public OutputStream getOutputStream(OutputStream stream);
+  OutputStream getOutputStream(OutputStream stream);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/compression/Compressor.java b/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
index 114433b..3c5267f 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/Compressor.java
@@ -30,7 +30,7 @@ public interface Compressor {
    * 
    * @throws CompressionException
    */
-  public byte[] compress(byte[] input);
+  byte[] compress(byte[] input);
 
   /**
    * Decompresses a compressed byte array.
@@ -41,5 +41,5 @@ public interface Compressor {
    * 
    * @throws CompressionException
    */
-  public byte[] decompress(byte[] input);
+  byte[] decompress(byte[] input);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
index fc7b7d7..14df618 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ClientSocketFactory.java
@@ -37,5 +37,5 @@ public interface ClientSocketFactory {
    * 
    * @return a <code>Socket</code> for the input address and port
    */
-  public Socket createSocket(InetAddress address, int port) throws IOException;
+  Socket createSocket(InetAddress address, int port) throws IOException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
index f8325df..9110f2c 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/DistributedMember.java
@@ -31,12 +31,12 @@ public interface DistributedMember extends Comparable<DistributedMember> {
    * 
    * @since GemFire 7.0
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the canonical name of the host machine for this member.
    */
-  public String getHost();
+  String getHost();
 
   /**
    * Returns the Roles that this member performs in the system. Note that the result will contain
@@ -44,7 +44,7 @@ public interface DistributedMember extends Comparable<DistributedMember> {
    * 
    * @deprecated Roles is scheduled to be removed
    */
-  public Set<Role> getRoles();
+  Set<Role> getRoles();
 
   /**
    * Returns the groups this member belongs to. A member defines the groups it is in using the
@@ -53,23 +53,23 @@ public interface DistributedMember extends Comparable<DistributedMember> {
    * 
    * @return a list of groups that this member belongs to.
    */
-  public List<String> getGroups();
+  List<String> getGroups();
 
   /**
    * Returns the process id for this member. This may return zero if the platform or configuration
    * does not allow native access to process info.
    */
-  public int getProcessId();
+  int getProcessId();
 
   /**
    * Returns a unique identifier for this member.
    */
-  public String getId();
+  String getId();
 
   /**
    * Returns the durable attributes for this client.
    */
-  public DurableClientAttributes getDurableClientAttributes();
+  DurableClientAttributes getDurableClientAttributes();
 
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/Role.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/Role.java b/geode-core/src/main/java/org/apache/geode/distributed/Role.java
index 66fe930..882b2b8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/Role.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/Role.java
@@ -30,7 +30,7 @@ public interface Role extends Comparable<Role> {
    *
    * @return user-defined string name of this role
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns true if this role is currently present in distributed system. If true, then at least
@@ -39,7 +39,7 @@ public interface Role extends Comparable<Role> {
    *
    * @return true if this role is currently present in distributed system
    */
-  public boolean isPresent();
+  boolean isPresent();
 
   /**
    * Returns the count of members currently filling this role. These members may or may not have a
@@ -47,6 +47,6 @@ public interface Role extends Comparable<Role> {
    *
    * @return number of members in system currently filling this role
    */
-  public int getCount();
+  int getCount();
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
index 26fb8d3..7a1b02b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/CacheTime.java
@@ -23,5 +23,5 @@ public interface CacheTime {
    * 
    * @return the current time
    */
-  public long cacheTimeMillis();
+  long cacheTimeMillis();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
index afc8125..cea77cb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
@@ -36,31 +36,31 @@ import org.apache.geode.internal.Version;
  */
 public interface DM extends ReplySender {
 
-  public boolean shutdownInProgress();
+  boolean shutdownInProgress();
 
   /**
    * Returns the current "cache time" in milliseconds since the epoch. The "cache time" takes into
    * account skew among the local clocks on the various machines involved in the cache.
    */
-  public long cacheTimeMillis();
+  long cacheTimeMillis();
 
   /**
    * Returns the id of this distribution manager.
    */
-  public InternalDistributedMember getDistributionManagerId();
+  InternalDistributedMember getDistributionManagerId();
 
   /**
    * Get a set of all other members (both admin ones and normal).
    * 
    * @since GemFire 5.7
    */
-  public Set getAllOtherMembers();
+  Set getAllOtherMembers();
 
   /**
    * Returns the ID in the membership view that is equal to the argument. If the ID is not in the
    * view, the argument is returned.
    */
-  public InternalDistributedMember getCanonicalId(DistributedMember id);
+  InternalDistributedMember getCanonicalId(DistributedMember id);
 
   /**
    * removes members that have older versions from the given collection, typically a Set from a
@@ -68,7 +68,7 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 8.0
    */
-  public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
+  void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
       Version version);
 
   /**
@@ -77,20 +77,20 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 8.0
    */
-  public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
+  void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
       Version version);
 
   /**
    * Returns an unmodifiable set containing the identities of all of the known distribution
    * managers. As of 7.0 this includes locators since they have a cache.
    */
-  public Set getDistributionManagerIds();
+  Set getDistributionManagerIds();
 
   /**
    * Returns an unmodifiable set containing the identities of all of the known "normal" distribution
    * managers. This does not include locators or admin members.
    */
-  public Set getNormalDistributionManagerIds();
+  Set getNormalDistributionManagerIds();
 
   /**
    * Returns an unmodifiable set containing the identities of all of the known distribution managers
@@ -98,22 +98,22 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 5.7
    */
-  public Set getDistributionManagerIdsIncludingAdmin();
+  Set getDistributionManagerIdsIncludingAdmin();
 
   /**
    * Returns a private-memory list containing getDistributionManagerIds() minus our id.
    */
-  public Set getOtherDistributionManagerIds();
+  Set getOtherDistributionManagerIds();
 
   /**
    * Returns a private-memory list containing getNormalDistributionManagerIds() minus our id.
    */
-  public Set getOtherNormalDistributionManagerIds();
+  Set getOtherNormalDistributionManagerIds();
 
   /**
    * Add a membership listener and return other DistribtionManagerIds as an atomic operation
    */
-  public Set addMembershipListenerAndGetDistributionManagerIds(MembershipListener l);
+  Set addMembershipListenerAndGetDistributionManagerIds(MembershipListener l);
 
   /**
    * Add a membership listener for all members and return other DistribtionManagerIds as an atomic
@@ -121,19 +121,19 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 5.7
    */
-  public Set addAllMembershipListenerAndGetAllIds(MembershipListener l);
+  Set addAllMembershipListenerAndGetAllIds(MembershipListener l);
 
   /**
    * Returns the identity of this <code>DistributionManager</code>
    */
-  public InternalDistributedMember getId();
+  InternalDistributedMember getId();
 
   /**
    * Return true if no other distribution manager was in this group when he joined.
    *
    * @since GemFire 4.0
    */
-  public boolean isAdam();
+  boolean isAdam();
 
   /**
    * Returns the identity of the oldest DM in this group.
@@ -143,19 +143,19 @@ public interface DM extends ReplySender {
    * @return the elder member, possibly null
    * @since GemFire 4.0
    */
-  public InternalDistributedMember getElderId();
+  InternalDistributedMember getElderId();
 
   /**
    * Return true if this is the oldest DM in this group.
    *
    * @since GemFire 5.0
    */
-  public boolean isElder();
+  boolean isElder();
 
   /**
    * Return true if this DM is a loner that is not part of a real distributed system.
    */
-  public boolean isLoner();
+  boolean isLoner();
 
   /**
    * Returns the elder state or null if this DM is not the elder.
@@ -168,14 +168,14 @@ public interface DM extends ReplySender {
    * @throws IllegalStateException if elder try lock fails
    * @since GemFire 4.0
    */
-  public ElderState getElderState(boolean force, boolean useTryLock);
+  ElderState getElderState(boolean force, boolean useTryLock);
 
   /**
    * Returns the id of the underlying distribution channel used for communication.
    *
    * @since GemFire 3.0
    */
-  public long getChannelId();
+  long getChannelId();
 
   /**
    * Adds a message to the outgoing queue. Note that <code>message</code> should not be modified
@@ -186,7 +186,7 @@ public interface DM extends ReplySender {
    * @throws NotSerializableException If <code>message</code> cannot be serialized
    * @see #putOutgoing(DistributionMessage)
    */
-  public Set putOutgoingUserData(DistributionMessage message) throws NotSerializableException;
+  Set putOutgoingUserData(DistributionMessage message) throws NotSerializableException;
 
   /**
    * Sends a message, guaranteed to be serialized
@@ -195,24 +195,24 @@ public interface DM extends ReplySender {
    * @param msg
    * @return recipients who did not receive the message
    */
-  public Set putOutgoing(DistributionMessage msg);
+  Set putOutgoing(DistributionMessage msg);
 
   /**
    * Returns the distributed system to which this distribution manager is connected.
    */
-  public InternalDistributedSystem getSystem();
+  InternalDistributedSystem getSystem();
 
   /**
    * Adds a <code>MembershipListener</code> to this distribution manager.
    */
-  public void addMembershipListener(MembershipListener l);
+  void addMembershipListener(MembershipListener l);
 
   /**
    * Removes a <code>MembershipListener</code> from this distribution manager.
    *
    * @throws IllegalArgumentException <code>l</code> was not registered on this distribution manager
    */
-  public void removeMembershipListener(MembershipListener l);
+  void removeMembershipListener(MembershipListener l);
 
   /**
    * Removes a <code>MembershipListener</code> listening for all members from this distribution
@@ -221,11 +221,11 @@ public interface DM extends ReplySender {
    * @throws IllegalArgumentException <code>l</code> was not registered on this distribution manager
    * @since GemFire 5.7
    */
-  public void removeAllMembershipListener(MembershipListener l);
+  void removeAllMembershipListener(MembershipListener l);
 
-  public void addAdminConsole(InternalDistributedMember id);
+  void addAdminConsole(InternalDistributedMember id);
 
-  public DMStats getStats();
+  DMStats getStats();
 
   /**
    * Used to get the DistributionConfig so that Connection can figure out if it is configured for
@@ -233,7 +233,7 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 4.2.1
    */
-  public DistributionConfig getConfig();
+  DistributionConfig getConfig();
 
   /**
    * Makes note of a distribution manager that has shut down. Invokes the appropriate listeners.
@@ -242,28 +242,27 @@ public interface DM extends ReplySender {
    *
    * @see ShutdownMessage#process
    */
-  public void handleManagerDeparture(InternalDistributedMember theId, boolean crashed,
-      String reason);
+  void handleManagerDeparture(InternalDistributedMember theId, boolean crashed, String reason);
 
   /**
    * getThreadPool gets this distribution manager's message-processing thread pool
    */
-  public ExecutorService getThreadPool();
+  ExecutorService getThreadPool();
 
   /**
    * Return the high-priority message-processing executor
    */
-  public ExecutorService getHighPriorityThreadPool();
+  ExecutorService getHighPriorityThreadPool();
 
   /**
    * Return the waiting message-processing executor
    */
-  public ExecutorService getWaitingThreadPool();
+  ExecutorService getWaitingThreadPool();
 
   /**
    * Return the special waiting message-processing executor
    */
-  public ExecutorService getPrMetaDataCleanupThreadPool();
+  ExecutorService getPrMetaDataCleanupThreadPool();
 
   /**
    * gets this distribution manager's message-processing executor for ordered (i.e. serialized)
@@ -271,13 +270,13 @@ public interface DM extends ReplySender {
    */
   // public Executor getSerialExecutor();
 
-  public void close();
+  void close();
 
   /**
    * Returns the ordered list of current DistributionManagers in oldest-to-youngest order. Added for
    * DLockGrantor
    */
-  public List<InternalDistributedMember> getViewMembers();
+  List<InternalDistributedMember> getViewMembers();
 
   /**
    * Returns the oldest member in the given set of distribution managers. The current implementation
@@ -287,27 +286,27 @@ public interface DM extends ReplySender {
    * @throws NoSuchElementException when none of the given members is actually a member of the
    *         distributed system.
    */
-  public DistributedMember getOldestMember(Collection members) throws NoSuchElementException;
+  DistributedMember getOldestMember(Collection members) throws NoSuchElementException;
 
   /**
    * @return Set of Admin VM nodes
    */
-  public Set getAdminMemberSet();
+  Set getAdminMemberSet();
 
   /** Throws ShutdownException if closeInProgress returns true. */
-  public void throwIfDistributionStopped();
+  void throwIfDistributionStopped();
 
   /** Returns count of members filling the specified role */
-  public int getRoleCount(Role role);
+  int getRoleCount(Role role);
 
   /** Returns true if at least one member is filling the specified role */
-  public boolean isRolePresent(Role role);
+  boolean isRolePresent(Role role);
 
   /** Returns a set of all roles currently in the distributed system. */
-  public Set getAllRoles();
+  Set getAllRoles();
 
   /** Returns true if id is a current member of the distributed system */
-  public boolean isCurrentMember(InternalDistributedMember id);
+  boolean isCurrentMember(InternalDistributedMember id);
 
   /**
    * Remove given member from list of members who are pending a startup reply
@@ -315,37 +314,37 @@ public interface DM extends ReplySender {
    * @param m the member
    * @param departed true if we're removing them due to membership
    */
-  public void removeUnfinishedStartup(InternalDistributedMember m, boolean departed);
+  void removeUnfinishedStartup(InternalDistributedMember m, boolean departed);
 
-  public void setUnfinishedStartups(Collection s);
+  void setUnfinishedStartups(Collection s);
 
   /**
    * Return the CancelCriterion for this DM.
    * 
    * @return CancelCriterion for this DM
    */
-  public CancelCriterion getCancelCriterion();
+  CancelCriterion getCancelCriterion();
 
   /**
    * Return the membership manager for this DM
    * 
    * @return the membership manager
    */
-  public MembershipManager getMembershipManager();
+  MembershipManager getMembershipManager();
 
   /**
    * Set the root cause for DM failure
    * 
    * @param t the underlying failure
    */
-  public void setRootCause(Throwable t);
+  void setRootCause(Throwable t);
 
   /**
    * Return the underlying root cause for DM failure, possibly null
    * 
    * @return the underlying root cause
    */
-  public Throwable getRootCause();
+  Throwable getRootCause();
 
   /**
    * Return all members that are on the the this host
@@ -353,27 +352,25 @@ public interface DM extends ReplySender {
    * @return set of {@link InternalDistributedMember} including this VM
    * @since GemFire 5.9
    */
-  public Set<InternalDistributedMember> getMembersInThisZone();
+  Set<InternalDistributedMember> getMembersInThisZone();
 
   /**
    * Acquire a permit to request a GII from another member
    */
-  public void acquireGIIPermitUninterruptibly();
+  void acquireGIIPermitUninterruptibly();
 
   /**
    * Release a permit to request a GII from another member.
    */
-  public void releaseGIIPermit();
+  void releaseGIIPermit();
 
-  public int getDistributedSystemId();
+  int getDistributedSystemId();
 
-  public boolean enforceUniqueZone();
+  boolean enforceUniqueZone();
 
-  public Set<InternalDistributedMember> getMembersInSameZone(
-      InternalDistributedMember acceptedMember);
+  Set<InternalDistributedMember> getMembersInSameZone(InternalDistributedMember acceptedMember);
 
-  public boolean areInSameZone(InternalDistributedMember member1,
-      InternalDistributedMember member2);
+  boolean areInSameZone(InternalDistributedMember member1, InternalDistributedMember member2);
 
   /**
    * Returns true is the two members are on the same equivalent host machine based on overlapping IP
@@ -382,12 +379,11 @@ public interface DM extends ReplySender {
    * @param member1 First member
    * @param member2 Second member
    */
-  public boolean areOnEquivalentHost(InternalDistributedMember member1,
-      InternalDistributedMember member2);
+  boolean areOnEquivalentHost(InternalDistributedMember member1, InternalDistributedMember member2);
 
-  public Set<InetAddress> getEquivalents(InetAddress in);
+  Set<InetAddress> getEquivalents(InetAddress in);
 
-  public Set<DistributedMember> getGroupMembers(String group);
+  Set<DistributedMember> getGroupMembers(String group);
 
   /**
    * Adds the entry in hostedLocators for a member with one or more hosted locators. The value is a
@@ -401,7 +397,7 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 6.6.3
    */
-  public void addHostedLocators(InternalDistributedMember member, Collection<String> locators,
+  void addHostedLocators(InternalDistributedMember member, Collection<String> locators,
       boolean isSharedConfigurationEnabled);
 
 
@@ -414,7 +410,7 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 6.6.3
    */
-  public Collection<String> getHostedLocators(InternalDistributedMember member);
+  Collection<String> getHostedLocators(InternalDistributedMember member);
 
   /**
    * Gets the map of all members hosting locators. The key is the member, and the value is a
@@ -427,7 +423,7 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 6.6.3
    */
-  public Map<InternalDistributedMember, Collection<String>> getAllHostedLocators();
+  Map<InternalDistributedMember, Collection<String>> getAllHostedLocators();
 
   /**
    * Gets the map of all members hosting locators with shared configuration. The key is the member,
@@ -438,7 +434,7 @@ public interface DM extends ReplySender {
    * 
    * @since GemFire 8.0
    */
-  public Map<InternalDistributedMember, Collection<String>> getAllHostedLocatorsWithSharedConfiguration();
+  Map<InternalDistributedMember, Collection<String>> getAllHostedLocatorsWithSharedConfiguration();
 
   /****
    * Determines if the distributed system has the shared configuration service enabled or not.
@@ -446,20 +442,20 @@ public interface DM extends ReplySender {
    * @return true if the distributed system was started or had a locator with
    *         enable-cluster-configuration = true
    */
-  public boolean isSharedConfigurationServiceEnabledForDS();
+  boolean isSharedConfigurationServiceEnabledForDS();
 
   /**
    * Forces use of UDP for communications in the current thread. UDP is connectionless, so no tcp/ip
    * connections will be created or used for messaging until this setting is released with
    * releaseUDPMessagingForCurrentThread.
    */
-  public void forceUDPMessagingForCurrentThread();
+  void forceUDPMessagingForCurrentThread();
 
   /**
    * Releases use of UDP for all communications in the current thread, as established by
    * forceUDPMessagingForCurrentThread.
    */
-  public void releaseUDPMessagingForCurrentThread();
+  void releaseUDPMessagingForCurrentThread();
 
   int getDMType();
 }


Mime
View raw message