You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/06/15 21:55:11 UTC

[38/40] geode git commit: GEODE-2980: remove unnecessary explicit keywords from interfaces

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
index 8517fd0..5d16624 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
@@ -30,24 +30,24 @@ public interface SystemMemberCache {
   /**
    * The name of the cache.
    */
-  public String getName();
+  String getName();
 
   /**
    * Value that uniquely identifies an instance of a cache for a given member.
    */
-  public int getId();
+  int getId();
 
   /**
    * Indicates if this cache has been closed.
    * 
    * @return true, if this cache is closed; false, otherwise
    */
-  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();
 
   /**
    * Sets the number of seconds a cache operation may wait to obtain a distributed lock lease before
@@ -57,12 +57,12 @@ public interface SystemMemberCache {
    *
    * @see org.apache.geode.cache.Cache#setLockTimeout
    */
-  public void setLockTimeout(int seconds) throws AdminException;
+  void setLockTimeout(int seconds) throws AdminException;
 
   /**
    * Gets the length, in seconds, of distributed lock leases obtained by this cache.
    */
-  public int getLockLease();
+  int getLockLease();
 
   /**
    * Sets the length, in seconds, of distributed lock leases obtained by this cache.
@@ -71,7 +71,7 @@ public interface SystemMemberCache {
    *
    * @see org.apache.geode.cache.Cache#setLockLease
    */
-  public void setLockLease(int seconds) throws AdminException;
+  void setLockLease(int seconds) throws AdminException;
 
   /**
    * Gets the number of seconds a cache {@link org.apache.geode.cache.Region#get(Object) get}
@@ -79,7 +79,7 @@ public interface SystemMemberCache {
    * spent loading the object. When the search times out it causes the get to fail by throwing an
    * exception.
    */
-  public int getSearchTimeout();
+  int getSearchTimeout();
 
   /**
    * Sets the number of seconds a cache get operation can spend searching for a value.
@@ -88,25 +88,25 @@ public interface SystemMemberCache {
    *
    * @see org.apache.geode.cache.Cache#setSearchTimeout
    */
-  public void setSearchTimeout(int seconds) throws AdminException;
+  void setSearchTimeout(int seconds) throws AdminException;
 
   /**
    * Returns number of seconds since this member's cache has been created. Returns <code>-1</code>
    * if this member does not have a cache or its cache has been closed.
    */
-  public int getUpTime();
+  int getUpTime();
 
   /**
    * Returns the names of all the root regions currently in this cache.
    */
-  public java.util.Set getRootRegionNames();
+  java.util.Set getRootRegionNames();
 
   // operations
 
   /**
    * Returns statistics related to this cache's performance.
    */
-  public Statistic[] getStatistics();
+  Statistic[] getStatistics();
 
   /**
    * Return the existing region (or subregion) with the specified path that already exists in the
@@ -117,7 +117,7 @@ public interface SystemMemberCache {
    * @return the Region or null if not found
    * @throws IllegalArgumentException if path is null, the empty string, or "/"
    */
-  public SystemMemberRegion getRegion(String path) throws AdminException;
+  SystemMemberRegion getRegion(String path) throws AdminException;
 
   /**
    * Creates a VM root <code>Region</code> in this cache.
@@ -131,8 +131,7 @@ public interface SystemMemberCache {
    * @deprecated as of GemFire 5.0, use {@link #createRegion} instead
    */
   @Deprecated
-  public SystemMemberRegion createVMRegion(String name, RegionAttributes attrs)
-      throws AdminException;
+  SystemMemberRegion createVMRegion(String name, RegionAttributes attrs) throws AdminException;
 
   /**
    * Creates a root <code>Region</code> in this cache.
@@ -144,13 +143,13 @@ public interface SystemMemberCache {
    *
    * @since GemFire 5.0
    */
-  public SystemMemberRegion createRegion(String name, RegionAttributes attrs) throws AdminException;
+  SystemMemberRegion createRegion(String name, RegionAttributes attrs) throws AdminException;
 
   /**
    * Updates the state of this cache instance. Note that once a cache instance is closed refresh
    * will never change the state of that instance.
    */
-  public void refresh();
+  void refresh();
 
   /**
    * Adds a new, unstarted cache server that will serve the contents of this cache to clients.
@@ -159,7 +158,7 @@ public interface SystemMemberCache {
    *
    * @since GemFire 5.7
    */
-  public SystemMemberCacheServer addCacheServer() throws AdminException;
+  SystemMemberCacheServer addCacheServer() throws AdminException;
 
   /**
    * Returns the cache servers that run in this member's VM. Note that this list will not be updated
@@ -169,7 +168,7 @@ public interface SystemMemberCache {
    *
    * @since GemFire 5.7
    */
-  public SystemMemberCacheServer[] getCacheServers() throws AdminException;
+  SystemMemberCacheServer[] getCacheServers() throws AdminException;
 
   /**
    * Returns whether or not this cache acts as a server. This method will always return
@@ -178,6 +177,6 @@ public interface SystemMemberCache {
    *
    * @since GemFire 4.0
    */
-  public boolean isServer() throws AdminException;
+  boolean isServer() throws AdminException;
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
index d26ee40..bb3d61c 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
@@ -29,5 +29,5 @@ public interface SystemMemberCacheEvent extends SystemMembershipEvent {
   /**
    * Returns the actual operation that caused this event.
    */
-  public Operation getOperation();
+  Operation getOperation();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
index 4008bdf..ebc22b2 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
@@ -38,7 +38,7 @@ public interface SystemMemberCacheListener {
    * @see Cache#createRegion
    * @see Region#createSubregion
    */
-  public void afterRegionCreate(SystemMemberRegionEvent event);
+  void afterRegionCreate(SystemMemberRegionEvent event);
 
   /**
    * Invoked when a region is destroyed or closed in any node of distributed system.
@@ -53,7 +53,7 @@ public interface SystemMemberCacheListener {
    * @see Region#localDestroyRegion()
    * @see Region#destroyRegion()
    */
-  public void afterRegionLoss(SystemMemberRegionEvent event);
+  void afterRegionLoss(SystemMemberRegionEvent event);
 
   /**
    * Invoked after a cache is created in any node of a distributed system. Note that this callback
@@ -62,7 +62,7 @@ public interface SystemMemberCacheListener {
    * @param event describes the member that created the cache.
    * @see CacheFactory#create
    */
-  public void afterCacheCreate(SystemMemberCacheEvent event);
+  void afterCacheCreate(SystemMemberCacheEvent event);
 
   /**
    * Invoked after a cache is closed in any node of a distributed system. This callback is done
@@ -72,5 +72,5 @@ public interface SystemMemberCacheListener {
    * @param event describes the member that closed its cache.
    * @see Cache#close()
    */
-  public void afterCacheClose(SystemMemberCacheEvent event);
+  void afterCacheClose(SystemMemberCacheEvent event);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
index edfa356..68bdf89 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
@@ -32,37 +32,37 @@ public interface SystemMemberCacheServer {
   /**
    * Returns the port on which this cache server listens for clients to connect.
    */
-  public int getPort();
+  int getPort();
 
   /**
    * Sets the port on which this cache server listens for clients to connect.
    *
    * @throws AdminException If this cache server is running
    */
-  public void setPort(int port) throws AdminException;
+  void setPort(int port) throws AdminException;
 
   /**
    * Starts this cache server. Once the server is running, its configuration cannot be changed.
    *
    * @throws AdminException If an error occurs while starting the cache server
    */
-  public void start() throws AdminException;
+  void start() throws AdminException;
 
   /**
    * 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() throws AdminException;
+  void stop() throws AdminException;
 
   /**
    * Updates the information about this cache server.
    */
-  public void refresh();
+  void refresh();
 
   /**
    * Returns a string representing the ip address or host name that this server will listen on.
@@ -70,7 +70,7 @@ public interface SystemMemberCacheServer {
    * @return the ip address or host name that this server is to listen on
    * @since GemFire 5.7
    */
-  public String getBindAddress();
+  String getBindAddress();
 
   /**
    * Sets the ip address or host name that this server is to listen on for client connections.
@@ -90,7 +90,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setBindAddress(String address) throws AdminException;
+  void setBindAddress(String address) throws AdminException;
 
   /**
    * Returns a string representing the ip address or host name that server locators will tell
@@ -99,7 +99,7 @@ public interface SystemMemberCacheServer {
    * @return the ip address or host name to give to clients so they can connect to this server
    * @since GemFire 5.7
    */
-  public String getHostnameForClients();
+  String getHostnameForClients();
 
   /**
    * Sets the ip address or host name that this server is to listen on for client connections.
@@ -116,7 +116,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setHostnameForClients(String name) throws AdminException;
+  void setHostnameForClients(String name) throws AdminException;
 
   /**
    * Sets whether or not this cache server should notify clients based on key subscription.
@@ -134,14 +134,14 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setNotifyBySubscription(boolean b) throws AdminException;
+  void setNotifyBySubscription(boolean b) throws AdminException;
 
   /**
    * Answers whether or not this cache server should notify clients based on key subscription.
    * 
    * @since GemFire 5.7
    */
-  public boolean getNotifyBySubscription();
+  boolean getNotifyBySubscription();
 
   /**
    * Sets the buffer size in bytes of the socket connection for this <code>CacheServer</code>. The
@@ -151,7 +151,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setSocketBufferSize(int socketBufferSize) throws AdminException;
+  void setSocketBufferSize(int socketBufferSize) throws AdminException;
 
   /**
    * Returns the configured buffer size of the socket connection for this <code>CacheServer</code>.
@@ -160,7 +160,7 @@ public interface SystemMemberCacheServer {
    * @return the configured buffer size of the socket connection for this <code>CacheServer</code>
    * @since GemFire 5.7
    */
-  public int getSocketBufferSize();
+  int getSocketBufferSize();
 
   /**
    * Sets the maximum amount of time between client pings. This value is used by the
@@ -171,7 +171,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) throws AdminException;
+  void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) throws AdminException;
 
   /**
    * Returns the maximum amount of time between client pings. This value is used by the
@@ -181,14 +181,14 @@ public interface SystemMemberCacheServer {
    * @return the maximum amount of time between client pings.
    * @since GemFire 5.7
    */
-  public int getMaximumTimeBetweenPings();
+  int getMaximumTimeBetweenPings();
 
   /**
    * Returns the maximum allowed client connections
    * 
    * @since GemFire 5.7
    */
-  public int getMaxConnections();
+  int getMaxConnections();
 
   /**
    * Sets the maxium number of client connections allowed. When the maximum is reached the server
@@ -197,7 +197,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setMaxConnections(int maxCons) throws AdminException;
+  void setMaxConnections(int maxCons) throws AdminException;
 
   /**
    * Returns the maxium number of threads allowed in this server to service client requests. The
@@ -205,7 +205,7 @@ public interface SystemMemberCacheServer {
    * 
    * @since GemFire 5.7
    */
-  public int getMaxThreads();
+  int getMaxThreads();
 
   /**
    * Sets the maxium number of threads allowed in this server to service client requests. The
@@ -214,14 +214,14 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setMaxThreads(int maxThreads) throws AdminException;
+  void setMaxThreads(int maxThreads) throws AdminException;
 
   /**
    * Returns the maximum number of messages that can be enqueued in a client-queue.
    * 
    * @since GemFire 5.7
    */
-  public int getMaximumMessageCount();
+  int getMaximumMessageCount();
 
   /**
    * Sets maximum number of messages that can be enqueued in a client-queue.
@@ -229,14 +229,14 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setMaximumMessageCount(int maxMessageCount) throws AdminException;
+  void setMaximumMessageCount(int maxMessageCount) throws AdminException;
 
   /**
    * Returns the time (in seconds ) after which a message in the client queue will expire.
    * 
    * @since GemFire 5.7
    */
-  public int getMessageTimeToLive();
+  int getMessageTimeToLive();
 
   /**
    * Sets the time (in seconds ) after which a message in the client queue will expire.
@@ -244,7 +244,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setMessageTimeToLive(int messageTimeToLive) throws AdminException;
+  void setMessageTimeToLive(int messageTimeToLive) throws AdminException;
 
   /**
    * Sets the list of server groups this cache server will belong to. By default cache servers
@@ -255,7 +255,7 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if this cache server is running
    * @since GemFire 5.7
    */
-  public void setGroups(String[] groups) throws AdminException;
+  void setGroups(String[] groups) throws AdminException;
 
   /**
    * Returns the list of server groups that this cache server belongs to.
@@ -265,7 +265,7 @@ public interface SystemMemberCacheServer {
    *         to.
    * @since GemFire 5.7
    */
-  public String[] getGroups();
+  String[] getGroups();
 
   /**
    * Get a description of the load probe for this cache server. {@link ServerLoadProbe} for details
@@ -274,7 +274,7 @@ public interface SystemMemberCacheServer {
    * @return the load probe used by this cache server.
    * @since GemFire 5.7
    */
-  public String getLoadProbe();
+  String getLoadProbe();
 
   /**
    * Set the load probe for this cache server. See {@link ServerLoadProbe} for details on how to
@@ -287,14 +287,14 @@ public interface SystemMemberCacheServer {
    * @throws AdminException if the cache server is running
    * @since GemFire 5.7
    */
-  public void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException;
+  void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException;
 
   /**
    * 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
@@ -303,6 +303,6 @@ public interface SystemMemberCacheServer {
    *        than 0.
    * @throws AdminException if the cache server is running
    */
-  public void setLoadPollInterval(long loadPollInterval) throws AdminException;
+  void setLoadPollInterval(long loadPollInterval) throws AdminException;
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
index d26ce39..ab046bc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
@@ -35,48 +35,48 @@ public interface SystemMemberRegion {
    *
    * @see org.apache.geode.cache.Region#getName
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the full path name that identifies this region in its cache.
    *
    * @see org.apache.geode.cache.Region#getFullPath
    */
-  public String getFullPath();
+  String getFullPath();
 
   /**
    * Returns the names of all the subregions of this region.
    */
-  public java.util.Set getSubregionNames();
+  java.util.Set getSubregionNames();
 
   /**
    * Returns the full path of each of the subregions of this region. These paths are suitable for
    * use with {@link SystemMemberCache#getRegion}.
    */
-  public java.util.Set getSubregionFullPaths();
+  java.util.Set getSubregionFullPaths();
 
   /**
    * Returns a description of any user attribute associated with this region. The description
    * includes the classname of the user attribute object as well as its <code>toString</code>
    * representation.
    */
-  public String getUserAttribute();
+  String getUserAttribute();
 
   /**
    * Returns a description of any CacheLoader associated with this region.
    */
-  public String getCacheLoader();
+  String getCacheLoader();
 
   /**
    * Returns a description of any CacheWriter associated with this region.
    */
-  public String getCacheWriter();
+  String getCacheWriter();
 
   /**
    * Returns the <code>EvictionAttributes</code> that configure how entries in the the region are
    * evicted
    */
-  public EvictionAttributes getEvictionAttributes();
+  EvictionAttributes getEvictionAttributes();
 
   /**
    * Returns a description of the CacheListener in this region's attributes. If there is more than 1
@@ -86,7 +86,7 @@ public interface SystemMemberRegion {
    * @deprecated as of 6.0 use getCacheListeners() instead
    */
   @Deprecated
-  public String getCacheListener();
+  String getCacheListener();
 
   /**
    * This method will return an empty array if there are no CacheListeners defined on the region. If
@@ -96,71 +96,71 @@ public interface SystemMemberRegion {
    * @return String[] the region's <code>CacheListeners</code> as a String array
    * @since GemFire 6.0
    */
-  public String[] getCacheListeners();
+  String[] getCacheListeners();
 
   /**
    * Returns the KeyConstraint in this region's attributes.
    */
-  public String getKeyConstraint();
+  String getKeyConstraint();
 
   /**
    * Returns the ValueConstraint in this region's attributes.
    */
-  public String getValueConstraint();
+  String getValueConstraint();
 
   /**
    * Returns the RegionTimeToLive time limit in this region's attributes.
    */
-  public int getRegionTimeToLiveTimeLimit();
+  int getRegionTimeToLiveTimeLimit();
 
   /**
    * Returns the RegionTimeToLive action in this region's attributes.
    */
-  public ExpirationAction getRegionTimeToLiveAction();
+  ExpirationAction getRegionTimeToLiveAction();
 
   /**
    * Returns the EntryTimeToLive time limit in this region's attributes.
    */
-  public int getEntryTimeToLiveTimeLimit();
+  int getEntryTimeToLiveTimeLimit();
 
   /**
    * Returns the EntryTimeToLive action in this region's attributes.
    */
-  public ExpirationAction getEntryTimeToLiveAction();
+  ExpirationAction getEntryTimeToLiveAction();
 
   /**
    * string describing the CustomExpiry for entry-time-to-live
    * 
    * @return the CustomExpiry for entry-time-to-live
    */
-  public String getCustomEntryTimeToLive();
+  String getCustomEntryTimeToLive();
 
   /**
    * Returns the RegionIdleTimeout time limit in this region's attributes.
    */
-  public int getRegionIdleTimeoutTimeLimit();
+  int getRegionIdleTimeoutTimeLimit();
 
   /**
    * Returns the RegionIdleTimeout action in this region's attributes.
    */
-  public ExpirationAction getRegionIdleTimeoutAction();
+  ExpirationAction getRegionIdleTimeoutAction();
 
   /**
    * Returns the EntryIdleTimeout time limit in this region's attributes.
    */
-  public int getEntryIdleTimeoutTimeLimit();
+  int getEntryIdleTimeoutTimeLimit();
 
   /**
    * Returns the EntryIdleTimeout action in this region's attributes.
    */
-  public ExpirationAction getEntryIdleTimeoutAction();
+  ExpirationAction getEntryIdleTimeoutAction();
 
   /**
    * string describing the CustomExpiry for entry-idle-timeout
    * 
    * @return the CustomExpiry for entry-idle-timeout
    */
-  public String getCustomEntryIdleTimeout();
+  String getCustomEntryIdleTimeout();
 
   /**
    * Returns the MirrorType in this region's attributes.
@@ -168,95 +168,95 @@ public interface SystemMemberRegion {
    * @deprecated as of 5.0, you should use getDataPolicy instead
    */
   @Deprecated
-  public MirrorType getMirrorType();
+  MirrorType getMirrorType();
 
   /**
    * Returns the DataPolicy in this region's attributes.
    */
-  public DataPolicy getDataPolicy();
+  DataPolicy getDataPolicy();
 
   /**
    * 
    * /** Returns the Scope in this region's attributes.
    */
-  public Scope getScope();
+  Scope getScope();
 
   /**
    * Returns the InitialCapacity in this region's attributes.
    */
-  public int getInitialCapacity();
+  int getInitialCapacity();
 
   /**
    * Returns the LoadFactor in this region's attributes.
    */
-  public float getLoadFactor();
+  float getLoadFactor();
 
   /**
    * Returns the ConcurrencyLevel in this region's attributes.
    */
-  public int getConcurrencyLevel();
+  int getConcurrencyLevel();
 
   /**
    * Returns whether or not conflicting concurrent operations on this region are prevented
    */
-  public boolean getConcurrencyChecksEnabled();
+  boolean getConcurrencyChecksEnabled();
 
   /**
    * Returns the StatisticsEnabled in this region's attributes.
    */
-  public boolean getStatisticsEnabled();
+  boolean getStatisticsEnabled();
 
   /**
    * Returns whether or not a persistent backup should be made of the region (as opposed to just
    * writing the overflow data to disk).
    */
-  public boolean getPersistBackup();
+  boolean getPersistBackup();
 
   /**
    * Returns the <code>DiskWriteAttributes</code> that configure how the region is written to disk.
    */
-  public DiskWriteAttributes getDiskWriteAttributes();
+  DiskWriteAttributes getDiskWriteAttributes();
 
   /**
    * Returns the directories to which the region's data are written. If multiple directories are
    * used, GemFire will attempt to distribute the data evenly amongst them.
    */
-  public File[] getDiskDirs();
+  File[] getDiskDirs();
 
   /**
    * Returns the number of entries currently in this region.
    */
-  public int getEntryCount();
+  int getEntryCount();
 
   /**
    * Returns the number of subregions currently in this region.
    */
-  public int getSubregionCount();
+  int getSubregionCount();
 
   /**
    * Returns the LastModifiedTime obtained from this region's statistics.
    */
-  public long getLastModifiedTime();
+  long getLastModifiedTime();
 
   /**
    * Returns the LastAccessedTime obtained from this region's statistics.
    */
-  public long getLastAccessedTime();
+  long getLastAccessedTime();
 
   /**
    * Returns the HitCount obtained from this region's statistics.
    */
-  public long getHitCount();
+  long getHitCount();
 
   /**
    * Returns the MissCount obtained from this region's statistics.
    */
-  public long getMissCount();
+  long getMissCount();
 
   /**
    * Returns the HitRatio obtained from this region's statistics.
    */
-  public float getHitRatio();
+  float getHitRatio();
 
   /**
    * Returns whether or not acks are sent after an update is processed.
@@ -266,14 +266,14 @@ public interface SystemMemberRegion {
    *
    * @since GemFire 4.1
    */
-  public boolean getEarlyAck();
+  boolean getEarlyAck();
 
   // operations
   /**
    * Updates the state of this region instance. Note that once a cache instance is closed refresh
    * will never change the state of its regions.
    */
-  public void refresh();
+  void refresh();
 
   /**
    * Creates a subregion of this region.
@@ -285,8 +285,7 @@ public interface SystemMemberRegion {
    *
    * @since GemFire 4.0
    */
-  public SystemMemberRegion createSubregion(String name, RegionAttributes attrs)
-      throws AdminException;
+  SystemMemberRegion createSubregion(String name, RegionAttributes attrs) throws AdminException;
 
   /**
    * Returns the <code>MembershipAttributes</code> that configure required roles for reliable access
@@ -294,21 +293,21 @@ public interface SystemMemberRegion {
    * 
    * @deprecated this API is scheduled to be removed
    */
-  public MembershipAttributes getMembershipAttributes();
+  MembershipAttributes getMembershipAttributes();
 
   /**
    * Returns the <code>SubscriptionAttributes</code> for the region.
    * 
    * @since GemFire 5.0
    */
-  public SubscriptionAttributes getSubscriptionAttributes();
+  SubscriptionAttributes getSubscriptionAttributes();
 
   /**
    * Returns the <code>PartitionAttributes</code> for the region.
    * 
    * @since GemFire 5.7
    */
-  public PartitionAttributes getPartitionAttributes();
+  PartitionAttributes getPartitionAttributes();
 
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
index 27ee8ae..d411dcf 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
@@ -27,5 +27,5 @@ public interface SystemMemberRegionEvent extends SystemMemberCacheEvent {
   /**
    * Returns the full path of the region the event was done on.
    */
-  public String getRegionPath();
+  String getRegionPath();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
index d7850b4..b4a1c83 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
@@ -30,7 +30,7 @@ public interface SystemMembershipEvent {
   /**
    * Returns the distributed member as a String.
    */
-  public String getMemberId();
+  String getMemberId();
 
   /**
    * Returns the {@link DistributedMember} that this event originated in.
@@ -38,5 +38,5 @@ public interface SystemMembershipEvent {
    * @return the member that performed the operation that originated this event.
    * @since GemFire 5.0
    */
-  public DistributedMember getDistributedMember();
+  DistributedMember getDistributedMember();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
index eed5578..6c1ca6f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
@@ -30,13 +30,13 @@ public interface SystemMembershipListener {
   /**
    * Invoked when a member has joined the distributed system
    */
-  public void memberJoined(SystemMembershipEvent event);
+  void memberJoined(SystemMembershipEvent event);
 
   /**
    * Invoked when a member has gracefully left the distributed system. This occurs when the member
    * took action to remove itself from the distributed system.
    */
-  public void memberLeft(SystemMembershipEvent event);
+  void memberLeft(SystemMembershipEvent event);
 
   /**
    * Invoked when a member has unexpectedly left the distributed system. This occurs when a member
@@ -45,7 +45,7 @@ public interface SystemMembershipListener {
    * href=../distributed/DistributedSystem.html#enable-network-partition-detection> network
    * partition detection</a> processing.
    */
-  public void memberCrashed(SystemMembershipEvent event);
+  void memberCrashed(SystemMembershipEvent event);
 
   // /**
   // * Invoked when a member broadcasts an informational message.

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
index 8865429..bc2db68 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
@@ -25,6 +25,6 @@ import org.apache.geode.admin.ConfigurationParameter;
  *
  */
 public interface ConfigurationParameterListener {
-  public void configurationParameterValueChanged(ConfigurationParameter parm);
+  void configurationParameterValueChanged(ConfigurationParameter parm);
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java b/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
index 6211aea..8950b9a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
@@ -27,31 +27,31 @@ import org.apache.geode.admin.ManagedEntityConfig;
 public interface InternalManagedEntity extends ManagedEntity {
 
   /** The state of a managed entity is unknown. */
-  public static final int UNKNOWN = 10;
+  int UNKNOWN = 10;
 
   /** A managed entity is stopped */
-  public static final int STOPPED = 11;
+  int STOPPED = 11;
 
   /** A managed entity is stopping (being stopped) */
-  public static final int STOPPING = 12;
+  int STOPPING = 12;
 
   /** A managed entity is starting */
-  public static final int STARTING = 13;
+  int STARTING = 13;
 
   /** A managed entity is running (is started) */
-  public static final int RUNNING = 14;
+  int RUNNING = 14;
 
   ////////////////////// Instance Methods //////////////////////
 
   /**
    * Returns the <code>ManagedEntityConfig</code> for this <code>ManagedEntity</code>.
    */
-  public ManagedEntityConfig getEntityConfig();
+  ManagedEntityConfig getEntityConfig();
 
   /**
    * Returns a brief description (such as "locator") of this managed entity.
    */
-  public String getEntityType();
+  String getEntityType();
 
   /**
    * Returns the (local) command to execute in order to start this managed entity. The command
@@ -59,29 +59,29 @@ public interface InternalManagedEntity extends ManagedEntity {
    * command-line arguments. It does not take the {@linkplain ManagedEntityConfig#getRemoteCommand
    * remote command} into account.
    */
-  public String getStartCommand();
+  String getStartCommand();
 
   /**
    * Returns the (local) command to execute in order to stop this managed entity.
    */
-  public String getStopCommand();
+  String getStopCommand();
 
   /**
    * Returns the (local) command to execute in order to determine whether or not this managed entity
    * is runing.
    */
-  public String getIsRunningCommand();
+  String getIsRunningCommand();
 
   /**
    * Returns a descriptive, one-word, unique id for a newly-created <code>ManagedEntity</code>. This
    * ensures that we do not have collisions in the ids of entities.
    */
-  public String getNewId();
+  String getNewId();
 
   /**
    * Returns the distributed system to which this managed entity belongs.
    */
-  public AdminDistributedSystem getDistributedSystem();
+  AdminDistributedSystem getDistributedSystem();
 
   /**
    * Sets the state of this managed entity and informs threads that are waiting for a state change.
@@ -91,6 +91,6 @@ public interface InternalManagedEntity extends ManagedEntity {
    *
    * @see #RUNNING
    */
-  public int setState(int state);
+  int setState(int state);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
index 77a3998..e00365c 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
@@ -26,23 +26,23 @@ interface ManagedEntityController {
   /**
    * Starts a managed entity.
    */
-  public void start(final InternalManagedEntity entity);
+  void start(final InternalManagedEntity entity);
 
   /**
    * Stops a managed entity.
    */
-  public void stop(final InternalManagedEntity entity);
+  void stop(final InternalManagedEntity entity);
 
   /**
    * Returns whether or not a managed entity is running
    */
-  public boolean isRunning(InternalManagedEntity entity);
+  boolean isRunning(InternalManagedEntity entity);
 
   /**
    * Returns the contents of a locator's log file. Other APIs are used to get the log file of
    * managed entities that are also system members.
    */
-  public String getLog(DistributionLocatorImpl locator);
+  String getLog(DistributionLocatorImpl locator);
 
   /**
    * Returns the full path to the executable in <code>$GEMFIRE/bin</code> taking into account the
@@ -56,11 +56,11 @@ interface ManagedEntityController {
    *
    * @param executable The name of the executable that resides in <code>$GEMFIRE/bin</code>.
    */
-  public String getProductExecutable(InternalManagedEntity entity, String executable);
+  String getProductExecutable(InternalManagedEntity entity, String executable);
 
   /**
    * Builds optional SSL command-line arguments. Returns null if SSL is not enabled for the
    * distributed system.
    */
-  public String buildSSLArguments(DistributedSystemConfig config);
+  String buildSSLArguments(DistributedSystemConfig config);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
index 8e16dca..93cf294 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
@@ -65,81 +65,81 @@ import javax.management.ObjectName;
 public interface Agent {
 
   /** Lookup name for RMIConnector when rmi-registry-enabled is true */
-  public static final String JNDI_NAME = "/jmxconnector";
+  String JNDI_NAME = "/jmxconnector";
 
   ////////////////////// Instance Methods //////////////////////
 
   /**
    * Returns the configuration object for this JMX Agent.
    */
-  public AgentConfig getConfig();
+  AgentConfig getConfig();
 
   /**
    * Starts this JMX Agent and its associated adapters. This method does not
    * {@linkplain #connectToSystem connect} to the distributed system.
    */
-  public void start();
+  void start();
 
   /**
    * Returns the JMX <code>MBeanServer</code> with which GemFire MBeans are registered or
    * <code>null</code> if this <code>Agent</code> is not started.
    */
-  public MBeanServer getMBeanServer();
+  MBeanServer getMBeanServer();
 
   /**
    * {@linkplain #disconnectFromSystem Disconnects} from the distributed system and stops this JMX
    * Agent and all of its associated adapters.
    */
-  public void stop();
+  void stop();
 
   /**
    * Returns the <code>ObjectName</code> of the JMX management bean that represents this agent or
    * <code>null</code> if this <code>Agent</code> has not been started.
    */
-  public ObjectName getObjectName();
+  ObjectName getObjectName();
 
   /**
    * Returns whether or not this JMX <code>Agent</code> is currently providing information about a
    * distributed system.
    */
-  public boolean isConnected();
+  boolean isConnected();
 
   /**
    * Connects to the distributed system described by this <code>Agent</code>'s configuration.
    *
    * @return The object name of the system that the <code>Agent</code> is now connected to.
    */
-  public ObjectName connectToSystem() throws AdminException, MalformedObjectNameException;
+  ObjectName connectToSystem() throws AdminException, MalformedObjectNameException;
 
   /**
    * Returns the <code>AdminDistributedSystem</code> that underlies this JMX <code>Agent</code> or
    * <code>null</code> is this agent is not {@linkplain #isConnected connected}.
    */
-  public AdminDistributedSystem getDistributedSystem();
+  AdminDistributedSystem getDistributedSystem();
 
   /**
    * Returns the object name of the JMX MBean that represents the distributed system administered by
    * this <code>Agent</code> or <code>null</code> if this <code>Agent</code> has not
    * {@linkplain #connectToSystem connected} to the distributed system.
    */
-  public ObjectName manageDistributedSystem() throws MalformedObjectNameException;
+  ObjectName manageDistributedSystem() throws MalformedObjectNameException;
 
   /**
    * Disconnects this agent from the distributed system and unregisters the management beans that
    * provided information about it. However, this agent's adapters are not stopped and it is
    * possible to reconfigure this <code>Agent</code> to connect to another distributed system.
    */
-  public void disconnectFromSystem();
+  void disconnectFromSystem();
 
   /**
    * Saves the configuration for this <code>Agent</code> to the file specified by @link
    * AgentConfig#getPropertyFile.
    */
-  public void saveProperties();
+  void saveProperties();
 
   /**
    * Returns the <code>LogWriter</code> used for logging information.
    */
-  public LogWriter getLogWriter();
+  LogWriter getLogWriter();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
index 29f0751..9a8753a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
@@ -258,222 +258,220 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 public interface AgentConfig extends DistributedSystemConfig {
 
   /** The prefix for JMX Agent configuration system properties */
-  public static final String SYSTEM_PROPERTY_PREFIX = DistributionConfig.GEMFIRE_PREFIX + "agent.";
+  String SYSTEM_PROPERTY_PREFIX = DistributionConfig.GEMFIRE_PREFIX + "agent.";
 
   /** The default "propertyFile" value */
-  public static final String DEFAULT_PROPERTY_FILE = "agent.properties";
+  String DEFAULT_PROPERTY_FILE = "agent.properties";
 
   /** The default name for file that has "agent state saved serialized" */
-  public static final String DEFAULT_STATE_SAVE_FILE = "agent.ser";
+  String DEFAULT_STATE_SAVE_FILE = "agent.ser";
 
   /** The name of the "auto-connect" property */
-  public static final String AUTO_CONNECT_NAME = "auto-connect";
+  String AUTO_CONNECT_NAME = "auto-connect";
 
   /** The default value of the "auto-connect" property */
-  public static final boolean DEFAULT_AUTO_CONNECT = true;
+  boolean DEFAULT_AUTO_CONNECT = true;
 
   // -------------------------------------------------------------------------
   // HttpAdaptor properties...
   // -------------------------------------------------------------------------
 
   /** The name of the "httpEnabled" property */
-  public static final String HTTP_ENABLED_NAME = "http-enabled";
+  String HTTP_ENABLED_NAME = "http-enabled";
 
   /** The default value of the "httpEnabled" property */
-  public static final boolean DEFAULT_HTTP_ENABLED = true;
+  boolean DEFAULT_HTTP_ENABLED = true;
 
   /** The name of the "httpBindAddress" property */
-  public static final String HTTP_BIND_ADDRESS_NAME = "http-bind-address";
+  String HTTP_BIND_ADDRESS_NAME = "http-bind-address";
 
   /** The default value of the "httpBindAddress" property */
-  public static final String DEFAULT_HTTP_BIND_ADDRESS = "";
+  String DEFAULT_HTTP_BIND_ADDRESS = "";
 
   /** The name of the "httpPort" property */
-  public static final String HTTP_PORT_NAME = "http-port";
+  String HTTP_PORT_NAME = "http-port";
 
   /** The default value of the "httpPort" property (8080) */
-  public static final int DEFAULT_HTTP_PORT = 8080;
+  int DEFAULT_HTTP_PORT = 8080;
 
   /** The minimum httpPort (0) */
-  public static final int MIN_HTTP_PORT = 0;
+  int MIN_HTTP_PORT = 0;
 
   /** The maximum httpPort (65535) */
-  public static final int MAX_HTTP_PORT = 65535;
+  int MAX_HTTP_PORT = 65535;
 
   /** The name of the "state-save-file-name" property */
-  public static final String STATE_SAVE_FILE_NAME = "state-save-file";
+  String STATE_SAVE_FILE_NAME = "state-save-file";
 
   /** The name of the "http-authentication-enabled" property */
-  public static final String HTTP_AUTHENTICATION_ENABLED_NAME = "http-authentication-enabled";
+  String HTTP_AUTHENTICATION_ENABLED_NAME = "http-authentication-enabled";
 
   /**
    * The default value of the "http-authentication-enabled" property
    */
-  public static final boolean DEFAULT_HTTP_AUTHENTICATION_ENABLED = false;
+  boolean DEFAULT_HTTP_AUTHENTICATION_ENABLED = false;
 
   /** The name of the "http-authentication-user" property */
-  public static final String HTTP_AUTHENTICATION_USER_NAME = "http-authentication-user";
+  String HTTP_AUTHENTICATION_USER_NAME = "http-authentication-user";
 
   /** The default value of the "http-authentication-user" property */
-  public static final String DEFAULT_HTTP_AUTHENTICATION_USER = "admin";
+  String DEFAULT_HTTP_AUTHENTICATION_USER = "admin";
 
   /** The name of the "http-authentication-password" property */
-  public static final String HTTP_AUTHENTICATION_PASSWORD_NAME = "http-authentication-password";
+  String HTTP_AUTHENTICATION_PASSWORD_NAME = "http-authentication-password";
 
   /**
    * The default value of the "http-authentication-password" property
    */
-  public static final String DEFAULT_HTTP_AUTHENTICATION_PASSWORD = "password";
+  String DEFAULT_HTTP_AUTHENTICATION_PASSWORD = "password";
 
   /** The name of the "email-notification-enabled" property */
-  public static final String EMAIL_NOTIFICATIONS_ENABLED_NAME = "email-notification-enabled";
+  String EMAIL_NOTIFICATIONS_ENABLED_NAME = "email-notification-enabled";
 
   /**
    * The default value of the "email-notification-enabled" property
    */
-  public static final boolean DEFAULT_EMAIL_NOTIFICATIONS_ENABLED = false;
+  boolean DEFAULT_EMAIL_NOTIFICATIONS_ENABLED = false;
 
   /** The name of the "email-notification-from" property */
-  public static final String EMAIL_NOTIFICATIONS_FROM_NAME = "email-notification-from";
+  String EMAIL_NOTIFICATIONS_FROM_NAME = "email-notification-from";
 
   /**
    * The default value of the "email-notification-from" property
    */
-  public static final String DEFAULT_EMAIL_FROM = "";
+  String DEFAULT_EMAIL_FROM = "";
 
   /** The name of the "email-notification-host" property */
-  public static final String EMAIL_NOTIFICATIONS_HOST_NAME = "email-notification-host";
+  String EMAIL_NOTIFICATIONS_HOST_NAME = "email-notification-host";
 
   /**
    * The default value of the "email-notification-host" property
    */
-  public static final String DEFAULT_EMAIL_HOST = "";
+  String DEFAULT_EMAIL_HOST = "";
 
   /** The name of the "email-notification-to" property */
-  public static final String EMAIL_NOTIFICATIONS_TO_LIST_NAME = "email-notification-to";
+  String EMAIL_NOTIFICATIONS_TO_LIST_NAME = "email-notification-to";
 
   /**
    * The default value of the "email-notification-to" property
    */
-  public static final String DEFAULT_EMAIL_TO_LIST = "";
+  String DEFAULT_EMAIL_TO_LIST = "";
 
   // -------------------------------------------------------------------------
   // RMIConnectorServer properties...
   // -------------------------------------------------------------------------
 
   /** The name of the "rmiEnabled" property */
-  public static final String RMI_ENABLED_NAME = "rmi-enabled";
+  String RMI_ENABLED_NAME = "rmi-enabled";
 
   /** The default value of the {@linkplain #RMI_ENABLED_NAME rmi-enabled} property */
-  public static final boolean DEFAULT_RMI_ENABLED = true;
+  boolean DEFAULT_RMI_ENABLED = true;
 
   /** The name of the "rmi-registry-enabled" property */
-  public static final String RMI_REGISTRY_ENABLED_NAME = "rmi-registry-enabled";
+  String RMI_REGISTRY_ENABLED_NAME = "rmi-registry-enabled";
 
   /**
    * The default value of the {@linkplain #RMI_REGISTRY_ENABLED_NAME rmi-registry-enabled} property
    */
-  public static final boolean DEFAULT_RMI_REGISTRY_ENABLED = true;
+  boolean DEFAULT_RMI_REGISTRY_ENABLED = true;
 
   /** The name of the "rmiBindAddress" property */
-  public static final String RMI_BIND_ADDRESS_NAME = "rmi-bind-address";
+  String RMI_BIND_ADDRESS_NAME = "rmi-bind-address";
 
   /** The default value of the {@linkplain #RMI_BIND_ADDRESS_NAME rmi-bind-address} property */
-  public static final String DEFAULT_RMI_BIND_ADDRESS = "";
+  String DEFAULT_RMI_BIND_ADDRESS = "";
 
   /** The name of the "rmiPort" property */
-  public static final String RMI_PORT_NAME = "rmi-port";
+  String RMI_PORT_NAME = "rmi-port";
 
   /** The default value of the {@linkplain #RMI_PORT_NAME rmi-port} property (1099) */
-  public static final int DEFAULT_RMI_PORT = 1099;
+  int DEFAULT_RMI_PORT = 1099;
 
   /**
    * The name of the "rmi-server-port" property
    * 
    * @since GemFire 6.5
    */
-  public static final String RMI_SERVER_PORT_NAME = "rmi-server-port";
+  String RMI_SERVER_PORT_NAME = "rmi-server-port";
 
   /**
    * The default value of the {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port} property (0)
    * 
    * @since GemFire 6.5
    */
-  public static final int DEFAULT_RMI_SERVER_PORT = 0;
+  int DEFAULT_RMI_SERVER_PORT = 0;
 
   /**
    * The minimum value for {@linkplain #RMI_PORT_NAME rmi-port} or {@linkplain #RMI_SERVER_PORT_NAME
    * rmi-server-port} (0)
    */
-  public static final int MIN_RMI_PORT = 0;
+  int MIN_RMI_PORT = 0;
 
   /**
    * The maximum value for {@linkplain #RMI_PORT_NAME rmi-port} or {@linkplain #RMI_SERVER_PORT_NAME
    * rmi-server-port} (65535)
    */
-  public static final int MAX_RMI_PORT = 65535;
+  int MAX_RMI_PORT = 65535;
 
   // -------------------------------------------------------------------------
   // AdventNetSNMPAdaptor properties...
   // -------------------------------------------------------------------------
 
   /** The name of the "snmpEnabled" property */
-  public static final String SNMP_ENABLED_NAME = "snmp-enabled";
+  String SNMP_ENABLED_NAME = "snmp-enabled";
 
   /** The default value of the "snmpEnabled" property */
-  public static final boolean DEFAULT_SNMP_ENABLED = false;
+  boolean DEFAULT_SNMP_ENABLED = false;
 
   /** The name of the "snmpBindAddress" property */
-  public static final String SNMP_BIND_ADDRESS_NAME = "snmp-bind-address";
+  String SNMP_BIND_ADDRESS_NAME = "snmp-bind-address";
 
   /** The default value of the "snmpBindAddress" property */
-  public static final String DEFAULT_SNMP_BIND_ADDRESS = "";
+  String DEFAULT_SNMP_BIND_ADDRESS = "";
 
   /** The name of the "snmpDirectory" property */
-  public static final String SNMP_DIRECTORY_NAME = "snmp-directory";
+  String SNMP_DIRECTORY_NAME = "snmp-directory";
 
   /** The default value of the "snmpDirectory" property */
-  public static final String DEFAULT_SNMP_DIRECTORY = "";
+  String DEFAULT_SNMP_DIRECTORY = "";
 
   // -------------------------------------------------------------------------
   // JMX SSL properties...
   // -------------------------------------------------------------------------
 
   /** The name of the "agent-ssl-enabled" property */
-  public static final String AGENT_SSL_ENABLED_NAME = "agent-ssl-enabled";
+  String AGENT_SSL_ENABLED_NAME = "agent-ssl-enabled";
 
   /** The default value of the "agent-ssl-enabled" property */
-  public static final boolean DEFAULT_AGENT_SSL_ENABLED = false;
+  boolean DEFAULT_AGENT_SSL_ENABLED = false;
 
   /** The name of the "agent-ssl-protocols" property */
-  public static final String AGENT_SSL_PROTOCOLS_NAME = "agent-ssl-protocols";
+  String AGENT_SSL_PROTOCOLS_NAME = "agent-ssl-protocols";
 
   /** The default value of the "agent-ssl-protocols" property */
-  public static final String DEFAULT_AGENT_SSL_PROTOCOLS = "any";
+  String DEFAULT_AGENT_SSL_PROTOCOLS = "any";
 
   /** The name of the "agent-ssl-ciphers" property */
-  public static final String AGENT_SSL_CIPHERS_NAME = "agent-ssl-ciphers";
+  String AGENT_SSL_CIPHERS_NAME = "agent-ssl-ciphers";
 
   /** The default value of the "agent-ssl-ciphers" property */
-  public static final String DEFAULT_AGENT_SSL_CIPHERS = "any";
+  String DEFAULT_AGENT_SSL_CIPHERS = "any";
 
   /** The name of the "agent-ssl-require-authentication" property */
-  public static final String AGENT_SSL_REQUIRE_AUTHENTICATION_NAME =
-      "agent-ssl-require-authentication";
+  String AGENT_SSL_REQUIRE_AUTHENTICATION_NAME = "agent-ssl-require-authentication";
 
   /**
    * The default value of the "agent-ssl-require-authentication" property
    */
-  public static final boolean DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION = true;
+  boolean DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION = true;
 
   /** The name of the "http-ssl-require-authentication" property */
-  public static final String HTTP_SSL_REQUIRE_AUTHENTICATION_NAME =
-      "http-ssl-require-authentication";
+  String HTTP_SSL_REQUIRE_AUTHENTICATION_NAME = "http-ssl-require-authentication";
 
   /**
    * The default value of the "http-ssl-require-authentication" property
    */
-  public static final boolean DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION = false;
+  boolean DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION = false;
 
   ////////////////////// Instance Methods //////////////////////
 
@@ -483,7 +481,7 @@ public interface AgentConfig extends DistributedSystemConfig {
    *
    * See <a href="#auto-connect">description</a> above.
    */
-  public boolean getAutoConnect();
+  boolean getAutoConnect();
 
   /**
    * Sets whether or not the JMX agent will automatically connect to the distributed system it
@@ -491,133 +489,133 @@ public interface AgentConfig extends DistributedSystemConfig {
    *
    * See <a href="#auto-connect">description</a> above.
    */
-  public void setAutoConnect(boolean autoConnect);
+  void setAutoConnect(boolean autoConnect);
 
   /**
    * Returns whether or not the HTTP adapter is enabled.
    *
    * See <a href="#http-enabled">description</a> above.
    */
-  public boolean isHttpEnabled();
+  boolean isHttpEnabled();
 
   /**
    * Sets whether or not the HTTP adapter is enabled.
    *
    * See <a href="#http-enabled">description</a> above.
    */
-  public void setHttpEnabled(boolean httpEnabled);
+  void setHttpEnabled(boolean httpEnabled);
 
   /**
    * Returns the port of the HTTP adapter.
    *
    * See <a href="#http-port">description</a> above.
    */
-  public int getHttpPort();
+  int getHttpPort();
 
   /**
    * Sets the port of the HTTP adapter.
    *
    * See <a href="#http-port">description</a> above.
    */
-  public void setHttpPort(int port);
+  void setHttpPort(int port);
 
   /**
    * Returns the bind address to which the HTTP adapter's listening socket is bound.
    *
    * See <a href="#http-bind-address">description</a> above.
    */
-  public String getHttpBindAddress();
+  String getHttpBindAddress();
 
   /**
    * Sets the bind address to which the HTTP adapter's listening socket is bound.
    *
    * See <a href="#http-bind-address">description</a> above.
    */
-  public void setHttpBindAddress(String address);
+  void setHttpBindAddress(String address);
 
   /**
    * Returns whether or not the HTTP adapter authenticates connections.
    *
    * See <a href="#http-authentication-enabled">description</a> above.
    */
-  public boolean isHttpAuthEnabled();
+  boolean isHttpAuthEnabled();
 
   /**
    * Sets whether or not the HTTP adapter authenticates connections.
    *
    * See <a href="#http-authentication-enabled">description</a> above.
    */
-  public void setHttpAuthEnabled(boolean enabled);
+  void setHttpAuthEnabled(boolean enabled);
 
   /**
    * Returns the user name for HTTP adapter authentication.
    *
    * See <a href="#http-authentication-user">description</a> above.
    */
-  public String getHttpAuthUser();
+  String getHttpAuthUser();
 
   /**
    * Sets the user name for HTTP adapter authentication.
    *
    * See <a href="#http-authentication-user">description</a> above.
    */
-  public void setHttpAuthUser(String user);
+  void setHttpAuthUser(String user);
 
   /**
    * Returns the password for HTTP adapter authentication.
    *
    * See <a href="#http-authentication-password">description</a> above.
    */
-  public String getHttpAuthPassword();
+  String getHttpAuthPassword();
 
   /**
    * Sets the password for HTTP adapter authentication.
    *
    * See <a href="#http-authentication-password">description</a> above.
    */
-  public void setHttpAuthPassword(String password);
+  void setHttpAuthPassword(String password);
 
   /**
    * Returns whether or not the RMI adapter is enabled.
    *
    * See <a href="#rmi-enabled">description</a> above.
    */
-  public boolean isRmiEnabled();
+  boolean isRmiEnabled();
 
   /**
    * Sets whether or not the RMI adapter is enabled.
    *
    * See <a href="#rmi-enabled">description</a> above.
    */
-  public void setRmiEnabled(boolean rmiEnabled);
+  void setRmiEnabled(boolean rmiEnabled);
 
   /**
    * Returns whether or not the agent hosts an RMI registry.
    *
    * See <a href="#rmi-registry-enabled">description</a> above.
    */
-  public boolean isRmiRegistryEnabled();
+  boolean isRmiRegistryEnabled();
 
   /**
    * Sets whether or not the agent hosts an RMI registry.
    *
    * See <a href="#rmi-registry-enabled">description</a> above.
    */
-  public void setRmiRegistryEnabled(boolean enabled);
+  void setRmiRegistryEnabled(boolean enabled);
 
   /**
    * Returns the port of the RMI adapter.
    *
    * See <a href="#rmi-port">description</a> above.
    */
-  public int getRmiPort();
+  int getRmiPort();
 
   /**
    * Sets the port of the RMI adapter.
    *
    * See <a href="#rmi-port">description</a> above.
    */
-  public void setRmiPort(int port);
+  void setRmiPort(int port);
 
   /**
    * Returns the port of the RMI Connector Server.
@@ -627,7 +625,7 @@ public interface AgentConfig extends DistributedSystemConfig {
    * @return the value set for rmi-server-port
    * @since GemFire 6.5
    */
-  public int getRmiServerPort();
+  int getRmiServerPort();
 
   /**
    * Sets the port of the RMI Connector Server.
@@ -637,208 +635,208 @@ public interface AgentConfig extends DistributedSystemConfig {
    * @param port rmi-server-port to set.
    * @since GemFire 6.5
    */
-  public void setRmiServerPort(int port);
+  void setRmiServerPort(int port);
 
   /**
    * Returns the bind address to which the RMI adapter's listening sockets are bound.
    *
    * See <a href="#rmi-bind-address">description</a> above.
    */
-  public String getRmiBindAddress();
+  String getRmiBindAddress();
 
   /**
    * Sets the bind address to which the RMI adapter's listening sockets are bound.
    *
    * See <a href="#rmi-bind-address">description</a> above.
    */
-  public void setRmiBindAddress(String address);
+  void setRmiBindAddress(String address);
 
   /**
    * Returns whether or not the SNMP adapter is enabled.
    *
    * See <a href="#snmp-enabled">description</a> above.
    */
-  public boolean isSnmpEnabled();
+  boolean isSnmpEnabled();
 
   /**
    * Sets whether or not the SNMP adapter is enabled.
    *
    * See <a href="#snmp-enabled">description</a> above.
    */
-  public void setSnmpEnabled(boolean enabled);
+  void setSnmpEnabled(boolean enabled);
 
   /**
    * Returns the bind address used with the SNMP adapter.
    *
    * See <a href="#snmp-bind-address">description</a> above.
    */
-  public String getSnmpBindAddress();
+  String getSnmpBindAddress();
 
   /**
    * Sets the bind address used with the SNMP adapter.
    *
    * See <a href="#snmp-bind-address">description</a> above.
    */
-  public void setSnmpBindAddress(String address);
+  void setSnmpBindAddress(String address);
 
   /**
    * Returns the directory for the SNMP adapater.
    *
    * See <a href="#snmp-directory">description</a> above.
    */
-  public String getSnmpDirectory();
+  String getSnmpDirectory();
 
   /**
    * Sets the directory for the SNMP adapater.
    *
    * See <a href="#snmp-directory">description</a> above.
    */
-  public void setSnmpDirectory(String snmpDirectory);
+  void setSnmpDirectory(String snmpDirectory);
 
   /**
    * Returns whether or not SSL is required for the JMX agent.
    *
    * See <a href="#agent-ssl-enabled">description</a> above.
    */
-  public boolean isAgentSSLEnabled();
+  boolean isAgentSSLEnabled();
 
   /**
    * Sets whether or not SSL is required for the JMX agent.
    *
    * See <a href="#agent-ssl-enabled">description</a> above.
    */
-  public void setAgentSSLEnabled(boolean enabled);
+  void setAgentSSLEnabled(boolean enabled);
 
   /**
    * Returns the SSL protocols used when connecting to the JMX agent.
    *
    * See <a href="#agent-ssl-protocols">description</a> above.
    */
-  public String getAgentSSLProtocols();
+  String getAgentSSLProtocols();
 
   /**
    * Sets the SSL protocols used when connecting to the JMX agent.
    *
    * See <a href="#agent-ssl-protocols">description</a> above.
    */
-  public void setAgentSSLProtocols(String protocols);
+  void setAgentSSLProtocols(String protocols);
 
   /**
    * Returns the SSL ciphers used when connecting to the JMX agent.
    *
    * See <a href="#agent-ssl-ciphers">description</a> above.
    */
-  public String getAgentSSLCiphers();
+  String getAgentSSLCiphers();
 
   /**
    * Sets the SSL ciphers used when connecting to the JMX agent.
    *
    * See <a href="#agent-ssl-ciphers">description</a> above.
    */
-  public void setAgentSSLCiphers(String ciphers);
+  void setAgentSSLCiphers(String ciphers);
 
   /**
    * Returns whether SSL authentication is used when connecting to the RMI connector.
    *
    * See <a href="#agent-ssl-require-authentication">description</a> above.
    */
-  public boolean isAgentSSLRequireAuth();
+  boolean isAgentSSLRequireAuth();
 
   /**
    * Sets whether SSL authentication is used when connecting to the RMI connector.
    *
    * See <a href="#agent-ssl-require-authentication">description</a> above.
    */
-  public void setAgentSSLRequireAuth(boolean require);
+  void setAgentSSLRequireAuth(boolean require);
 
   /**
    * Returns whether SSL authentication is used when connecting to the HTTP connector.
    *
    * See <a href="#http-ssl-require-authentication">description</a> above.
    */
-  public boolean isHttpSSLRequireAuth();
+  boolean isHttpSSLRequireAuth();
 
   /**
    * Sets whether SSL authentication is used when connecting to the HTTP connector.
    *
    * See <a href="#http-ssl-require-authentication">description</a> above.
    */
-  public void setHttpSSLRequireAuth(boolean require);
+  void setHttpSSLRequireAuth(boolean require);
 
   /**
    * Returns whether Emails for Notifications is enabled
    *
    * See <a href="#email-notification-enabled">description</a> above.
    */
-  public boolean isEmailNotificationEnabled();
+  boolean isEmailNotificationEnabled();
 
   /**
    * Sets whether Emails for Notifications is enabled
    *
    * See <a href="#email-notification-enabled">description</a> above.
    */
-  public void setEmailNotificationEnabled(boolean enabled);
+  void setEmailNotificationEnabled(boolean enabled);
 
   /**
    * Returns the EmailID from whom notification emails are sent.
    *
    * See <a href="#email-notification-from">description</a> above.
    */
-  public String getEmailNotificationFrom();
+  String getEmailNotificationFrom();
 
   /**
    * Sets the EmailID from whom notification emails are sent.
    *
    * See <a href="#email-notification-from">description</a> above.
    */
-  public void setEmailNotificationFrom(String emailID);
+  void setEmailNotificationFrom(String emailID);
 
   /**
    * Returns the Host Name using which notification emails are sent.
    *
    * See <a href="#email-notification-host">description</a> above.
    */
-  public String getEmailNotificationHost();
+  String getEmailNotificationHost();
 
   /**
    * Sets the Host Name from whom notification emails are sent.
    *
    * See <a href="#email-notification-host">description</a> above.
    */
-  public void setEmailNotificationHost(String hostName);
+  void setEmailNotificationHost(String hostName);
 
   /**
    * Returns the comma separated EmailID list to whom notification emails are sent.
    *
    * See <a href="#email-notification-to">description</a> above.
    */
-  public String getEmailNotificationToList();
+  String getEmailNotificationToList();
 
   /**
    * Sets the EmailID from whom notification emails are sent as a comma separated list.
    *
    * See <a href="#email-notification-to">description</a> above.
    */
-  public void setEmailNotificationToList(String emailIDs);
+  void setEmailNotificationToList(String emailIDs);
 
   /**
    * Returns the name of the file to be used for saving agent state
    *
    * See <a href="#state-save-file">description</a> above.
    */
-  public String getStateSaveFile();
+  String getStateSaveFile();
 
   /**
    * Sets the name of the file to be used for saving agent state
    *
    * See <a href="#state-save-file">description</a> above.
    */
-  public void setStateSaveFile(String file);
+  void setStateSaveFile(String file);
 
   /**
    * Returns an <code>AgentConfig</code> with the same configuration as this
    * <code>AgentConfig</code>.
    */
-  public Object clone() throws CloneNotSupportedException;
+  Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
index 5c2a81f..f6dbdf3 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
@@ -32,7 +32,7 @@ public interface ManagedResource {
    *
    * @see #getMBeanName
    */
-  public static final String MBEAN_NAME_PREFIX = "GemFire:type=";
+  String MBEAN_NAME_PREFIX = "GemFire:type=";
 
   /**
    * Returns the name of the ModelMBean that will manage this resource. They [some] are of the form
@@ -43,32 +43,32 @@ public interface ManagedResource {
    *
    * @see #MBEAN_NAME_PREFIX
    */
-  public String getMBeanName();
+  String getMBeanName();
 
   /** Returns the ModelMBean that is configured to manage this resource */
-  public ModelMBean getModelMBean();
+  ModelMBean getModelMBean();
 
   /** Sets the ModelMBean that is configured to manage this resource */
-  public void setModelMBean(ModelMBean modelMBean);
+  void setModelMBean(ModelMBean modelMBean);
 
   /**
    * Returns the enumerated ManagedResourceType of this resource.
    *
    * @see ManagedResourceType
    */
-  public ManagedResourceType getManagedResourceType();
+  ManagedResourceType getManagedResourceType();
 
   /**
    * Returns the JMX <code>ObjectName</code> of this managed resource.
    *
    * @see #getMBeanName
    */
-  public ObjectName getObjectName();
+  ObjectName getObjectName();
 
   /**
    * Perform any cleanup necessary before stopping management of this resource.
    */
-  public void cleanupResource();
+  void cleanupResource();
 
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
index 9d9bfb4..67b3ca1 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
@@ -31,14 +31,14 @@ public interface RMIRegistryServiceMBean {
    *
    * @return the host on which rmiregistry listens for incoming connections
    */
-  public String getHost();
+  String getHost();
 
   /**
    * Returns the port on which rmiregistry listens for incoming connections
    * 
    * @return the port on which rmiregistry listens for incoming connections
    */
-  public int getPort();
+  int getPort();
 
   /**
    * Returns whether this MBean has been started and not yet stopped.
@@ -46,7 +46,7 @@ public interface RMIRegistryServiceMBean {
    * @return whether this MBean has been started and not yet stopped.
    * @see #start
    */
-  public boolean isRunning();
+  boolean isRunning();
 
   /**
    * Starts this MBean: rmiregistry can now accept incoming calls
@@ -54,14 +54,14 @@ public interface RMIRegistryServiceMBean {
    * @see #stop
    * @see #isRunning
    */
-  public void start() throws RemoteException;
+  void start() throws RemoteException;
 
   /**
    * Stops this MBean: rmiregistry cannot accept anymore incoming calls
    * 
    * @see #start
    */
-  public void stop() throws NoSuchObjectException;
+  void stop() throws NoSuchObjectException;
 
   /**
    * Returns an array of the names bound in the rmiregistry
@@ -69,12 +69,12 @@ public interface RMIRegistryServiceMBean {
    * @return an array of the names bound in the rmiregistry
    * @see java.rmi.registry.Registry#list()
    */
-  public String[] list() throws RemoteException;
+  String[] list() throws RemoteException;
 
   /**
    * Removes the binding for the specified <code>name</code> in the rmiregistry
    * 
    * @see java.rmi.registry.Registry#unbind(String)
    */
-  public void unbind(String name) throws RemoteException, NotBoundException;
+  void unbind(String name) throws RemoteException, NotBoundException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
index 106fa35..8f3f371 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
@@ -38,14 +38,14 @@ public interface StatAlertsAggregator {
    * @param alertDefinition StatAlertDefinition to retrieve
    * @return StatAlertDefinition
    */
-  public StatAlertDefinition getAlertDefinition(StatAlertDefinition alertDefinition);
+  StatAlertDefinition getAlertDefinition(StatAlertDefinition alertDefinition);
 
   /**
    * This method can be used to retrieve all available stat alert definitions.
    * 
    * @return An array of all available StatAlertDefinition objects
    */
-  public StatAlertDefinition[] getAllStatAlertDefinitions();
+  StatAlertDefinition[] getAllStatAlertDefinitions();
 
   /**
    * This method can be used to update alert definition for the Stat mentioned. This method should
@@ -56,7 +56,7 @@ public interface StatAlertsAggregator {
    * 
    * @param alertDefinition alertDefinition to be updated
    */
-  public void updateAlertDefinition(StatAlertDefinition alertDefinition);
+  void updateAlertDefinition(StatAlertDefinition alertDefinition);
 
   /**
    * This method can be used to remove alert definition for the Stat mentioned.
@@ -66,7 +66,7 @@ public interface StatAlertsAggregator {
    * 
    * @param defId id of the alert definition to be removed
    */
-  public void removeAlertDefinition(Integer defId);
+  void removeAlertDefinition(Integer defId);
 
   /**
    * Convenience method to check whether an alert definition is created.
@@ -74,28 +74,28 @@ public interface StatAlertsAggregator {
    * @param alert alert definition to check whether already created
    * @return true if the alert definition is already created, false otherwise
    */
-  public boolean isAlertDefinitionCreated(StatAlertDefinition alert);
+  boolean isAlertDefinitionCreated(StatAlertDefinition alert);
 
   /**
    * This method can be used to set the AlertManager for the newly joined member VM.
    * 
    * @param memberVM Member VM to set AlertsManager for
    */
-  public void setAlertsManager(GemFireVM memberVM);
+  void setAlertsManager(GemFireVM memberVM);
 
   /**
    * Returns the refresh interval for the Stats in seconds.
    * 
    * @return refresh interval for the Stats(in seconds)
    */
-  public int getRefreshIntervalForStatAlerts();
+  int getRefreshIntervalForStatAlerts();
 
   /**
    * This method is used to set the refresh interval for the Stats Alerts in seconds
    * 
    * @param refreshInterval refresh interval for the Stats(in seconds)
    */
-  public void setRefreshIntervalForStatAlerts(int refreshInterval);
+  void setRefreshIntervalForStatAlerts(int refreshInterval);
 
   /**
    * This method can be used to process the notifications sent by the member(s). Actual aggregation
@@ -105,7 +105,7 @@ public interface StatAlertsAggregator {
    * @param alerts array of Alert class(contains alert def. ID & value)
    * @param remoteVM
    */
-  public void processNotifications(StatAlert[] alerts, GemFireVM remoteVM);
+  void processNotifications(StatAlert[] alerts, GemFireVM remoteVM);
 
-  public void processSystemwideNotifications();
+  void processSystemwideNotifications();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
index 06b0be9..1fad203 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
@@ -38,36 +38,35 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
   /**
    * Notification type for indicating a cache got created on a member of this distributed system.
    */
-  public static final String NOTIF_CACHE_CREATED =
+  String NOTIF_CACHE_CREATED =
       DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.created";
   /**
    * Notification type for indicating a cache is closed on a member of this distributed system.
    */
-  public static final String NOTIF_CACHE_CLOSED =
-      DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.closed";
+  String NOTIF_CACHE_CLOSED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.closed";
   /**
    * Notification type for indicating a region is created in a cache on a member of this distributed
    * system.
    */
-  public static final String NOTIF_REGION_CREATED =
+  String NOTIF_REGION_CREATED =
       DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.region.created";
   /**
    * Notification type for indicating a region was removed from a cache on a member of this
    * distributed system.
    */
-  public static final String NOTIF_REGION_LOST =
+  String NOTIF_REGION_LOST =
       DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.region.lost";
 
   /** Notification type for indicating client joined */
-  public static final String NOTIF_CLIENT_JOINED =
+  String NOTIF_CLIENT_JOINED =
       DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.client.joined";
 
   /** Notification type for indicating client left */
-  public static final String NOTIF_CLIENT_LEFT =
+  String NOTIF_CLIENT_LEFT =
       DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.client.left";
 
   /** Notification type for indicating client crashed */
-  public static final String NOTIF_CLIENT_CRASHED =
+  String NOTIF_CLIENT_CRASHED =
       DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.client.crashed";
 
   /**
@@ -75,7 +74,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    *
    * @return the current refresh interval in seconds
    */
-  public int getRefreshInterval();
+  int getRefreshInterval();
 
   /**
    * RefreshInterval is now set only through the AdminDistributedSystem property refreshInterval.
@@ -87,14 +86,14 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
    */
   @Deprecated
-  public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException;
+  void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException;
 
   /**
    * Sets the refresh interval field. Sets interval in seconds between config refreshes; zero or
    * less turns off auto refreshing. Manual refreshing has no effect on when the next scheduled
    * refresh will occur.
    */
-  public void _setRefreshInterval(int refreshInterval);
+  void _setRefreshInterval(int refreshInterval);
 
   /**
    * Gets this member's cache.
@@ -103,21 +102,21 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    *
    * @throws AdminException If this system member does not host a cache
    */
-  public ObjectName manageCache() throws AdminException, MalformedObjectNameException;
+  ObjectName manageCache() throws AdminException, MalformedObjectNameException;
 
   /**
    * Gets all active StatisticResources for this manager.
    *
    * @return array of ObjectName instances
    */
-  public ObjectName[] manageStats() throws AdminException, MalformedObjectNameException;
+  ObjectName[] manageStats() throws AdminException, MalformedObjectNameException;
 
   /**
    * Gets the active StatisticResources for this manager, based on the typeName as the key
    *
    * @return ObjectName of StatisticResourceJMX instance
    */
-  public ObjectName[] manageStat(String statisticsTypeName)
+  ObjectName[] manageStat(String statisticsTypeName)
       throws AdminException, MalformedObjectNameException;
 
   /**
@@ -127,7 +126,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * @param notification the JMX notification being received
    * @param hb handback object is unused
    */
-  public void handleNotification(Notification notification, Object hb);
+  void handleNotification(Notification notification, Object hb);
 
   /**
    * Add MBean attribute definitions for each ConfigurationParameter.
@@ -136,7 +135,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * @return a new instance of ManagedBean copied from <code>managed</code> but with the new
    *         attributes added
    */
-  public ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException;
+  ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException;
 
 
   /**
@@ -145,7 +144,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * 
    * @param event event object corresponding to the creation of the cache
    */
-  public void handleCacheCreate(SystemMemberCacheEvent event);
+  void handleCacheCreate(SystemMemberCacheEvent event);
 
   /**
    * Implementation should handle closure of cache by extracting the details from the given event
@@ -153,7 +152,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * 
    * @param event event object corresponding to the closure of the cache
    */
-  public void handleCacheClose(SystemMemberCacheEvent event);
+  void handleCacheClose(SystemMemberCacheEvent event);
 
   /**
    * Implementation should handle creation of region by extracting the details from the given event
@@ -161,7 +160,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * 
    * @param event event object corresponding to the creation of a region
    */
-  public void handleRegionCreate(SystemMemberRegionEvent event);
+  void handleRegionCreate(SystemMemberRegionEvent event);
 
   /**
    * Implementation should handle loss of region by extracting the details from the given event
@@ -169,7 +168,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * 
    * @param event event object corresponding to the loss of a region
    */
-  public void handleRegionLoss(SystemMemberRegionEvent event);
+  void handleRegionLoss(SystemMemberRegionEvent event);
 
   /**
    * Implementation should handle client membership changes.
@@ -178,7 +177,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
    *        {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
    */
-  public void handleClientMembership(String clientId, int eventType);
+  void handleClientMembership(String clientId, int eventType);
 
   ////////////////////// Inner Classess //////////////////////
 
@@ -186,7 +185,7 @@ public interface SystemMemberJmx extends SystemMember, NotificationListener {
    * A helper class that provides implementation of the <code>SystemMemberJmx</code> interface as
    * static methods.
    */
-  public static class Helper {
+  class Helper {
     private static final Logger logger = LogService.getLogger();
 
     private static AtomicInteger notificationSequenceNumber = new AtomicInteger();