http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java 
b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
index f906108..3fe3e69 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
@@ -32,6 +32,6 @@ public interface SerializationVersions {
    * The method name is formed with the version's product name and its major, 
minor, release and
    * patch numbers.
    */
-  public Version[] getSerializationVersions();
+  Version[] getSerializationVersions();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java 
b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
index 7b0ab43..470a9f3 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
@@ -39,5 +39,5 @@ public interface VersionedDataStream {
    * {@link Version}, then this member cannot do any adjustment to 
serialization and its the remote
    * peer's responsibility to adjust the serialization/deserialization 
according to this peer.
    */
-  public Version getVersion();
+  Version getVersion();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
 
b/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
index 17ebe44..a0f6f45 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
@@ -25,5 +25,5 @@ public interface AdminBridgeServer extends CacheServer {
   /**
    * Returns the VM-unique id of this cache server
    */
-  public int getId();
+  int getId();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
index e628c4a..b07783f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
@@ -25,24 +25,24 @@ import org.apache.geode.internal.logging.InternalLogWriter;
  */
 public interface Alert {
   /** The level at which this alert is issued */
-  public int getLevel();
+  int getLevel();
 
   /** The member of the distributed system that issued the alert */
-  public GemFireVM getGemFireVM();
+  GemFireVM getGemFireVM();
 
   /**
    * The name of the <code>GemFireConnection</code> through which the alert 
was issued.
    */
-  public String getConnectionName();
+  String getConnectionName();
 
   /** The id of the source of the alert (such as a thread in a VM) */
-  public String getSourceId();
+  String getSourceId();
 
   /** The alert's message */
-  public String getMessage();
+  String getMessage();
 
   /** The time at which the alert was issued */
-  public java.util.Date getDate();
+  java.util.Date getDate();
 
   /**
    * Returns a InternalDistributedMember instance representing a member that 
is sending (or has
@@ -53,16 +53,16 @@ public interface Alert {
    *
    * @since GemFire 6.5
    */
-  public InternalDistributedMember getSender();
+  InternalDistributedMember getSender();
 
-  public final static int ALL = InternalLogWriter.ALL_LEVEL;
-  public final static int OFF = InternalLogWriter.NONE_LEVEL;
-  public final static int FINEST = InternalLogWriter.FINEST_LEVEL;
-  public final static int FINER = InternalLogWriter.FINER_LEVEL;
-  public final static int FINE = InternalLogWriter.FINE_LEVEL;
-  public final static int CONFIG = InternalLogWriter.CONFIG_LEVEL;
-  public final static int INFO = InternalLogWriter.INFO_LEVEL;
-  public final static int WARNING = InternalLogWriter.WARNING_LEVEL;
-  public final static int ERROR = InternalLogWriter.ERROR_LEVEL;
-  public final static int SEVERE = InternalLogWriter.SEVERE_LEVEL;
+  int ALL = InternalLogWriter.ALL_LEVEL;
+  int OFF = InternalLogWriter.NONE_LEVEL;
+  int FINEST = InternalLogWriter.FINEST_LEVEL;
+  int FINER = InternalLogWriter.FINER_LEVEL;
+  int FINE = InternalLogWriter.FINE_LEVEL;
+  int CONFIG = InternalLogWriter.CONFIG_LEVEL;
+  int INFO = InternalLogWriter.INFO_LEVEL;
+  int WARNING = InternalLogWriter.WARNING_LEVEL;
+  int ERROR = InternalLogWriter.ERROR_LEVEL;
+  int SEVERE = InternalLogWriter.SEVERE_LEVEL;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
index ee8cd7e..775b566 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
@@ -22,5 +22,5 @@ public interface AlertListener extends 
java.util.EventListener {
   /**
    * Invoked when an <code>Alert</code> is received.
    */
-  public void alert(Alert alert);
+  void alert(Alert alert);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
index bde5a6f..db07189 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
@@ -29,5 +29,5 @@ public interface ApplicationVM extends GemFireVM {
    *
    * @see org.apache.geode.internal.cache.CacheServerLauncher
    */
-  public boolean isDedicatedCacheServer();
+  boolean isDedicatedCacheServer();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
index 5153d94..1288266 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
@@ -24,28 +24,28 @@ public interface CacheInfo {
   /**
    * Returns the name of this cache.
    */
-  public String getName();
+  String getName();
 
   /**
    * Return and Id that can be used to determine what instance of the cache 
the information pertains
    * to.
    */
-  public int getId();
+  int getId();
 
   /**
    * Returns true if the current cache is closed.
    */
-  public boolean isClosed();
+  boolean isClosed();
 
   /**
    * Gets the number of seconds a cache operation will wait to obtain a 
distributed lock lease.
    */
-  public int getLockTimeout();
+  int getLockTimeout();
 
   /**
    * Gets the length, in seconds, of distributed lock leases obtained by this 
cache.
    */
-  public int getLockLease();
+  int getLockLease();
 
   /**
    * Gets the number of seconds a cache {@link 
org.apache.geode.cache.Region#get(Object) get}
@@ -53,42 +53,42 @@ public interface CacheInfo {
    * spent loading the object. When the search times out it causes the get to 
fail by throwing an
    * exception.
    */
-  public int getSearchTimeout();
+  int getSearchTimeout();
 
   /**
    * Returns the number of seconds that have elapsed since this cache was 
created. Returns
    * <code>-1</code> if this cache is closed.
    */
-  public int getUpTime();
+  int getUpTime();
 
   /**
    * Returns the names of all the root regions currently in this cache. 
Returns null if cache is
    * closed.
    */
-  public java.util.Set getRootRegionNames();
+  java.util.Set getRootRegionNames();
 
   /**
    * Returns the statistic resource that contains this cache's performance 
statistics. Returns null
    * if the cache is closed;
    */
-  public StatResource getPerfStats();
+  StatResource getPerfStats();
 
   /**
    * Forces this instance to be closed. Does not actually close the cache.
    */
-  public void setClosed();
+  void setClosed();
 
   /**
    * Returns the ids of all of the bridge servers that are associated with 
this cache.
    *
    * @since GemFire 4.0
    */
-  public int[] getBridgeServerIds();
+  int[] getBridgeServerIds();
 
   /**
    * Returns whether or not this is a cache "server"
    *
    * @since GemFire 4.0
    */
-  public boolean isServer();
+  boolean isServer();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
index 813637e..efba1f7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
@@ -20,17 +20,17 @@ package org.apache.geode.internal.admin;
  * {@linkplain EntrySnapshot entry} in a cache.
  */
 public interface CacheSnapshot extends java.io.Serializable {
-  public Object getName();
+  Object getName();
 
-  public Object getUserAttribute();
+  Object getUserAttribute();
 
-  public long getLastModifiedTime();
+  long getLastModifiedTime();
 
-  public long getLastAccessTime();
+  long getLastAccessTime();
 
-  public long getNumberOfHits();
+  long getNumberOfHits();
 
-  public long getNumberOfMisses();
+  long getNumberOfMisses();
 
-  public float getHitRatio();
+  float getHitRatio();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
index ea0459c..98d5b71 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
@@ -23,17 +23,17 @@ import org.apache.geode.distributed.internal.membership.*;
  * Represents display information about a single distributed lock
  */
 public interface DLockInfo extends Serializable {
-  public String getService();
+  String getService();
 
-  public String getThreadId();
+  String getThreadId();
 
-  public String getLockName();
+  String getLockName();
 
-  public boolean isAcquired();
+  boolean isAcquired();
 
-  public int getRecursionCount();
+  int getRecursionCount();
 
-  public InternalDistributedMember getOwner();
+  InternalDistributedMember getOwner();
 
-  public Date getLeaseExpireTime();
+  Date getLeaseExpireTime();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
index 83b8be5..87ac381 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
@@ -23,5 +23,5 @@ public interface EntrySnapshot extends CacheSnapshot {
   /**
    * Returns the value of the <code>Region</code> entry
    */
-  public Object getValue();
+  Object getValue();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
index e6f27d0..08417d3 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
@@ -23,26 +23,26 @@ public interface EntryValueNode {
   /**
    * Returns true if this node represents a primitive value or String
    */
-  public boolean isPrimitiveOrString();
+  boolean isPrimitiveOrString();
 
   /**
    * Returns the field name, if any
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the class name
    */
-  public String getType();
+  String getType();
 
   /**
    * Returns the fields in physical inspection, or the logical elements in 
logical inspection
    */
-  public EntryValueNode[] getChildren();
+  EntryValueNode[] getChildren();
 
   /**
    * Returns the wrapped primitive value if this is a primitive or the result 
of calling
    * <code>toString()</code> if this is an object.
    */
-  public Object getPrimitiveValue();
+  Object getPrimitiveValue();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
index 7b6747d..fe3cae4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
@@ -39,80 +39,79 @@ public interface GemFireVM {
   /**
    * Constant for lightweight cache inspection. Entry values will be returned 
as Strings.
    */
-  public static final int LIGHTWEIGHT_CACHE_VALUE = 100;
+  int LIGHTWEIGHT_CACHE_VALUE = 100;
 
   /**
    * Constant for logical cache inspection. Entry values will be returned as a 
tree of
    * {@link EntryValueNode}s, with each node containing its logical elements.
    */
-  public static final int LOGICAL_CACHE_VALUE = 200;
+  int LOGICAL_CACHE_VALUE = 200;
 
   /**
    * Constant for physical cache inspection. Entry values will be returned as 
a tree of
    * {@link EntryValueNode}s, with each node containing its declared fields.
    */
-  public static final int PHYSICAL_CACHE_VALUE = 300;
+  int PHYSICAL_CACHE_VALUE = 300;
 
   /**
    * Returns the host the vm is running on.
    */
-  public java.net.InetAddress getHost();
+  java.net.InetAddress getHost();
 
   /**
    * Returns the name of the remote system connection.
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the directory in which the member runs
    *
    * @since GemFire 4.0
    */
-  public java.io.File getWorkingDirectory();
+  java.io.File getWorkingDirectory();
 
   /**
    * Returns the product directory (the value of GEODE_HOME env variable)
    */
-  public java.io.File getGeodeHomeDir();
+  java.io.File getGeodeHomeDir();
 
   /**
    * Returns the time the system was started
    */
-  public java.util.Date getBirthDate();
+  java.util.Date getBirthDate();
 
   /**
    * Returns a String describing the vm's gemfire version info
    * 
    * @since GemFire 3.5
    */
-  public String getVersionInfo();
+  String getVersionInfo();
 
   /**
    * Returns all statistic resources except those involving SharedClass
    */
-  public StatResource[] getStats(String statisticsTypeName);
+  StatResource[] getStats(String statisticsTypeName);
 
   /**
    * Returns all statistic resources
    */
-  public StatResource[] getAllStats();
+  StatResource[] getAllStats();
 
   /**
    * Returns a snapshot of the distributed lock services
    */
-  public DLockInfo[] getDistributedLockInfo();
+  DLockInfo[] getDistributedLockInfo();
 
   /**
    * Adds a {@link StatListener} for the given resource and attribute. Changes 
in value will be
    * streamed back from the vm.
    */
-  public void addStatListener(StatListener observer, StatResource 
observedResource,
-      Stat observedStat);
+  void addStatListener(StatListener observer, StatResource observedResource, 
Stat observedStat);
 
   /**
    * Removes {@link StatListener}
    */
-  public void removeStatListener(StatListener observer);
+  void removeStatListener(StatListener observer);
 
   /**
    * Adds a {@link HealthListener} with the given configuration to the vm. If 
a health listener has
@@ -121,21 +120,21 @@ public interface GemFireVM {
    * @param cfg determines how and when the health will be checked.
    * @since GemFire 3.5
    */
-  public void addHealthListener(HealthListener observer, GemFireHealthConfig 
cfg);
+  void addHealthListener(HealthListener observer, GemFireHealthConfig cfg);
 
   /**
    * Removes an added health listener.
    * 
    * @since GemFire 3.5
    */
-  public void removeHealthListener();
+  void removeHealthListener();
 
   /**
    * Resets the current health status to "good".
    * 
    * @since GemFire 3.5
    */
-  public void resetHealthStatus();
+  void resetHealthStatus();
 
   /**
    * Returns detailed information explaining the current health status. Each 
array element is a
@@ -146,12 +145,12 @@ public interface GemFireVM {
    *
    * @since GemFire 3.5
    */
-  public String[] getHealthDiagnosis(GemFireHealth.Health healthCode);
+  String[] getHealthDiagnosis(GemFireHealth.Health healthCode);
 
   /**
    * Returns the runtime {@link Config} from the vm
    */
-  public Config getConfig();
+  Config getConfig();
 
   /**
    * Returns the runtime {@link org.apache.geode.admin.GemFireMemberStatus} 
from the vm The idea is
@@ -160,7 +159,7 @@ public interface GemFireVM {
    * 
    * @since GemFire 5.7
    */
-  public GemFireMemberStatus getSnapshot();
+  GemFireMemberStatus getSnapshot();
 
   /**
    * Returns the runtime {@link 
org.apache.geode.admin.RegionSubRegionSnapshot} from the vm The idea
@@ -168,40 +167,40 @@ public interface GemFireVM {
    * 
    * @since GemFire 5.7
    */
-  public RegionSubRegionSnapshot getRegionSnapshot();
+  RegionSubRegionSnapshot getRegionSnapshot();
 
   /**
    * Sets the runtime configurable parameters in the gemfire vm's {@link 
Config}
    */
-  public void setConfig(Config cfg);
+  void setConfig(Config cfg);
 
   /**
    * Returns the locally running agent through which we access the remote vm
    */
-  public GfManagerAgent getManagerAgent();
+  GfManagerAgent getManagerAgent();
 
 
   /**
    * Returns the the main log and the tail of the currently active child log, 
or just the tail of
    * the main log if child logging is disabled.
    */
-  public String[] getSystemLogs();
+  String[] getSystemLogs();
 
   /**
    * Sets the additional classpath settings to be used in the remote vm when 
processing admin
    * messages from the console. It can be changed in between messages.
    */
-  public void setInspectionClasspath(String classpath);
+  void setInspectionClasspath(String classpath);
 
   /**
    * Returns classpath info set by {@link GemFireVM#setInspectionClasspath}
    */
-  public String getInspectionClasspath();
+  String getInspectionClasspath();
 
   /**
    * Returns the root cache region or null if the root region hasn't been 
created.
    */
-  public Region[] getRootRegions();
+  Region[] getRootRegions();
 
   /**
    * Return the existing region (or subregion) with the specified path that 
already exists or is
@@ -215,7 +214,7 @@ public interface GemFireVM {
    * @throws IllegalArgumentException if path is null, the empty string, or "/"
    * @since GemFire 3.5
    */
-  public Region getRegion(CacheInfo c, String path);
+  Region getRegion(CacheInfo c, String path);
 
   /**
    * Creates a new root VM region with the given name and attributes in this 
remote VM. Information
@@ -225,8 +224,7 @@ public interface GemFireVM {
    *
    * @since GemFire 4.0
    */
-  public Region createVMRootRegion(CacheInfo c, String name, RegionAttributes 
attrs)
-      throws AdminException;
+  Region createVMRootRegion(CacheInfo c, String name, RegionAttributes attrs) 
throws AdminException;
 
   /**
    * Creates a new root VM region with the given name and attributes in this 
remote VM. Information
@@ -236,7 +234,7 @@ public interface GemFireVM {
    *
    * @since GemFire 4.0
    */
-  public Region createSubregion(CacheInfo c, String parentPath, String name, 
RegionAttributes attrs)
+  Region createSubregion(CacheInfo c, String parentPath, String name, 
RegionAttributes attrs)
       throws AdminException;
 
   /**
@@ -245,13 +243,13 @@ public interface GemFireVM {
    * 
    * @throws IllegalArgumentException if the type is not one of the 
appropriate constants
    */
-  public void setCacheInspectionMode(int mode);
+  void setCacheInspectionMode(int mode);
 
   /**
    * Returns one of these constants {@link #LIGHTWEIGHT_CACHE_VALUE}, {@link 
#LOGICAL_CACHE_VALUE},
    * or {@link #PHYSICAL_CACHE_VALUE}.
    */
-  public int getCacheInspectionMode();
+  int getCacheInspectionMode();
 
   /**
    * Causes a snapshot of the given region to be taken. Results are streamed 
back to any
@@ -259,7 +257,7 @@ public interface GemFireVM {
    * 
    * @param regionName the region to snapshot
    */
-  public void takeRegionSnapshot(String regionName, int snapshotId);
+  void takeRegionSnapshot(String regionName, int snapshotId);
 
   // /**
   // * Clears any results of a snapshot request still waiting to be streamed 
back
@@ -280,52 +278,52 @@ public interface GemFireVM {
    * The distribution ID if this VM. Its used to identify this VM by members 
if this VM's
    * distributed system.
    */
-  public InternalDistributedMember getId();
+  InternalDistributedMember getId();
 
   /**
    * Returns information on this vm's cache. If the vm does not have a cache 
then <code>null</code>
    * is returned.
    */
-  public CacheInfo getCacheInfo();
+  CacheInfo getCacheInfo();
 
   /**
    * Sets the lockTimeout configuration value for the given cache and then 
returns the current info
    * for that cache.
    */
-  public CacheInfo setCacheLockTimeout(CacheInfo c, int v) throws 
AdminException;
+  CacheInfo setCacheLockTimeout(CacheInfo c, int v) throws AdminException;
 
   /**
    * Sets the lockLease configuration value for the given cache and then 
returns the current info
    * for that cache.
    */
-  public CacheInfo setCacheLockLease(CacheInfo c, int v) throws AdminException;
+  CacheInfo setCacheLockLease(CacheInfo c, int v) throws AdminException;
 
   /**
    * Sets the searchTimeout configuration value for the given cache and then 
returns the current
    * info for that cache.
    */
-  public CacheInfo setCacheSearchTimeout(CacheInfo c, int v) throws 
AdminException;
+  CacheInfo setCacheSearchTimeout(CacheInfo c, int v) throws AdminException;
 
   /**
    * Adds a bridge server a cache in this VM
    *
    * @since GemFire 4.0
    */
-  public AdminBridgeServer addCacheServer(CacheInfo cache) throws 
AdminException;
+  AdminBridgeServer addCacheServer(CacheInfo cache) throws AdminException;
 
   /**
    * Returns information about a bridge server that runs in this VM
    *
    * @param id The unique {@link AdminBridgeServer#getId id} of the bridge 
server
    */
-  public AdminBridgeServer getBridgeInfo(CacheInfo cache, int id) throws 
AdminException;
+  AdminBridgeServer getBridgeInfo(CacheInfo cache, int id) throws 
AdminException;
 
   /**
    * Starts a bridge server in this VM
    *
    * @since GemFire 4.0
    */
-  public AdminBridgeServer startBridgeServer(CacheInfo cache, 
AdminBridgeServer bridge)
+  AdminBridgeServer startBridgeServer(CacheInfo cache, AdminBridgeServer 
bridge)
       throws AdminException;
 
   /**
@@ -333,7 +331,7 @@ public interface GemFireVM {
    *
    * @since GemFire 4.0
    */
-  public AdminBridgeServer stopBridgeServer(CacheInfo cache, AdminBridgeServer 
bridge)
+  AdminBridgeServer stopBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
       throws AdminException;
 
   /**
@@ -347,8 +345,7 @@ public interface GemFireVM {
    * 
    * @since GemFire 5.7
    */
-  public void setAlertsManager(StatAlertDefinition[] alertDefs, long 
refreshInterval,
-      boolean setRemotely);
+  void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval, 
boolean setRemotely);
 
   /**
    * This method would be used to set refresh interval for the GemFireVM. This 
method would mostly
@@ -358,7 +355,7 @@ public interface GemFireVM {
    * 
    * @since GemFire 5.7
    */
-  public void setRefreshInterval(long refreshInterval);
+  void setRefreshInterval(long refreshInterval);
 
   /**
    * This method would be used to set Sta Alert Definitions for the GemFireVM. 
This method would
@@ -372,5 +369,5 @@ public interface GemFireVM {
    * 
    * @since GemFire 5.7
    */
-  public void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int 
actionCode);
+  void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
index 242d059..8e55060 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
@@ -31,12 +31,12 @@ public interface GfManagerAgent {
    * 
    * @return true if this call resulted in being disconnected
    */
-  public boolean disconnect();
+  boolean disconnect();
 
   /**
    * Returns whether or not the agent is connected to the distributed system.
    */
-  public boolean isConnected();
+  boolean isConnected();
 
   /**
    * Returns whether or not this manager agent has created admin objects for 
the initial members of
@@ -44,39 +44,39 @@ public interface GfManagerAgent {
    *
    * @since GemFire 4.0
    */
-  public boolean isInitialized();
+  boolean isInitialized();
 
   /**
    * Returns whether or not the agent is listening for messages from the 
distributed system.
    */
-  public boolean isListening();
+  boolean isListening();
 
   /**
    * Returns information about the application VMs that are members of the 
distributed system.
    */
-  public ApplicationVM[] listApplications();
+  ApplicationVM[] listApplications();
 
   /**
    * Returns a list of the other distributed systems that this agent knows 
about. Currently (GemFire
    * 3.0) the agent does not know about any other distributed systems.
    */
-  public GfManagerAgent[] listPeers();
+  GfManagerAgent[] listPeers();
 
   /**
    * Registers a <code>JoinLeaveListener</code>. on this agent that is 
notified when membership in
    * the distributed system changes.
    */
-  public void addJoinLeaveListener(JoinLeaveListener observer);
+  void addJoinLeaveListener(JoinLeaveListener observer);
 
   /**
    * Sets the <code>CacheCollector</code> to which this agent delivers {@link 
CacheSnapshot}s.
    */
-  public void setCacheCollector(CacheCollector collector);
+  void setCacheCollector(CacheCollector collector);
 
   /**
    * Deregisters a <code>JoinLeaveListener</code> from this agent.
    */
-  public void removeJoinLeaveListener(JoinLeaveListener observer);
+  void removeJoinLeaveListener(JoinLeaveListener observer);
 
   // public void addSnapshotListener(SnapshotListener listener);
 
@@ -87,18 +87,18 @@ public interface GfManagerAgent {
    *
    * @since GemFire 3.5
    */
-  public DM getDM();
+  DM getDM();
 
   /**
    * Sets the alert level for this manager agent.
    */
-  public void setAlertLevel(int level);
+  void setAlertLevel(int level);
 
   /**
    * Returns the distributed system that is administered by this agent.
    *
    * @since GemFire 4.0
    */
-  public InternalDistributedSystem getDSConnection();
+  InternalDistributedSystem getDSConnection();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
index 9a8d3f0..6b2daed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
@@ -19,11 +19,11 @@ package org.apache.geode.internal.admin;
  * The root of our little client side administration object model
  */
 public interface GfObject {
-  public int getID();
+  int getID();
 
-  public String getName();
+  String getName();
 
-  public String getType();
+  String getType();
 
-  public String getDescription();
+  String getDescription();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
index 48d5020..d98eb19 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
@@ -32,6 +32,6 @@ public interface HealthListener {
    * @param member The member whose health has changed
    * @param status the new health status
    */
-  public void healthChanged(GemFireVM member, GemFireHealth.Health status);
+  void healthChanged(GemFireVM member, GemFireHealth.Health status);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
 
b/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
index 86ce5c5..a9c91bb 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
@@ -20,9 +20,9 @@ package org.apache.geode.internal.admin;
  * GemFire system
  */
 public interface JoinLeaveListener extends java.util.EventListener {
-  public void nodeJoined(GfManagerAgent source, GemFireVM joined);
+  void nodeJoined(GfManagerAgent source, GemFireVM joined);
 
-  public void nodeLeft(GfManagerAgent source, GemFireVM left);
+  void nodeLeft(GfManagerAgent source, GemFireVM left);
 
-  public void nodeCrashed(GfManagerAgent source, GemFireVM crashed);
+  void nodeCrashed(GfManagerAgent source, GemFireVM crashed);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
index 7200d5e..12da194 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
@@ -25,5 +25,5 @@ public interface RegionSnapshot extends CacheSnapshot {
   /**
    * Returns the attributes of the <code>Region</code>
    */
-  public RegionAttributes getAttributes();
+  RegionAttributes getAttributes();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
index 76ba20e..60a257d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
@@ -30,5 +30,5 @@ public interface SnapshotClient {
    * @param responders All of the members ({@link GemFireVM}s) that have 
responded to the snapshot
    *        request.
    */
-  public void updateSnapshot(CacheSnapshot snapshot, List responders);
+  void updateSnapshot(CacheSnapshot snapshot, List responders);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
index c646907..3253f8b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
@@ -24,17 +24,17 @@ public interface Stat extends GfObject {
   /**
    * @return the value of this stat as a <code>java.lang.Number</code>
    */
-  public Number getValue();
+  Number getValue();
 
   /**
    * @return a display string for the unit of measurement (if any) this stat 
represents
    */
-  public String getUnits();
+  String getUnits();
 
   /**
    * @return true if this stat represents a numeric value which always 
increases
    */
-  public boolean isCounter();
+  boolean isCounter();
 
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
 
b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
index 25fb1c0..0355234 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
@@ -26,11 +26,11 @@ public interface StatAlertDefinition extends 
DataSerializable {
   /**
    * Get the unique ID for AlertDefinition, created using the hashCode of 
StringRepresentation
    */
-  public int getId();
+  int getId();
 
-  public StatisticInfo[] getStatisticInfo();
+  StatisticInfo[] getStatisticInfo();
 
-  public void setStatisticInfo(StatisticInfo[] info);
+  void setStatisticInfo(StatisticInfo[] info);
 
   // public boolean isADecoratorOf(Constant decoType [Function,
   // SystemWideFunction, Gauge, Number]);
@@ -38,25 +38,25 @@ public interface StatAlertDefinition extends 
DataSerializable {
   /**
    * Evaluate using the passed params and not using the getValue
    */
-  public boolean evaluate(Number[] params);
+  boolean evaluate(Number[] params);
 
   /**
    * Evaluate the said AlertDefinition. Value of Statistic would be gotten 
from StatisticInfo
    * Objects
    */
-  public boolean evaluate();
+  boolean evaluate();
 
   /**
    * Evaluate using the passed params and not using the getValue Return a 
StatAlert object if one is
    * raised
    */
-  public StatAlert evaluateAndAlert(Number[] params);
+  StatAlert evaluateAndAlert(Number[] params);
 
   /**
    * Evaluate the said AlertDefinition. Value of Statistic would be gotten 
from StatisticInfo
    * Objects. Return a StatAlert object if one is raised
    */
-  public StatAlert evaluateAndAlert();
+  StatAlert evaluateAndAlert();
 
   /**
    * Get the value of the Statistic this Definition object is created for 
Depending on the Decorator
@@ -64,7 +64,7 @@ public interface StatAlertDefinition extends DataSerializable 
{
    * 
    * @return Number[]
    */
-  public Number[] getValue();
+  Number[] getValue();
 
   /**
    * Get the value of the Statistic this Definition object is created for 
Depending on the Decorator
@@ -72,27 +72,27 @@ public interface StatAlertDefinition extends 
DataSerializable {
    * 
    * @return Number[]
    */
-  public Number[] getValue(Number[] vals);
+  Number[] getValue(Number[] vals);
 
-  public boolean verify(StatisticsFactory factory);
+  boolean verify(StatisticsFactory factory);
 
-  public boolean hasDecorator(String decoratorID);
+  boolean hasDecorator(String decoratorID);
 
-  public StatAlertDefinition getDecorator(String decoratorID);
+  StatAlertDefinition getDecorator(String decoratorID);
 
-  public String getStringRepresentation();
+  String getStringRepresentation();
 
   /**
    * This method returns the name of this stat alert definition.
    * 
    * @return Name of the StatAlertDefinition
    */
-  public String getName();
+  String getName();
 
   /**
    * This method sets the name of this stat alert definition.
    * 
    * @param name name to be set for this StatAlertDefinition.
    */
-  public void setName(String name);
+  void setName(String name);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
index f3033f7..062f1ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
@@ -25,12 +25,12 @@ public interface StatListener {
    * @param value The new value of the statistic
    * @param time The time at which the statistic's value change was detected
    */
-  public void statValueChanged(double value, long time);
+  void statValueChanged(double value, long time);
 
   /**
    * Invoked when the value of a statistic has not changed
    *
    * @param time The time of the latest statistic sample
    */
-  public void statValueUnchanged(long time);
+  void statValueUnchanged(long time);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java 
b/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
index f0050a1..48692f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
@@ -23,22 +23,22 @@ package org.apache.geode.internal.admin;
  */
 public interface StatResource extends GfObject {
 
-  public long getResourceID();
+  long getResourceID();
 
-  public long getResourceUniqueID();
+  long getResourceUniqueID();
 
-  public String getSystemName();
+  String getSystemName();
 
-  public GemFireVM getGemFireVM();
+  GemFireVM getGemFireVM();
 
-  public Stat[] getStats();
+  Stat[] getStats();
 
-  public Stat getStatByName(String name);
+  Stat getStatByName(String name);
 
-  public String getName();
+  String getName();
 
   /**
    * @return the full description of this statistic resource
    */
-  public String getDescription();
+  String getDescription();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
 
b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
index 0aec9ed..2821c11 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
@@ -21,5 +21,5 @@ package org.apache.geode.internal.admin.remote;
  * during their processing.
  */
 public interface Cancellable {
-  public void cancel();
+  void cancel();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
 
b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
index 6b8d172..1850091 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
@@ -30,50 +30,50 @@ public interface StatisticInfo extends DataSerializable {
   /**
    * @return name of statistics
    */
-  public String getStatisticName();
+  String getStatisticName();
 
   /**
    * 
    * @param statisticName Name of statistic
    */
-  public void setStatisticName(String statisticName);
+  void setStatisticName(String statisticName);
 
   /**
    * 
    * @return instance of statistic descriptor
    */
-  public StatisticDescriptor getStatisticDescriptor();
+  StatisticDescriptor getStatisticDescriptor();
 
   /**
    * @return text id of the associated {@link Statistics}
    */
-  public String getStatisticsTextId();
+  String getStatisticsTextId();
 
   /**
    * @param statisticsTextId Text id of the associated {@link Statistics}
    */
-  public void setStatisticsTextId(String statisticsTextId);
+  void setStatisticsTextId(String statisticsTextId);
 
   /**
    * @return instance of associated {@link Statistics}
    */
-  public Statistics getStatistics();
+  Statistics getStatistics();
 
   /**
    * 
    * @return associated {@link StatisticsType}
    */
-  public String getStatisticsTypeName();
+  String getStatisticsTypeName();
 
   /**
    * 
    * @param statisticsType Associated {@link StatisticsType}
    */
-  public void setStatisticsTypeName(String statisticsType);
+  void setStatisticsTypeName(String statisticsType);
 
   /**
    * 
    * @return value of statistic
    */
-  public Number getValue();
+  Number getValue();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index a1b4a9d..fcb26ea 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -3861,23 +3861,23 @@ public abstract class AbstractRegionMap implements 
RegionMap {
   }
 
   public interface ARMLockTestHook {
-    public void beforeBulkLock(LocalRegion region);
+    void beforeBulkLock(LocalRegion region);
 
-    public void afterBulkLock(LocalRegion region);
+    void afterBulkLock(LocalRegion region);
 
-    public void beforeBulkRelease(LocalRegion region);
+    void beforeBulkRelease(LocalRegion region);
 
-    public void afterBulkRelease(LocalRegion region);
+    void afterBulkRelease(LocalRegion region);
 
-    public void beforeLock(LocalRegion region, CacheEvent event);
+    void beforeLock(LocalRegion region, CacheEvent event);
 
-    public void afterLock(LocalRegion region, CacheEvent event);
+    void afterLock(LocalRegion region, CacheEvent event);
 
-    public void beforeRelease(LocalRegion region, CacheEvent event);
+    void beforeRelease(LocalRegion region, CacheEvent event);
 
-    public void afterRelease(LocalRegion region, CacheEvent event);
+    void afterRelease(LocalRegion region, CacheEvent event);
 
-    public void beforeStateFlushWait();
+    void beforeStateFlushWait();
   }
 
   private ARMLockTestHook armLockTestHook;

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
index d933019..230c0aa 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
@@ -32,21 +32,21 @@ public interface CacheDistributionAdvisee extends 
DistributionAdvisee {
    * 
    * @return the <code>CacheDistributionAdvisor</code>
    */
-  public CacheDistributionAdvisor getCacheDistributionAdvisor();
+  CacheDistributionAdvisor getCacheDistributionAdvisor();
 
   /**
    * Returns the <code>Cache</code> associated with this cache object.
    * 
    * @return the Cache
    */
-  public InternalCache getCache();
+  InternalCache getCache();
 
   /**
    * Returns the <code>RegionAttributes</code> associated with this advisee.
    * 
    * @return the <code>RegionAttributes</code> of this advisee
    */
-  public RegionAttributes getAttributes();
+  RegionAttributes getAttributes();
 
   /**
    * notifies the advisee that a new remote member has registered a profile 
showing that it is now
@@ -54,12 +54,12 @@ public interface CacheDistributionAdvisee extends 
DistributionAdvisee {
    * 
    * @param profile the remote member's profile
    */
-  public void remoteRegionInitialized(CacheProfile profile);
+  void remoteRegionInitialized(CacheProfile profile);
 
   /**
    * Allow this advisee to know the CreateRegionReplyProcessor that is 
creating it.
-   * 
+   *
    * @param processor the CreateRegionReplyProcessor that is creating the 
advisee
    */
-  default public void 
registerCreateRegionReplyProcessor(CreateRegionReplyProcessor processor) {}
+  default void registerCreateRegionReplyProcessor(CreateRegionReplyProcessor 
processor) {}
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
index bd04722..849b515 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
@@ -53,19 +53,19 @@ public interface CacheObserver {
    * ByteBuffer to the pool.
    * 
    */
-  public void afterWritingBytes();
+  void afterWritingBytes();
 
   /**
    * 
    * Compacting is about to compact
    */
-  public void beforeGoingToCompact();
+  void beforeGoingToCompact();
 
   /**
    * Just finished Compacting
    * 
    */
-  public void afterHavingCompacted();
+  void afterHavingCompacted();
 
   /**
    * Callback just after calculating the conflated byte buffer. This function 
can get called only in
@@ -74,7 +74,7 @@ public interface CacheObserver {
    * @param origBB Original ByteBuffer object for the operation without 
considering conflation
    * @param conflatedBB Resultant ByteBuffer object after conflation
    */
-  public void afterConflation(ByteBuffer origBB, ByteBuffer conflatedBB);
+  void afterConflation(ByteBuffer origBB, ByteBuffer conflatedBB);
 
   /**
    * Callback just after setting oplog offset . The Oplog Offset will be set 
to non negative number
@@ -87,7 +87,7 @@ public interface CacheObserver {
    *        in the Oplog for the operation & -1 for asynch mode of operation
    * 
    */
-  public void afterSettingOplogOffSet(long offset);
+  void afterSettingOplogOffSet(long offset);
 
   /**
    * Callback given by the thread performing the operation which causes the 
switching of the Oplog.
@@ -95,7 +95,7 @@ public interface CacheObserver {
    * function will get called before the compacter thread gets notified
    * 
    */
-  public void beforeSwitchingOplog();
+  void beforeSwitchingOplog();
 
   /**
    * Callback given by the thread performing the operation which causes the 
switching of the Oplog.
@@ -105,12 +105,12 @@ public interface CacheObserver {
    * 
    * 
    */
-  public void afterSwitchingOplog();
+  void afterSwitchingOplog();
 
   /**
    * Callback given by the thread which creates krfs.
    */
-  public void afterKrfCreated();
+  void afterKrfCreated();
 
   /**
    * Callback given immediately before any thread invokes 
ComplexDiskRegion.OplogCompactor's
@@ -118,7 +118,7 @@ public interface CacheObserver {
    * region.
    * 
    */
-  public void beforeStoppingCompactor();
+  void beforeStoppingCompactor();
 
   /**
    * Callback given immediately after any thread invokes 
ComplexDiskRegion.OplogCompactor's
@@ -126,54 +126,54 @@ public interface CacheObserver {
    * region.
    * 
    */
-  public void afterStoppingCompactor();
+  void afterStoppingCompactor();
 
   /**
    * Callback given immediately after the ComplexDiskRegion.OplogCompactor's 
stopCompactor method
    * signals the compactor to stop.
    * 
    */
-  public void afterSignallingCompactor();
+  void afterSignallingCompactor();
 
   /**
    * Called when GII begins
    */
-  public void afterMarkingGIIStarted();
+  void afterMarkingGIIStarted();
 
   /**
    * Called when GII ends
    */
-  public void afterMarkingGIICompleted();
+  void afterMarkingGIICompleted();
 
   /**
    * Called after the Oplog.WriterThread (asynch writer thread) swaps the 
pendingFlushMap and
    * pendingWriteMap for flushing.
    */
-  public void afterSwitchingWriteAndFlushMaps();
+  void afterSwitchingWriteAndFlushMaps();
 
   /**
    * Invoked just before setting the LBHTree reference in the thread local.
    */
-  public void beforeSettingDiskRef();
+  void beforeSettingDiskRef();
 
   /**
    * Invoked just after setting the LBHTree reference in the thread local.
    */
-  public void afterSettingDiskRef();
+  void afterSettingDiskRef();
 
   /**
    * Invoked by the compactor thread just before deleting a compacted oplog
    * 
    * @param compactedOplog
    */
-  public void beforeDeletingCompactedOplog(Oplog compactedOplog);
+  void beforeDeletingCompactedOplog(Oplog compactedOplog);
 
   /**
    * Invoked just before deleting an empty oplog
    * 
    * @param emptyOplog
    */
-  public void beforeDeletingEmptyOplog(Oplog emptyOplog);
+  void beforeDeletingEmptyOplog(Oplog emptyOplog);
 
   /**
    * Invoked just before ShutdownAll operation

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
index 00d07a0..0aeae13 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
@@ -30,17 +30,17 @@ public interface CacheService {
    * Services are initialized in random order, fairly early on in cache 
initialization. In
    * particular, the cache.xml has not yet been parsed.
    */
-  public void init(Cache cache);
+  void init(Cache cache);
 
   /**
    * Return the class or interface used to look up this service.
    */
-  public Class<? extends CacheService> getInterface();
+  Class<? extends CacheService> getInterface();
 
   /**
    * Returns the MBean associated with this server
    * 
    * @return the MBean associated with this server
    */
-  public CacheServiceMBeanBase getMBean();
+  CacheServiceMBeanBase getMBean();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
index 6ba8c5a..2a95511 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
@@ -36,7 +36,7 @@ public interface CachedDeserializable extends Sizeable {
    * 
    * @return the raw byte[] that represents this cache value
    */
-  public byte[] getSerializedValue();
+  byte[] getSerializedValue();
 
   /**
    * Gets a deserialized value for reading. Differs from getDeserializedValue 
by leaving the value
@@ -44,7 +44,7 @@ public interface CachedDeserializable extends Sizeable {
    * 
    * @since GemFire 4.0
    */
-  public Object getDeserializedForReading();
+  Object getDeserializedForReading();
 
   /**
    * Gets the string form of the cached object. If an exception is thrown 
while converting to a
@@ -53,7 +53,7 @@ public interface CachedDeserializable extends Sizeable {
    * @return a string that represents the cached object.
    * @since GemFire 6.6
    */
-  public String getStringForm();
+  String getStringForm();
 
   /**
    * Always makes a copy of the deserialized object and returns it. Leaves the 
value in a form that
@@ -63,7 +63,7 @@ public interface CachedDeserializable extends Sizeable {
    * @param re the region entry that owns this object or null if no owner
    * @return the deserialized object for this cache value
    */
-  public Object getDeserializedWritableCopy(Region r, RegionEntry re);
+  Object getDeserializedWritableCopy(Region r, RegionEntry re);
 
   /**
    * Returns the deserialized object for this cache value.
@@ -72,13 +72,13 @@ public interface CachedDeserializable extends Sizeable {
    * @param re the region entry that owns this object or null if no owner
    * @return the deserialized object for this cache value
    */
-  public Object getDeserializedValue(Region r, RegionEntry re);
+  Object getDeserializedValue(Region r, RegionEntry re);
 
   /**
    * Return current value regardless of whether it is serialized or 
deserialized: if it was
    * serialized than it is a byte[], otherwise it is not a byte[].
    */
-  public Object getValue();
+  Object getValue();
 
   /**
    * Write out the value contained in this instance to the stream as a byte 
array (versus serialized
@@ -91,7 +91,7 @@ public interface CachedDeserializable extends Sizeable {
    * @param out the stream to write on
    * @throws IOException
    */
-  public void writeValueAsByteArray(DataOutput out) throws IOException;
+  void writeValueAsByteArray(DataOutput out) throws IOException;
 
   /**
    * Sets the serialized value of the Object in the wrapper along with 
appropriate user bit & valid
@@ -100,21 +100,21 @@ public interface CachedDeserializable extends Sizeable {
    * 
    * @param wrapper object of type BytesAndBitsForCompactor
    */
-  public void fillSerializedValue(BytesAndBitsForCompactor wrapper, byte 
userBits);
+  void fillSerializedValue(BytesAndBitsForCompactor wrapper, byte userBits);
 
   /**
    * Return the size of the value, not including the overhead added by this 
wrapper class.
    */
-  public int getValueSizeInBytes();
+  int getValueSizeInBytes();
 
   /**
    * Returns true if the value stored in this memory chunk is a serialized 
object. Returns false if
    * it is a byte array.
    */
-  public boolean isSerialized();
+  boolean isSerialized();
 
   /**
    * Return true if the value uses the java heap; false if not.
    */
-  public boolean usesHeapForStorage();
+  boolean usesHeapForStorage();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
index debb97f..e61d3be 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
@@ -28,69 +28,69 @@ public interface ClientServerObserver {
   /**
    * This callback is called when now primary Ep is identified.
    */
-  public void afterPrimaryIdentificationFromBackup(ServerLocation location);
+  void afterPrimaryIdentificationFromBackup(ServerLocation location);
 
   /**
    * This callback is called just before interest registartion
    */
-  public void beforeInterestRegistration();
+  void beforeInterestRegistration();
 
   /**
    * This callback is called just after interest registartion
    */
-  public void afterInterestRegistration();
+  void afterInterestRegistration();
 
   /**
    * This callback is called just before primary identification
    */
-  public void beforePrimaryIdentificationFromBackup();
+  void beforePrimaryIdentificationFromBackup();
 
   /**
    * This callback is called just before Interest Recovery by DSM thread 
happens
    */
-  public void beforeInterestRecovery();
+  void beforeInterestRecovery();
 
   /**
    * Invoked by CacheClientUpdater just before invoking endpointDied for fail 
over
    * 
    * @param location ServerLocation which has failed
    */
-  public void beforeFailoverByCacheClientUpdater(ServerLocation location);
+  void beforeFailoverByCacheClientUpdater(ServerLocation location);
 
   /**
    * Invoked before sending an instantiator message to server
    * 
    * @param eventId
    */
-  public void beforeSendingToServer(EventID eventId);
+  void beforeSendingToServer(EventID eventId);
 
   /**
    * Invoked after sending an instantiator message to server
    * 
    * @param eventId
    */
-  public void afterReceivingFromServer(EventID eventId);
+  void afterReceivingFromServer(EventID eventId);
 
   /**
    * This callback is called just before sending client ack to the primary 
servrer.
    */
-  public void beforeSendingClientAck();
+  void beforeSendingClientAck();
 
   /**
    * Invoked after Message is created
    *
    * @param msg
    */
-  public void afterMessageCreation(Message msg);
+  void afterMessageCreation(Message msg);
 
   /**
    * Invoked after Queue Destroy Message has been sent
    */
-  public void afterQueueDestroyMessage();
+  void afterQueueDestroyMessage();
 
   /**
    * Invoked after a primary is recovered from a backup or new connection.
    */
-  public void afterPrimaryRecovered(ServerLocation location);
+  void afterPrimaryRecovered(ServerLocation location);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
index 4598bf9..17e3004 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
@@ -26,12 +26,11 @@ import 
org.apache.geode.internal.cache.persistence.DiskRegionView;
  */
 
 public interface CompactableOplog {
-  public void prepareForCompact();
+  void prepareForCompact();
 
-  public int compact(OplogCompactor compactor);
+  int compact(OplogCompactor compactor);
 
-  public BytesAndBits getBytesAndBits(DiskRegionView dr, DiskId id, boolean 
faultIn,
-      boolean bitOnly);
+  BytesAndBits getBytesAndBits(DiskRegionView dr, DiskId id, boolean faultIn, 
boolean bitOnly);
 
-  public BytesAndBits getNoBuffer(DiskRegion dr, DiskId id);
+  BytesAndBits getNoBuffer(DiskRegion dr, DiskId id);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
index f5ae58b..c9323d0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
@@ -31,40 +31,40 @@ public interface Conflatable extends Serializable {
    * 
    * @return whether the object should be conflated
    */
-  public boolean shouldBeConflated();
+  boolean shouldBeConflated();
 
   /**
    * Returns the name of the region for this <code>Conflatable</code>
    * 
    * @return the name of the region for this <code>Conflatable</code>
    */
-  public String getRegionToConflate();
+  String getRegionToConflate();
 
   /**
    * Returns the key for this <code>Conflatable</code>
    * 
    * @return the key for this <code>Conflatable</code>
    */
-  public Object getKeyToConflate();
+  Object getKeyToConflate();
 
   /**
    * Returns the value for this <code>Conflatable</code>
    * 
    * @return the value for this <code>Conflatable</code>
    */
-  public Object getValueToConflate();
+  Object getValueToConflate();
 
   /**
    * Sets the latest value for this <code>Conflatable</code>
    * 
    * @param value The latest value
    */
-  public void setLatestValue(Object value);
+  void setLatestValue(Object value);
 
   /**
    * Return this event's identifier
    * 
    * @return EventID object uniquely identifying the Event
    */
-  public EventID getEventId();
+  EventID getEventId();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/DiskEntry.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskEntry.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskEntry.java
index f78a6c1..88032a1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskEntry.java
@@ -68,52 +68,52 @@ public interface DiskEntry extends RegionEntry {
    * @param context the value's context.
    * @param value an entry value.
    */
-  public void setValueWithContext(RegionEntryContext context, Object value);
+  void setValueWithContext(RegionEntryContext context, Object value);
 
   /**
    * In some cases we need to do something just before we drop the value from 
a DiskEntry that is
    * being moved (i.e. overflowed) to disk.
    */
-  public void handleValueOverflow(RegionEntryContext context);
+  void handleValueOverflow(RegionEntryContext context);
 
   /**
    * Returns true if the DiskEntry value is equal to {@link Token#DESTROYED},
    * {@link Token#REMOVED_PHASE1}, or {@link Token#REMOVED_PHASE2}.
    */
-  public boolean isRemovedFromDisk();
+  boolean isRemovedFromDisk();
 
   /**
    * Returns the id of this {@code DiskEntry}
    */
-  public DiskId getDiskId();
+  DiskId getDiskId();
 
-  public int updateAsyncEntrySize(EnableLRU capacityController);
+  int updateAsyncEntrySize(EnableLRU capacityController);
 
-  public DiskEntry getPrev();
+  DiskEntry getPrev();
 
-  public DiskEntry getNext();
+  DiskEntry getNext();
 
-  public void setPrev(DiskEntry v);
+  void setPrev(DiskEntry v);
 
-  public void setNext(DiskEntry v);
+  void setNext(DiskEntry v);
 
   /**
    * Used as the entry value if it was invalidated.
    */
-  public static final byte[] INVALID_BYTES = new byte[0];
+  byte[] INVALID_BYTES = new byte[0];
   /**
    * Used as the entry value if it was locally invalidated.
    */
-  public static final byte[] LOCAL_INVALID_BYTES = new byte[0];
+  byte[] LOCAL_INVALID_BYTES = new byte[0];
   /**
    * Used as the entry value if it was tombstone.
    */
-  public static final byte[] TOMBSTONE_BYTES = new byte[0];
+  byte[] TOMBSTONE_BYTES = new byte[0];
 
   /**
    * A Helper class for performing functions common to all {@code DiskEntry}s.
    */
-  public static class Helper {
+  class Helper {
     private static final Logger logger = LogService.getLogger();
 
     /**
@@ -468,21 +468,21 @@ public interface DiskEntry extends RegionEntry {
     private static final ValueWrapper TOMBSTONE_VW =
         new ByteArrayValueWrapper(true, TOMBSTONE_BYTES);
 
-    public static interface ValueWrapper {
-      public boolean isSerialized();
+    public interface ValueWrapper {
+      boolean isSerialized();
 
-      public int getLength();
+      int getLength();
 
-      public byte getUserBits();
+      byte getUserBits();
 
-      public void sendTo(ByteBuffer bb, Flushable flushable) throws 
IOException;
+      void sendTo(ByteBuffer bb, Flushable flushable) throws IOException;
 
-      public String getBytesAsString();
+      String getBytesAsString();
     }
-    public static interface Flushable {
-      public void flush() throws IOException;
+    public interface Flushable {
+      void flush() throws IOException;
 
-      public void flush(ByteBuffer bb, ByteBuffer chunkbb) throws IOException;
+      void flush(ByteBuffer bb, ByteBuffer chunkbb) throws IOException;
     }
     public static class ByteArrayValueWrapper implements ValueWrapper {
       public final boolean isSerializedObject;
@@ -1606,7 +1606,7 @@ public interface DiskEntry extends RegionEntry {
    * A marker object for an entry that has been recovered from disk. It is 
handled specially when it
    * is placed in a region.
    */
-  public static class RecoveredEntry {
+  class RecoveredEntry {
 
     /** The disk id of the entry being recovered */
     private final long recoveredKeyId;

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
index bf3a352..2dfd2c7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
@@ -19,6 +19,6 @@ package org.apache.geode.internal.cache;
  */
 public interface DiskStoreTask extends Runnable {
 
-  public void taskCancelled();
+  void taskCancelled();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
index 9550bd0..f0dd64e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
@@ -33,34 +33,33 @@ public interface DistTXCoordinatorInterface extends 
TXStateInterface {
   /**
    * Response for Precommit
    */
-  public boolean getPreCommitResponse() throws 
UnsupportedOperationInTransactionException;
+  boolean getPreCommitResponse() throws 
UnsupportedOperationInTransactionException;
 
   /**
    * Response for Rollback
    */
-  public boolean getRollbackResponse() throws 
UnsupportedOperationInTransactionException;
+  boolean getRollbackResponse() throws 
UnsupportedOperationInTransactionException;
 
-  public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
+  ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
       throws UnsupportedOperationInTransactionException;
 
-  public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
+  void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
       throws UnsupportedOperationInTransactionException;
 
-  public void setPrecommitMessage(DistTXPrecommitMessage precommitMsg, DM dm)
+  void setPrecommitMessage(DistTXPrecommitMessage precommitMsg, DM dm)
       throws UnsupportedOperationInTransactionException;
 
-  public void setCommitMessage(DistTXCommitMessage commitMsg, DM dm)
+  void setCommitMessage(DistTXCommitMessage commitMsg, DM dm)
       throws UnsupportedOperationInTransactionException;
 
-  public void setRollbackMessage(DistTXRollbackMessage rollbackMsg, DM dm)
+  void setRollbackMessage(DistTXRollbackMessage rollbackMsg, DM dm)
       throws UnsupportedOperationInTransactionException;
 
-  public void gatherAffectedRegions(HashSet<LocalRegion> regionSet, boolean 
includePrimaryRegions,
+  void gatherAffectedRegions(HashSet<LocalRegion> regionSet, boolean 
includePrimaryRegions,
       boolean includeRedundantRegions) throws 
UnsupportedOperationInTransactionException;
 
-  public void gatherAffectedRegionsName(TreeSet<String> sortedRegionName,
-      boolean includePrimaryRegions, boolean includeRedundantRegions)
-      throws UnsupportedOperationInTransactionException;
+  void gatherAffectedRegionsName(TreeSet<String> sortedRegionName, boolean 
includePrimaryRegions,
+      boolean includeRedundantRegions) throws 
UnsupportedOperationInTransactionException;
 
-  public void finalCleanup();
+  void finalCleanup();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
index cb3ec00..75e7510 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
@@ -34,7 +34,7 @@ public interface EntriesMap extends ConcurrentMap {
    * Parameter object used to facilitate construction of an EntriesMap. 
Modification of fields after
    * the map is constructed has no effect.
    */
-  static class Attributes {
+  class Attributes {
     /**
      * The initial capacity. The implementation performs internal sizing to 
accommodate this many
      * elements.
@@ -83,14 +83,14 @@ public interface EntriesMap extends ConcurrentMap {
    *
    * @see LocalRegion#getValueInVM
    */
-  public Object getValueInVM(Object key);
+  Object getValueInVM(Object key);
 
   /**
    * Returns the value of an entry as it resides on disk. For testing purposes 
only.
    *
    * @see LocalRegion#getValueOnDisk
    */
-  public Object getValueOnDisk(Object key) throws EntryNotFoundException;
+  Object getValueOnDisk(Object key) throws EntryNotFoundException;
 
   /**
    * Fill in value, and isSerialized fields in this entry object (used for 
getInitialImage and sync
@@ -101,7 +101,7 @@ public interface EntriesMap extends ConcurrentMap {
    * @return false if map entry not found
    * @since GemFire 3.2.1
    */
-  public boolean fillInValue(InitialImageOperation.Entry entry, DM mgr);
+  boolean fillInValue(InitialImageOperation.Entry entry, DM mgr);
 
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 3048e52..15e86d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -512,31 +512,31 @@ public abstract class ExpiryTask extends 
SystemTimer.SystemTimerTask {
     /**
      * Called after entry is schedule for expiration.
      */
-    public void afterSchedule(ExpiryTask et);
+    void afterSchedule(ExpiryTask et);
 
     /**
      * Called after the given expiry task has run. This means that the time it 
was originally
      * scheduled to run has elapsed and the scheduler has run the task. While 
running the task it
      * may decide to expire it or reschedule it.
      */
-    public void afterTaskRan(ExpiryTask et);
+    void afterTaskRan(ExpiryTask et);
 
     /**
      * Called after the given expiry task has been rescheduled. afterTaskRan 
can still be called on
      * the same task. In some cases a task is rescheduled without expiring it. 
In others it is
      * expired and rescheduled.
      */
-    public void afterReschedule(ExpiryTask et);
+    void afterReschedule(ExpiryTask et);
 
     /**
      * Called after the given expiry task has expired.
      */
-    public void afterExpire(ExpiryTask et);
+    void afterExpire(ExpiryTask et);
 
     /**
      * Called when task has been canceled
      */
-    public void afterCancel(ExpiryTask et);
+    void afterCancel(ExpiryTask et);
 
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
index 3228d0f..97b36a7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
@@ -70,14 +70,14 @@ public class ExportDiskRegion extends ValidatingDiskRegion {
     currentOplogEntries.clear();
   }
 
-  public static interface ExportWriter {
+  public interface ExportWriter {
     /**
      * Write a batch of entries to the export system. The value in 
RecoveredEntry is will not be
      * null, so there is no need to fault in the value in the implementor
      * 
      * @throws IOException
      */
-    public void writeBatch(Map<Object, RecoveredEntry> entries) throws 
IOException;
+    void writeBatch(Map<Object, RecoveredEntry> entries) throws IOException;
   }
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
index 9a4eca3..10081a9 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -2209,9 +2209,9 @@ public class FilterProfile implements 
DataSerializableFixedID {
 
   /** Test Hook */
   public interface TestHook {
-    public void await();
+    void await();
 
-    public void release();
+    void release();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/HasCachePerfStats.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/HasCachePerfStats.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/HasCachePerfStats.java
index 0aabb57..3542781 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/HasCachePerfStats.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/HasCachePerfStats.java
@@ -15,5 +15,5 @@
 package org.apache.geode.internal.cache;
 
 public interface HasCachePerfStats {
-  public CachePerfStats getCachePerfStats();
+  CachePerfStats getCachePerfStats();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
index 189c855..f1721de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
@@ -29,69 +29,69 @@ import org.apache.geode.internal.cache.versions.VersionTag;
  */
 public interface ImageState /* extends Lock */ {
 
-  public boolean getRegionInvalidated();
+  boolean getRegionInvalidated();
 
-  public void setRegionInvalidated(boolean b);
+  void setRegionInvalidated(boolean b);
 
-  public void setInRecovery(boolean b);
+  void setInRecovery(boolean b);
 
-  public boolean getInRecovery();
+  boolean getInRecovery();
 
-  public void addDestroyedEntry(Object key);
+  void addDestroyedEntry(Object key);
 
-  public void removeDestroyedEntry(Object key);
+  void removeDestroyedEntry(Object key);
 
-  public boolean hasDestroyedEntry(Object key);
+  boolean hasDestroyedEntry(Object key);
 
-  public java.util.Iterator getDestroyedEntries();
+  java.util.Iterator getDestroyedEntries();
 
   /**
    * returns count of entries that have been destroyed by concurrent 
operations while in token mode
    */
-  public int getDestroyedEntriesCount();
+  int getDestroyedEntriesCount();
 
-  public void setClearRegionFlag(boolean isClearOn, RegionVersionVector rvv);
+  void setClearRegionFlag(boolean isClearOn, RegionVersionVector rvv);
 
-  public boolean getClearRegionFlag();
+  boolean getClearRegionFlag();
 
-  public RegionVersionVector getClearRegionVersionVector();
+  RegionVersionVector getClearRegionVersionVector();
 
-  public boolean wasRegionClearedDuringGII();
+  boolean wasRegionClearedDuringGII();
 
-  public void addVersionTag(Object key, VersionTag<?> tag);
+  void addVersionTag(Object key, VersionTag<?> tag);
 
-  public Iterator<VersionTagEntry> getVersionTags();
+  Iterator<VersionTagEntry> getVersionTags();
 
-  public void addLeftMember(VersionSource<?> mbr);
+  void addLeftMember(VersionSource<?> mbr);
 
-  public Set<VersionSource> getLeftMembers();
+  Set<VersionSource> getLeftMembers();
 
-  public boolean hasLeftMembers();
+  boolean hasLeftMembers();
 
-  public void lockGII();
+  void lockGII();
 
-  public void unlockGII();
+  void unlockGII();
 
-  public void readLockRI();
+  void readLockRI();
 
-  public void readUnlockRI();
+  void readUnlockRI();
 
-  public void writeLockRI();
+  void writeLockRI();
 
-  public void writeUnlockRI();
+  void writeUnlockRI();
 
-  public boolean isReplicate();
+  boolean isReplicate();
 
-  public boolean isClient();
+  boolean isClient();
 
-  public void init();
+  void init();
 
-  public interface VersionTagEntry {
-    public Object getKey();
+  interface VersionTagEntry {
+    Object getKey();
 
-    public VersionSource getMemberID();
+    VersionSource getMemberID();
 
-    public long getRegionVersion();
+    long getRegionVersion();
   }
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
index 23f33cc..73f94ae 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
@@ -18,15 +18,15 @@ import org.apache.geode.cache.CacheCallback;
 
 public interface InterestFilter extends CacheCallback {
 
-  public boolean notifyOnCreate(InterestEvent event);
+  boolean notifyOnCreate(InterestEvent event);
 
-  public boolean notifyOnUpdate(InterestEvent event);
+  boolean notifyOnUpdate(InterestEvent event);
 
-  public boolean notifyOnDestroy(InterestEvent event);
+  boolean notifyOnDestroy(InterestEvent event);
 
-  public boolean notifyOnInvalidate(InterestEvent event);
+  boolean notifyOnInvalidate(InterestEvent event);
 
-  public boolean notifyOnRegister(InterestEvent event);
+  boolean notifyOnRegister(InterestEvent event);
 
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
index 6f921dc..745b9b7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
@@ -29,7 +29,7 @@ public interface InternalCacheEvent extends CacheEvent {
    * 
    * @return true if this event will generate user callbacks
    */
-  public boolean isGenerateCallbacks();
+  boolean isGenerateCallbacks();
 
   /**
    * Answers true if this event is from a client
@@ -37,54 +37,54 @@ public interface InternalCacheEvent extends CacheEvent {
    * @deprecated as of 5.7 use {@link #hasClientOrigin} instead.
    */
   @Deprecated
-  public boolean isBridgeEvent();
+  boolean isBridgeEvent();
 
   /**
    * Answers true if this event is from a client
    * 
    * @since GemFire 5.7
    */
-  public boolean hasClientOrigin();
+  boolean hasClientOrigin();
 
   /**
    * returns the ID associated with this event
    */
-  public EventID getEventId();
+  EventID getEventId();
 
   /**
    * Returns the Operation type.
    * 
    * @return eventType
    */
-  public EnumListenerEvent getEventType();
+  EnumListenerEvent getEventType();
 
   /**
    * sets the event type
    * 
    * @param operation the operation performed by this event
    */
-  public void setEventType(EnumListenerEvent operation);
+  void setEventType(EnumListenerEvent operation);
 
   /**
    * returns the bridge context for the event, if any
    */
-  public ClientProxyMembershipID getContext();
+  ClientProxyMembershipID getContext();
 
   /**
    * set the client routing information for this event
    * 
    * @param info TODO
    */
-  public void setLocalFilterInfo(FilterInfo info);
+  void setLocalFilterInfo(FilterInfo info);
 
   /**
    * get the local routing information for this event
    */
-  public FilterInfo getLocalFilterInfo();
+  FilterInfo getLocalFilterInfo();
 
   /**
    * get the version tag for the event
    */
-  public VersionTag getVersionTag();
+  VersionTag getVersionTag();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
index 4b8d71e..5d7dba5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
@@ -245,11 +245,11 @@ public interface InternalDataView {
       ClientProxyMembershipID requestingClient, EntryEventImpl clientEvent,
       boolean returnTombstones) throws DataLocationException;
 
-  abstract void checkSupportsRegionDestroy() throws 
UnsupportedOperationInTransactionException;
+  void checkSupportsRegionDestroy() throws 
UnsupportedOperationInTransactionException;
 
-  abstract void checkSupportsRegionInvalidate() throws 
UnsupportedOperationInTransactionException;
+  void checkSupportsRegionInvalidate() throws 
UnsupportedOperationInTransactionException;
 
-  abstract void checkSupportsRegionClear() throws 
UnsupportedOperationInTransactionException;
+  void checkSupportsRegionClear() throws 
UnsupportedOperationInTransactionException;
 
   /**
    * @param localRegion
@@ -259,10 +259,10 @@ public interface InternalDataView {
    */
   Set getBucketKeys(LocalRegion localRegion, int bucketId, boolean 
allowTombstones);
 
-  public void postPutAll(DistributedPutAllOperation putallOp, 
VersionedObjectList successfulPuts,
+  void postPutAll(DistributedPutAllOperation putallOp, VersionedObjectList 
successfulPuts,
       LocalRegion region);
 
-  public void postRemoveAll(DistributedRemoveAllOperation op, 
VersionedObjectList successfulOps,
+  void postRemoveAll(DistributedRemoveAllOperation op, VersionedObjectList 
successfulOps,
       LocalRegion region);
 
   Entry accessEntry(KeyInfo keyInfo, LocalRegion localRegion);

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
index a631c7c..90a2630 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
@@ -29,7 +29,7 @@ import org.apache.geode.cache.LoaderHelper;
  * @since GemFire 5.0
  */
 public interface LoaderHelperFactory {
-  public LoaderHelper createLoaderHelper(Object key, Object callbackArgument,
-      boolean netSearchAllowed, boolean netLoadAllowed, 
SearchLoadAndWriteProcessor searcher);
+  LoaderHelper createLoaderHelper(Object key, Object callbackArgument, boolean 
netSearchAllowed,
+      boolean netLoadAllowed, SearchLoadAndWriteProcessor searcher);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
index 34109f4..0b9b12e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
@@ -28,7 +28,7 @@ public interface OffHeapRegionEntry extends RegionEntry, 
Releasable {
    * 
    * @return OFF_HEAP_ADDRESS
    */
-  public long getAddress();
+  long getAddress();
 
   /**
    * OFF_HEAP_FIELD_WRITER
@@ -37,5 +37,5 @@ public interface OffHeapRegionEntry extends RegionEntry, 
Releasable {
    * @param newAddr OFF_HEAP_ADDRESS
    * @return newAddr OFF_HEAP_ADDRESS
    */
-  public boolean setAddress(long expectedAddr, long newAddr);
+  boolean setAddress(long expectedAddr, long newAddr);
 }

Reply via email to