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/13 17:17:37 UTC

[15/18] geode git commit: GEODE-2980: remove unnecessary exlicit keywords from interfaces

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
index 51301bc..b62262b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
@@ -38,7 +38,7 @@ public interface AttributesMutator<K, V> {
    * 
    * @return the Region this mutator affects
    */
-  public Region<K, V> getRegion();
+  Region<K, V> getRegion();
 
   /**
    * Changes the timeToLive expiration attributes for the region as a whole
@@ -49,7 +49,7 @@ public interface AttributesMutator<K, V> {
    *         LOCAL_INVALIDATE and the region is {@link DataPolicy#withReplication replicated}
    * @throws IllegalStateException if statistics are disabled for this region.
    */
-  public ExpirationAttributes setRegionTimeToLive(ExpirationAttributes timeToLive);
+  ExpirationAttributes setRegionTimeToLive(ExpirationAttributes timeToLive);
 
   /**
    * Changes the idleTimeout expiration attributes for the region as a whole. Resets the
@@ -61,7 +61,7 @@ public interface AttributesMutator<K, V> {
    *         LOCAL_INVALIDATE and the region is {@link DataPolicy#withReplication replicated}
    * @throws IllegalStateException if statistics are disabled for this region.
    */
-  public ExpirationAttributes setRegionIdleTimeout(ExpirationAttributes idleTimeout);
+  ExpirationAttributes setRegionIdleTimeout(ExpirationAttributes idleTimeout);
 
   /**
    * Changes the timeToLive expiration attributes for values in this region.
@@ -74,7 +74,7 @@ public interface AttributesMutator<K, V> {
    *         {@link DataPolicy#withReplication replicated}
    * @throws IllegalStateException if statistics are disabled for this region.
    */
-  public ExpirationAttributes setEntryTimeToLive(ExpirationAttributes timeToLive);
+  ExpirationAttributes setEntryTimeToLive(ExpirationAttributes timeToLive);
 
   /**
    * Changes the custom timeToLive for values in this region
@@ -82,7 +82,7 @@ public interface AttributesMutator<K, V> {
    * @param custom the new CustomExpiry
    * @return the old CustomExpiry
    */
-  public CustomExpiry<K, V> setCustomEntryTimeToLive(CustomExpiry<K, V> custom);
+  CustomExpiry<K, V> setCustomEntryTimeToLive(CustomExpiry<K, V> custom);
 
   /**
    * Changes the idleTimeout expiration attributes for values in the region.
@@ -96,7 +96,7 @@ public interface AttributesMutator<K, V> {
    * @see AttributesFactory#setStatisticsEnabled
    * @throws IllegalStateException if statistics are disabled for this region.
    */
-  public ExpirationAttributes setEntryIdleTimeout(ExpirationAttributes idleTimeout);
+  ExpirationAttributes setEntryIdleTimeout(ExpirationAttributes idleTimeout);
 
   /**
    * Changes the CustomExpiry for idleTimeout for values in the region
@@ -104,7 +104,7 @@ public interface AttributesMutator<K, V> {
    * @param custom the new CustomExpiry
    * @return the old CustomExpiry
    */
-  public CustomExpiry<K, V> setCustomEntryIdleTimeout(CustomExpiry<K, V> custom);
+  CustomExpiry<K, V> setCustomEntryIdleTimeout(CustomExpiry<K, V> custom);
 
   /**
    * Changes the CacheListener for the region. Removes listeners already added and calls
@@ -117,7 +117,7 @@ public interface AttributesMutator<K, V> {
    *             instead.
    */
   @Deprecated
-  public CacheListener<K, V> setCacheListener(CacheListener<K, V> aListener);
+  CacheListener<K, V> setCacheListener(CacheListener<K, V> aListener);
 
   /**
    * Adds a cache listener to the end of the list of cache listeners on this region.
@@ -126,7 +126,7 @@ public interface AttributesMutator<K, V> {
    * @throws IllegalArgumentException if <code>aListener</code> is null
    * @since GemFire 5.0
    */
-  public void addCacheListener(CacheListener<K, V> aListener);
+  void addCacheListener(CacheListener<K, V> aListener);
 
   /**
    * Removes a cache listener from the list of cache listeners on this region. Does nothing if the
@@ -137,7 +137,7 @@ public interface AttributesMutator<K, V> {
    * @throws IllegalArgumentException if <code>aListener</code> is null
    * @since GemFire 5.0
    */
-  public void removeCacheListener(CacheListener<K, V> aListener);
+  void removeCacheListener(CacheListener<K, V> aListener);
 
   /**
    * Removes all cache listeners, calling {@link CacheCallback#close} on each of them, and then adds
@@ -147,7 +147,7 @@ public interface AttributesMutator<K, V> {
    * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
    * @since GemFire 5.0
    */
-  public void initCacheListeners(CacheListener<K, V>[] newListeners);
+  void initCacheListeners(CacheListener<K, V>[] newListeners);
 
   /**
    * Changes the cache writer for the region.
@@ -155,7 +155,7 @@ public interface AttributesMutator<K, V> {
    * @param cacheWriter the cache writer
    * @return the previous CacheWriter
    */
-  public CacheWriter<K, V> setCacheWriter(CacheWriter<K, V> cacheWriter);
+  CacheWriter<K, V> setCacheWriter(CacheWriter<K, V> cacheWriter);
 
   /**
    * Changes the cache loader for the region.
@@ -167,7 +167,7 @@ public interface AttributesMutator<K, V> {
    * @param cacheLoader the cache loader
    * @return the previous CacheLoader
    */
-  public CacheLoader<K, V> setCacheLoader(CacheLoader<K, V> cacheLoader);
+  CacheLoader<K, V> setCacheLoader(CacheLoader<K, V> cacheLoader);
 
 
   /**
@@ -175,7 +175,7 @@ public interface AttributesMutator<K, V> {
    * 
    * @return the {@link EvictionAttributesMutator} used to change the EvictionAttributes
    */
-  public EvictionAttributesMutator getEvictionAttributesMutator();
+  EvictionAttributesMutator getEvictionAttributesMutator();
 
   /**
    * Sets cloning on region Note: off-heap regions always behave as if cloning is enabled.
@@ -183,7 +183,7 @@ public interface AttributesMutator<K, V> {
    * @param cloningEnable
    * @since GemFire 6.1
    */
-  public void setCloningEnabled(boolean cloningEnable);
+  void setCloningEnabled(boolean cloningEnable);
 
   /**
    * Returns whether or not cloning is enabled on region
@@ -192,7 +192,7 @@ public interface AttributesMutator<K, V> {
    *
    * @since GemFire 6.1
    */
-  public boolean getCloningEnabled();
+  boolean getCloningEnabled();
 
   /**
    * Adds GatewaySenderId to the list of GatewaySenderIds of the region. If the GatewaySenderId is
@@ -200,26 +200,26 @@ public interface AttributesMutator<K, V> {
    * 
    * @param gatewaySenderId
    */
-  public void addGatewaySenderId(String gatewaySenderId);
+  void addGatewaySenderId(String gatewaySenderId);
 
   /**
    * Removes GatewaySenderId from the list of GatewaySenderIds of the region.
    * 
    * @param gatewaySenderId
    */
-  public void removeGatewaySenderId(String gatewaySenderId);
+  void removeGatewaySenderId(String gatewaySenderId);
 
   /**
    * Adds AsyncEventQueueId to the list of AsyncEventQueueId of the region.
    * 
    * @param asyncEventQueueId
    */
-  public void addAsyncEventQueueId(String asyncEventQueueId);
+  void addAsyncEventQueueId(String asyncEventQueueId);
 
   /**
    * Removes AsyncEventQueueId from the list of AsyncEventQueuesId of the region.
    * 
    * @param asyncEventQueueId
    */
-  public void removeAsyncEventQueueId(String asyncEventQueueId);
+  void removeAsyncEventQueueId(String asyncEventQueueId);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java b/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
index fdcdb26..6eee1a1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
@@ -40,5 +40,5 @@ public interface CacheCallback extends Declarable {
    * @see Region#destroyRegion()
    * @see AttributesMutator
    */
-  public void close();
+  void close();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
index dffde6a..fc2e22b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
@@ -41,7 +41,7 @@ public interface CacheEvent<K, V> {
    * 
    * @return the region associated with this object or the region that raised this event.
    */
-  public Region<K, V> getRegion();
+  Region<K, V> getRegion();
 
   /**
    * Return a description of the operation that triggered this event.
@@ -49,7 +49,7 @@ public interface CacheEvent<K, V> {
    * @return the operation that triggered this event.
    * @since GemFire 5.0
    */
-  public Operation getOperation();
+  Operation getOperation();
 
   /**
    * Returns the callbackArgument passed to the method that generated this event. Provided primarily
@@ -61,7 +61,7 @@ public interface CacheEvent<K, V> {
    *         {@link TransactionListener} and to {@link CacheListener} on the remote side of a
    *         transaction commit.
    */
-  public Object getCallbackArgument();
+  Object getCallbackArgument();
 
   /**
    * Returns <code>true</code> if the callback argument is "available". Not available means that the
@@ -71,7 +71,7 @@ public interface CacheEvent<K, V> {
    * 
    * @since GemFire 6.0
    */
-  public boolean isCallbackArgumentAvailable();
+  boolean isCallbackArgumentAvailable();
 
   /**
    * Answer true if this event originated in a cache other than this one. Answer false if this event
@@ -80,7 +80,7 @@ public interface CacheEvent<K, V> {
    * @return true if this event originated remotely
    *
    */
-  public boolean isOriginRemote();
+  boolean isOriginRemote();
 
   /**
    * Returns the {@link DistributedMember} that this event originated in.
@@ -88,6 +88,6 @@ public interface CacheEvent<K, V> {
    * @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/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java b/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
index 8f23238..f2dbc70 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
@@ -72,7 +72,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @see Region#put(Object, Object)
    * @see Region#get(Object)
    */
-  public void afterCreate(EntryEvent<K, V> event);
+  void afterCreate(EntryEvent<K, V> event);
 
   /**
    * Handles the event of an entry's value being modified in a region. This entry previously existed
@@ -81,7 +81,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @param event the EntryEvent
    * @see Region#put(Object, Object)
    */
-  public void afterUpdate(EntryEvent<K, V> event);
+  void afterUpdate(EntryEvent<K, V> event);
 
   /**
    * Handles the event of an entry's value being invalidated.
@@ -89,7 +89,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @param event the EntryEvent
    * @see Region#invalidate(Object)
    */
-  public void afterInvalidate(EntryEvent<K, V> event);
+  void afterInvalidate(EntryEvent<K, V> event);
 
   /**
    * Handles the event of an entry being destroyed.
@@ -97,7 +97,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @param event the EntryEvent
    * @see Region#destroy(Object)
    */
-  public void afterDestroy(EntryEvent<K, V> event);
+  void afterDestroy(EntryEvent<K, V> event);
 
   /**
    * Handles the event of a region being invalidated. Events are not invoked for each individual
@@ -108,7 +108,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @see Region#invalidateRegion()
    * @see Region#localInvalidateRegion()
    */
-  public void afterRegionInvalidate(RegionEvent<K, V> event);
+  void afterRegionInvalidate(RegionEvent<K, V> event);
 
   /**
    * Handles the event of a region being destroyed. Events are not invoked for each individual entry
@@ -121,7 +121,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @see Region#close
    * @see Cache#close()
    */
-  public void afterRegionDestroy(RegionEvent<K, V> event);
+  void afterRegionDestroy(RegionEvent<K, V> event);
 
   /**
    * Handles the event of a region being cleared. Events are not invoked for each individual entry
@@ -132,7 +132,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @see Region#clear
    * @since GemFire 5.0
    */
-  public void afterRegionClear(RegionEvent<K, V> event);
+  void afterRegionClear(RegionEvent<K, V> event);
 
   /**
    * Handles the event of a region being created. Events are invoked for each individual region that
@@ -147,7 +147,7 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @see Region#createSubregion
    * @since GemFire 5.0
    */
-  public void afterRegionCreate(RegionEvent<K, V> event);
+  void afterRegionCreate(RegionEvent<K, V> event);
 
   /**
    * Handles the event of a region being live after receiving the marker from the server.
@@ -157,5 +157,5 @@ public interface CacheListener<K, V> extends CacheCallback {
    * @see Cache#readyForEvents
    * @since GemFire 5.5
    */
-  public void afterRegionLive(RegionEvent<K, V> event);
+  void afterRegionLive(RegionEvent<K, V> event);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java b/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
index 8812816..bd4902c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
@@ -51,5 +51,5 @@ public interface CacheLoader<K, V> extends CacheCallback {
    *
    * @see Region#get(Object, Object) Region.get
    */
-  public V load(LoaderHelper<K, V> helper) throws CacheLoaderException;
+  V load(LoaderHelper<K, V> helper) throws CacheLoaderException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
index 05839cc..3bb89f6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
@@ -48,7 +48,7 @@ public interface CacheStatistics {
    * @see Region#create(Object, Object)
    * @see Region#createSubregion
    */
-  public long getLastModifiedTime();
+  long getLastModifiedTime();
 
   /**
    * For an entry, returns the last time it was accessed via <code>Region.get</code>; for a region,
@@ -67,7 +67,7 @@ public interface CacheStatistics {
    * @see #getLastModifiedTime
    * @throws StatisticsDisabledException if statistics are not available
    */
-  public long getLastAccessedTime() throws StatisticsDisabledException;
+  long getLastAccessedTime() throws StatisticsDisabledException;
 
   /**
    * Returns the number of times that {@link Region#get(Object) Region.get} on the region or the
@@ -78,7 +78,7 @@ public interface CacheStatistics {
    * @return the number of cache misses on the region or the entry.
    * @throws StatisticsDisabledException if statistics are not available
    */
-  public long getMissCount() throws StatisticsDisabledException;
+  long getMissCount() throws StatisticsDisabledException;
 
   /**
    * Returns the number of hits for this region or entry. The number of hits is defined as the
@@ -89,7 +89,7 @@ public interface CacheStatistics {
    * @return the number of hits for this region or entry.
    * @throws StatisticsDisabledException if statistics are not available
    */
-  public long getHitCount() throws StatisticsDisabledException;
+  long getHitCount() throws StatisticsDisabledException;
 
   /**
    * Return the hit ratio, a convenience method defined as the ratio of hits to the number of calls
@@ -107,7 +107,7 @@ public interface CacheStatistics {
    * @throws StatisticsDisabledException if statistics are not available
    * @return the hit ratio as a float
    */
-  public float getHitRatio() throws StatisticsDisabledException;
+  float getHitRatio() throws StatisticsDisabledException;
 
 
   /**
@@ -115,5 +115,5 @@ public interface CacheStatistics {
    * 
    * @throws StatisticsDisabledException if statistics are not available
    */
-  public void resetCounts() throws StatisticsDisabledException;
+  void resetCounts() throws StatisticsDisabledException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java b/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
index 8d9c694..71ced62 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
@@ -112,7 +112,7 @@ public interface CacheTransactionManager {
    *
    * @since GemFire 4.0
    */
-  public void begin();
+  void begin();
 
   /**
    * Commit the transaction associated with the current thread. If the commit operation fails due to
@@ -136,7 +136,7 @@ public interface CacheTransactionManager {
    *         transaction and which have not. This only occurs if nodes fail mid-commit, and only
    *         then in very rare circumstances.
    */
-  public void commit() throws CommitConflictException;
+  void commit() throws CommitConflictException;
 
   /**
    * Roll back the transaction associated with the current thread. When this method completes, the
@@ -146,7 +146,7 @@ public interface CacheTransactionManager {
    * 
    * @throws IllegalStateException if the thread is not associated with a transaction
    */
-  public void rollback();
+  void rollback();
 
   /**
    * Suspends the transaction on the current thread. All subsequent operations performed by this
@@ -157,7 +157,7 @@ public interface CacheTransactionManager {
    *         associated with a transaction
    * @since GemFire 6.6.2
    */
-  public TransactionId suspend();
+  TransactionId suspend();
 
   /**
    * On the current thread, resumes a transaction that was previously suspended using
@@ -169,7 +169,7 @@ public interface CacheTransactionManager {
    * @since GemFire 6.6.2
    * @see #tryResume(TransactionId)
    */
-  public void resume(TransactionId transactionId);
+  void resume(TransactionId transactionId);
 
   /**
    * This method can be used to determine if a transaction with the given transaction identifier is
@@ -180,7 +180,7 @@ public interface CacheTransactionManager {
    * @since GemFire 6.6.2
    * @see #exists(TransactionId)
    */
-  public boolean isSuspended(TransactionId transactionId);
+  boolean isSuspended(TransactionId transactionId);
 
   /**
    * On the current thread, resumes a transaction that was previously suspended using
@@ -200,7 +200,7 @@ public interface CacheTransactionManager {
    * @return true if the transaction was resumed, false otherwise
    * @since GemFire 6.6.2
    */
-  public boolean tryResume(TransactionId transactionId);
+  boolean tryResume(TransactionId transactionId);
 
   /**
    * On the current thread, resumes a transaction that was previously suspended using
@@ -221,7 +221,7 @@ public interface CacheTransactionManager {
    * @since GemFire 6.6.2
    * @see #tryResume(TransactionId)
    */
-  public boolean tryResume(TransactionId transactionId, long time, TimeUnit unit);
+  boolean tryResume(TransactionId transactionId, long time, TimeUnit unit);
 
   /**
    * Reports the existence of a transaction for the given transactionId. This method can be used to
@@ -233,7 +233,7 @@ public interface CacheTransactionManager {
    * @since GemFire 6.6.2
    * @see #isSuspended(TransactionId)
    */
-  public boolean exists(TransactionId transactionId);
+  boolean exists(TransactionId transactionId);
 
   /**
    * Reports the existence of a Transaction for this thread
@@ -242,7 +242,7 @@ public interface CacheTransactionManager {
    *
    * @since GemFire 4.0
    */
-  public boolean exists();
+  boolean exists();
 
   /**
    * Returns the transaction identifier for the current thread
@@ -251,7 +251,7 @@ public interface CacheTransactionManager {
    *
    * @since GemFire 4.0
    */
-  public TransactionId getTransactionId();
+  TransactionId getTransactionId();
 
   /**
    * Gets the transaction listener for this Cache.
@@ -261,7 +261,7 @@ public interface CacheTransactionManager {
    * @deprecated as of GemFire 5.0, use {@link #getListeners} instead
    */
   @Deprecated
-  public TransactionListener getListener();
+  TransactionListener getListener();
 
   /**
    * Returns an array of all the transaction listeners on this cache. Modifications to the returned
@@ -270,7 +270,7 @@ public interface CacheTransactionManager {
    * @return the cache's <code>TransactionListener</code>s; an empty array if no listeners
    * @since GemFire 5.0
    */
-  public TransactionListener[] getListeners();
+  TransactionListener[] getListeners();
 
   /**
    * Sets the transaction listener for this Cache.
@@ -282,7 +282,7 @@ public interface CacheTransactionManager {
    * @deprecated as of GemFire 5.0, use {@link #addListener} or {@link #initListeners} instead.
    */
   @Deprecated
-  public TransactionListener setListener(TransactionListener newListener);
+  TransactionListener setListener(TransactionListener newListener);
 
   /**
    * Adds a transaction listener to the end of the list of transaction listeners on this cache.
@@ -291,7 +291,7 @@ public interface CacheTransactionManager {
    * @throws IllegalArgumentException if <code>aListener</code> is null
    * @since GemFire 5.0
    */
-  public void addListener(TransactionListener aListener);
+  void addListener(TransactionListener aListener);
 
   /**
    * Removes a transaction listener from the list of transaction listeners on this cache. Does
@@ -302,7 +302,7 @@ public interface CacheTransactionManager {
    * @throws IllegalArgumentException if <code>aListener</code> is null
    * @since GemFire 5.0
    */
-  public void removeListener(TransactionListener aListener);
+  void removeListener(TransactionListener aListener);
 
   /**
    * Removes all transaction listeners, calling {@link CacheCallback#close} on each of them, and
@@ -312,7 +312,7 @@ public interface CacheTransactionManager {
    * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
    * @since GemFire 5.0
    */
-  public void initListeners(TransactionListener[] newListeners);
+  void initListeners(TransactionListener[] newListeners);
 
   /**
    * Set the TransactionWriter for the cache
@@ -321,7 +321,7 @@ public interface CacheTransactionManager {
    * @see TransactionWriter
    * @since GemFire 6.5
    */
-  public void setWriter(TransactionWriter writer);
+  void setWriter(TransactionWriter writer);
 
   /**
    * Returns the current {@link TransactionWriter}
@@ -330,7 +330,7 @@ public interface CacheTransactionManager {
    * @return the current {@link TransactionWriter}
    * @since GemFire 6.5
    */
-  public TransactionWriter getWriter();
+  TransactionWriter getWriter();
 
   /**
    * Sets whether transactions should be executed in distributed or non-distributed mode. Once set
@@ -340,7 +340,7 @@ public interface CacheTransactionManager {
    *         distributed mode to a different value.
    * @since Geode 1.0
    */
-  public void setDistributed(boolean distributed);
+  void setDistributed(boolean distributed);
 
   /**
    * Returns the execution mode of transactions
@@ -348,5 +348,5 @@ public interface CacheTransactionManager {
    * @return true if distributed, false otherwise.
    * @since Geode 1.0
    */
-  public boolean isDistributed();
+  boolean isDistributed();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
index ae4dcb5..e4af95d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
@@ -58,7 +58,7 @@ public interface CacheWriter<K, V> extends CacheCallback {
    * @see Region#put(Object, Object)
    * @see Region#get(Object)
    */
-  public void beforeUpdate(EntryEvent<K, V> event) throws CacheWriterException;
+  void beforeUpdate(EntryEvent<K, V> event) throws CacheWriterException;
 
   /**
    * Called before an entry is created. Entry creation is initiated by a <code>create</code>, a
@@ -75,7 +75,7 @@ public interface CacheWriter<K, V> extends CacheCallback {
    * @see Region#put(Object, Object)
    * @see Region#get(Object)
    */
-  public void beforeCreate(EntryEvent<K, V> event) throws CacheWriterException;
+  void beforeCreate(EntryEvent<K, V> event) throws CacheWriterException;
 
   /**
    * Called before an entry is destroyed. The entry being destroyed may or may not exist in the
@@ -88,7 +88,7 @@ public interface CacheWriter<K, V> extends CacheCallback {
    *
    * @see Region#destroy(Object)
    */
-  public void beforeDestroy(EntryEvent<K, V> event) throws CacheWriterException;
+  void beforeDestroy(EntryEvent<K, V> event) throws CacheWriterException;
 
   /**
    * Called before a region is destroyed. The <code>CacheWriter</code> will not additionally be
@@ -109,7 +109,7 @@ public interface CacheWriter<K, V> extends CacheCallback {
    *
    * @see Region#destroyRegion()
    */
-  public void beforeRegionDestroy(RegionEvent<K, V> event) throws CacheWriterException;
+  void beforeRegionDestroy(RegionEvent<K, V> event) throws CacheWriterException;
 
   /**
    * Called before a region is cleared. The <code>CacheWriter</code> will not additionally be called
@@ -126,5 +126,5 @@ public interface CacheWriter<K, V> extends CacheCallback {
    *
    * @see Region#clear
    */
-  public void beforeRegionClear(RegionEvent<K, V> event) throws CacheWriterException;
+  void beforeRegionClear(RegionEvent<K, V> event) throws CacheWriterException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java b/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
index 648882e..4e840f4 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
@@ -51,7 +51,7 @@ public interface ClientSession {
    * @param isDurable Whether the interest is durable
    * @throws IllegalStateException if this is not the primary server for the given client
    */
-  public void registerInterest(String regionName, Object keyOfInterest, InterestResultPolicy policy,
+  void registerInterest(String regionName, Object keyOfInterest, InterestResultPolicy policy,
       boolean isDurable);
 
   /**
@@ -67,7 +67,7 @@ public interface ClientSession {
    * @throws IllegalStateException if this is not the primary server for the given client
    * @since GemFire 6.5
    */
-  public void registerInterest(String regionName, Object keyOfInterest, InterestResultPolicy policy,
+  void registerInterest(String regionName, Object keyOfInterest, InterestResultPolicy policy,
       boolean isDurable, boolean receiveValues);
 
   /**
@@ -78,7 +78,7 @@ public interface ClientSession {
    * @param isDurable Whether the interest is durable
    * @throws IllegalStateException if this is not the primary server for the given client
    */
-  public void registerInterestRegex(String regionName, String regex, boolean isDurable);
+  void registerInterestRegex(String regionName, String regex, boolean isDurable);
 
   /**
    * Registers interest in a particular region and regular expression
@@ -91,7 +91,7 @@ public interface ClientSession {
    * @throws IllegalStateException if this is not the primary server for the given client
    * @since GemFire 6.5
    */
-  public void registerInterestRegex(String regionName, String regex, boolean isDurable,
+  void registerInterestRegex(String regionName, String regex, boolean isDurable,
       boolean receiveValues);
 
   /**
@@ -102,7 +102,7 @@ public interface ClientSession {
    * @param isDurable Whether the interest is durable
    * @throws IllegalStateException if this is not the primary server for the given client
    */
-  public void unregisterInterest(String regionName, Object keyOfInterest, boolean isDurable);
+  void unregisterInterest(String regionName, Object keyOfInterest, boolean isDurable);
 
   /**
    * Unregisters interest in a particular region and key
@@ -115,7 +115,7 @@ public interface ClientSession {
    * @throws IllegalStateException if this is not the primary server for the given client
    * @since GemFire 6.5
    */
-  public void unregisterInterest(String regionName, Object keyOfInterest, boolean isDurable,
+  void unregisterInterest(String regionName, Object keyOfInterest, boolean isDurable,
       boolean receiveValues);
 
   /**
@@ -126,7 +126,7 @@ public interface ClientSession {
    * @param isDurable Whether the interest is durable
    * @throws IllegalStateException if this is not the primary server for the given client
    */
-  public void unregisterInterestRegex(String regionName, String regex, boolean isDurable);
+  void unregisterInterestRegex(String regionName, String regex, boolean isDurable);
 
   /**
    * Unregisters interest in a particular region and regular expression
@@ -139,7 +139,7 @@ public interface ClientSession {
    * @throws IllegalStateException if this is not the primary server for the given client
    * @since GemFire 6.5
    */
-  public void unregisterInterestRegex(String regionName, String regex, boolean isDurable,
+  void unregisterInterestRegex(String regionName, String regex, boolean isDurable,
       boolean receiveValues);
 
   /**
@@ -147,5 +147,5 @@ public interface ClientSession {
    *
    * @return whether this server is the primary for this client
    */
-  public boolean isPrimary();
+  boolean isPrimary();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java b/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
index a387044..a03ff51 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
@@ -35,5 +35,5 @@ public interface CustomExpiry<K, V> extends CacheCallback {
    * @param entry the entry to calculate the expiration for
    * @return the expiration to be used, null if the region's defaults should be used.
    */
-  public ExpirationAttributes getExpiry(Region.Entry<K, V> entry);
+  ExpirationAttributes getExpiry(Region.Entry<K, V> entry);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Declarable.java b/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
index 2b54461..6632cb9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
@@ -64,5 +64,5 @@ public interface Declarable {
    * @throws IllegalArgumentException If one of the configuration options in <code>props</code> is
    *         illegal or malformed.
    */
-  public default void init(Properties props) {};
+  default void init(Properties props) {};
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java b/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
index 96f186e..c2954d2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
@@ -42,7 +42,7 @@ public interface DiskStore {
    * @return the name of the DiskStore
    * @see DiskStoreFactory#create
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns true if the disk files are to be automatically compacted.
@@ -50,7 +50,7 @@ public interface DiskStore {
    * @return Returns true if the disk files are to be automatically compacted; false if automatic
    *         compaction is turned off
    */
-  public boolean getAutoCompact();
+  boolean getAutoCompact();
 
   /**
    * Returns the threshold at which an oplog will become compactable. Until it reaches this
@@ -58,7 +58,7 @@ public interface DiskStore {
    * 
    * @return the threshold, as a percentage, at which an oplog is considered compactable.
    */
-  public int getCompactionThreshold();
+  int getCompactionThreshold();
 
   /**
    * Returns true if manual compaction of disk files is allowed on this region. Manual compaction is
@@ -69,21 +69,21 @@ public interface DiskStore {
    *
    * @return Returns true if manual compaction of disk files is allowed on this region.
    */
-  public boolean getAllowForceCompaction();
+  boolean getAllowForceCompaction();
 
   /**
    * Get the maximum size in megabytes a single oplog (operation log) file should be
    *
    * @return the maximum size in megabyte the operations log file can be
    */
-  public long getMaxOplogSize();
+  long getMaxOplogSize();
 
   /**
    * Returns the number of milliseconds that can elapse before unwritten data is written to disk.
    *
    * @return Returns the time interval in milliseconds that can elapse between two writes to disk
    */
-  public long getTimeInterval();
+  long getTimeInterval();
 
   /**
    * Returns the size of the write buffer that this disk store will use when writing data to disk.
@@ -92,19 +92,19 @@ public interface DiskStore {
    *
    * @return Returns the size of the write buffer.
    */
-  public int getWriteBufferSize();
+  int getWriteBufferSize();
 
   /**
    * 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 sizes of the disk directories in megabytes
    */
-  public int[] getDiskDirSizes();
+  int[] getDiskDirSizes();
 
   /**
    * Returns the universally unique identifier for the Disk Store across the GemFire distributed
@@ -114,7 +114,7 @@ public interface DiskStore {
    * @return a UUID uniquely identifying this Disk Store in the GemFire distributed system.
    * @see java.util.UUID
    */
-  public UUID getDiskStoreUUID();
+  UUID getDiskStoreUUID();
 
   /**
    * Returns the maximum number of operations that can be asynchronously queued to be written to
@@ -126,7 +126,7 @@ public interface DiskStore {
    *         to disk.
    *
    */
-  public int getQueueSize();
+  int getQueueSize();
 
   /**
    * Causes any data that is currently in the asynchronous queue to be written to disk. Does not
@@ -134,7 +134,7 @@ public interface DiskStore {
    *
    * @throws DiskAccessException If problems are encounter while writing to disk
    */
-  public void flush();
+  void flush();
 
   /**
    * Asks the disk store to start writing to a new oplog. The old oplog will be asynchronously
@@ -146,7 +146,7 @@ public interface DiskStore {
    *
    * @throws DiskAccessException
    */
-  public void forceRoll();
+  void forceRoll();
 
   /**
    * Allows a disk compaction to be forced on this disk store. The compaction is done even if
@@ -160,7 +160,7 @@ public interface DiskStore {
    *         that no oplogs were ready to be compacted or that a compaction was already in progress.
    * @see #getAllowForceCompaction
    */
-  public boolean forceCompaction();
+  boolean forceCompaction();
 
   /**
    * Destroys this disk store. Removes the disk store from the cache, and removes all files related
@@ -175,7 +175,7 @@ public interface DiskStore {
    * 
    * @since GemFire 8.0
    */
-  public void destroy();
+  void destroy();
 
 
   /**
@@ -184,7 +184,7 @@ public interface DiskStore {
    * @return the warning percent
    * @since GemFire 8.0
    */
-  public float getDiskUsageWarningPercentage();
+  float getDiskUsageWarningPercentage();
 
   /**
    * Returns the critical threshold for disk usage as a percentage of the total disk volume.
@@ -192,19 +192,19 @@ public interface DiskStore {
    * @return the critical percent
    * @since GemFire 8.0
    */
-  public float getDiskUsageCriticalPercentage();
+  float getDiskUsageCriticalPercentage();
 
   /**
    * Sets the value of the disk usage warning percentage.
    * 
    * @param warningPercent the warning percent
    */
-  public void setDiskUsageWarningPercentage(float warningPercent);
+  void setDiskUsageWarningPercentage(float warningPercent);
 
   /**
    * Sets the value of the disk usage critical percentage.
    * 
    * @param criticalPercent the critical percent
    */
-  public void setDiskUsageCriticalPercentage(float criticalPercent);
+  void setDiskUsageCriticalPercentage(float criticalPercent);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
index a21dd8a..a0a4136 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
@@ -33,34 +33,34 @@ public interface DiskStoreFactory {
    * The name of the default disk store is "DEFAULT". This name can be used to redefine the default
    * disk store. Regions that have not had their disk-store-name set will use this disk store.
    */
-  public static final String DEFAULT_DISK_STORE_NAME = "DEFAULT";
+  String DEFAULT_DISK_STORE_NAME = "DEFAULT";
   /**
    * The default setting for auto compaction.
    * <p>
    * Current value: <code>true</code>.
    */
-  public static final boolean DEFAULT_AUTO_COMPACT = true;
+  boolean DEFAULT_AUTO_COMPACT = true;
 
   /**
    * The default compaction threshold.
    * <p>
    * Current value: <code>50</code>.
    */
-  public static final int DEFAULT_COMPACTION_THRESHOLD = 50;
+  int DEFAULT_COMPACTION_THRESHOLD = 50;
 
   /**
    * The default value of the allow force compaction attribute.
    * <p>
    * Current value: <code>false</code>.
    */
-  public static final boolean DEFAULT_ALLOW_FORCE_COMPACTION = false;
+  boolean DEFAULT_ALLOW_FORCE_COMPACTION = false;
 
   /**
    * The default maximum oplog file size in megabytes.
    * <p>
    * Current value: <code>1024</code> which is one gigabyte.
    */
-  public static final long DEFAULT_MAX_OPLOG_SIZE =
+  long DEFAULT_MAX_OPLOG_SIZE =
       Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "DEFAULT_MAX_OPLOG_SIZE", 1024L).longValue(); // 1024
                                                                                                      // ==
                                                                                                      // 1
@@ -79,56 +79,56 @@ public interface DiskStoreFactory {
    * <p>
    * Current value: <code>1000</code>.
    */
-  public static final long DEFAULT_TIME_INTERVAL = 1000; // 1 sec;
+  long DEFAULT_TIME_INTERVAL = 1000; // 1 sec;
 
   /**
    * The default write buffer size.
    * <p>
    * Current value: <code>32768</code>.
    */
-  public static final int DEFAULT_WRITE_BUFFER_SIZE = 32 * 1024;
+  int DEFAULT_WRITE_BUFFER_SIZE = 32 * 1024;
 
   /**
    * The default maximum number of operations that can be asynchronously queued.
    * <p>
    * Current value: <code>0</code>.
    */
-  public static final int DEFAULT_QUEUE_SIZE = 0;
+  int DEFAULT_QUEUE_SIZE = 0;
 
   /**
    * The default disk directories.
    * <p>
    * Current value: <code>current directory</code>.
    */
-  public static final File[] DEFAULT_DISK_DIRS = new File[] {new File(".")};
+  File[] DEFAULT_DISK_DIRS = new File[] {new File(".")};
 
   /**
    * The default disk directory size in megabytes.
    * <p>
    * Current value: <code>2,147,483,647</code> which is two petabytes.
    */
-  public static final int DEFAULT_DISK_DIR_SIZE = Integer.MAX_VALUE; // unlimited for bug 41863
+  int DEFAULT_DISK_DIR_SIZE = Integer.MAX_VALUE; // unlimited for bug 41863
 
   /**
    * The default disk directory sizes.
    * <p>
    * Current value: {@link #DEFAULT_DISK_DIR_SIZE} which is two petabytes each.
    */
-  public static final int[] DEFAULT_DISK_DIR_SIZES = new int[] {DEFAULT_DISK_DIR_SIZE};
+  int[] DEFAULT_DISK_DIR_SIZES = new int[] {DEFAULT_DISK_DIR_SIZE};
 
   /**
    * The default disk usage warning percentage.
    * <p>
    * Current value: <code>90</code>.
    */
-  public static final float DEFAULT_DISK_USAGE_WARNING_PERCENTAGE = 90;
+  float DEFAULT_DISK_USAGE_WARNING_PERCENTAGE = 90;
 
   /**
    * The default disk usage critical percentage.
    * <p>
    * Current value: <code>99</code>.
    */
-  public static final float DEFAULT_DISK_USAGE_CRITICAL_PERCENTAGE = 99;
+  float DEFAULT_DISK_USAGE_CRITICAL_PERCENTAGE = 99;
 
   /**
    * Set to <code>true</code> to cause the disk files to be automatically compacted. Set to
@@ -137,7 +137,7 @@ public interface DiskStoreFactory {
    * @param isAutoCompact if true then use auto compaction
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setAutoCompact(boolean isAutoCompact);
+  DiskStoreFactory setAutoCompact(boolean isAutoCompact);
 
   /**
    * Sets the threshold at which an oplog will become compactable. Until it reaches this threshold
@@ -150,7 +150,7 @@ public interface DiskStoreFactory {
    *        compactable
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setCompactionThreshold(int compactionThreshold);
+  DiskStoreFactory setCompactionThreshold(int compactionThreshold);
 
   /**
    * Set to <code>true</code> to allow {@link DiskStore#forceCompaction} to be called on regions
@@ -159,7 +159,7 @@ public interface DiskStoreFactory {
    * @param allowForceCompaction if true then allow force compaction.
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setAllowForceCompaction(boolean allowForceCompaction);
+  DiskStoreFactory setAllowForceCompaction(boolean allowForceCompaction);
 
   /**
    * Sets the maximum size in megabytes a single oplog (operation log) is allowed to be. When an
@@ -168,7 +168,7 @@ public interface DiskStoreFactory {
    * @param maxOplogSize maximum size in megabytes for one single oplog file.
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setMaxOplogSize(long maxOplogSize);
+  DiskStoreFactory setMaxOplogSize(long maxOplogSize);
 
   /**
    * Sets the number of milliseconds that can elapse before data written asynchronously is flushed
@@ -181,7 +181,7 @@ public interface DiskStoreFactory {
    *        disk.
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setTimeInterval(long timeInterval);
+  DiskStoreFactory setTimeInterval(long timeInterval);
 
   /**
    * Sets the write buffer size in bytes.
@@ -189,7 +189,7 @@ public interface DiskStoreFactory {
    * @param writeBufferSize write buffer size in bytes.
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setWriteBufferSize(int writeBufferSize);
+  DiskStoreFactory setWriteBufferSize(int writeBufferSize);
 
   /**
    * Sets the maximum number of operations that can be asynchronously queued. Once this many pending
@@ -203,7 +203,7 @@ public interface DiskStoreFactory {
    *        be unlimited.
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setQueueSize(int queueSize);
+  DiskStoreFactory setQueueSize(int queueSize);
 
   /**
    * Sets the directories to which this disk store's data is written. If multiple directories are
@@ -213,7 +213,7 @@ public interface DiskStoreFactory {
    * @param diskDirs directories to put the oplog files.
    * @return a reference to <code>this</code>
    */
-  public DiskStoreFactory setDiskDirs(File[] diskDirs);
+  DiskStoreFactory setDiskDirs(File[] diskDirs);
 
   /**
    * Sets the directories to which this disk store's data is written and also set the sizes in
@@ -226,7 +226,7 @@ public interface DiskStoreFactory {
    * @throws IllegalArgumentException if length of the size array does not match to the length of
    *         the dir array
    */
-  public DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs, int[] diskDirSizes);
+  DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs, int[] diskDirSizes);
 
   /**
    * Sets the warning threshold for disk usage as a percentage of the total disk volume.
@@ -235,7 +235,7 @@ public interface DiskStoreFactory {
    * @return a reference to <code>this</code>
    * @since GemFire 8.0
    */
-  public DiskStoreFactory setDiskUsageWarningPercentage(float warningPercent);
+  DiskStoreFactory setDiskUsageWarningPercentage(float warningPercent);
 
   /**
    * Sets the critical threshold for disk usage as a percentage of the total disk volume.
@@ -244,7 +244,7 @@ public interface DiskStoreFactory {
    * @return a reference to <code>this</code>
    * @since GemFire 8.0
    */
-  public DiskStoreFactory setDiskUsageCriticalPercentage(float criticalPercent);
+  DiskStoreFactory setDiskUsageCriticalPercentage(float criticalPercent);
 
   /**
    * Create a new disk store or find an existing one. In either case the returned disk store's
@@ -255,5 +255,5 @@ public interface DiskStoreFactory {
    * @throws IllegalStateException if a disk store with the given name already exists and its
    *         configuration is not consistent with this factory.
    */
-  public DiskStore create(String name);
+  DiskStore create(String name);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
index 1040475..c8e53df 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
@@ -43,7 +43,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
    * @deprecated as of 6.5 use {@link RegionAttributes#isDiskSynchronous} instead.
    */
   @Deprecated
-  public boolean isSynchronous();
+  boolean isSynchronous();
 
 
   /**
@@ -51,7 +51,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
    * 
    * @return Returns true if the oplogs is to be rolled or false otherwise
    */
-  public boolean isRollOplogs();
+  boolean isRollOplogs();
 
   /**
    * Get the maximum size in megabytes a single oplog (operation log) file should be
@@ -60,7 +60,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
    * @deprecated as of 6.5 use {@link DiskStore#getMaxOplogSize()} instead.
    */
   @Deprecated
-  public int getMaxOplogSize();
+  int getMaxOplogSize();
 
   /**
    * Returns the number of milliseconds that can elapse before unwritten data is written to disk. If
@@ -71,7 +71,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
    * @deprecated as of 6.5 use {@link DiskStore#getTimeInterval()} instead.
    */
   @Deprecated
-  public long getTimeInterval();
+  long getTimeInterval();
 
   /**
    * Returns the number of unwritten bytes of data that can be enqueued before being written to
@@ -82,7 +82,7 @@ public interface DiskWriteAttributes extends java.io.Serializable {
    * @deprecated as of 6.5 use {@link DiskStore#getQueueSize()} instead.
    */
   @Deprecated
-  public long getBytesThreshold();
+  long getBytesThreshold();
 
   /**
    * Two <code>DiskWriteAttributes</code> are equal if the both specify the synchronous writes, or
@@ -91,6 +91,6 @@ public interface DiskWriteAttributes extends java.io.Serializable {
    * 
    * @return true if o is equal else false
    */
-  public boolean equals(Object o);
+  boolean equals(Object o);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
index 5448013..252c4ec 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
@@ -39,7 +39,7 @@ public interface DynamicRegionListener {
    * @param parentRegionName The name of the parent region
    * @param regionName The name of the region being created
    */
-  public void beforeRegionCreate(String parentRegionName, String regionName);
+  void beforeRegionCreate(String parentRegionName, String regionName);
 
   /**
    * Handles the 'after region creation' event of a dynamic region. This method is invoked after the
@@ -47,7 +47,7 @@ public interface DynamicRegionListener {
    *
    * @param event A <code>RegionEvent</code> describing the event
    */
-  public void afterRegionCreate(RegionEvent<?, ?> event);
+  void afterRegionCreate(RegionEvent<?, ?> event);
 
   /**
    * Handles the 'before region destroyed' event of a dynamic region. This method is invoked before
@@ -55,7 +55,7 @@ public interface DynamicRegionListener {
    *
    * @param event A <code>RegionEvent</code> describing the event
    */
-  public void beforeRegionDestroy(RegionEvent<?, ?> event);
+  void beforeRegionDestroy(RegionEvent<?, ?> event);
 
   /**
    * Handles the 'after region destroyed' event of a dynamic region. This method is invoked after
@@ -63,5 +63,5 @@ public interface DynamicRegionListener {
    *
    * @param event A <code>RegionEvent</code> describing the event
    */
-  public void afterRegionDestroy(RegionEvent<?, ?> event);
+  void afterRegionDestroy(RegionEvent<?, ?> event);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
index 88c292d..1062bba 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
@@ -42,7 +42,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * 
    * @return the key
    */
-  public K getKey();
+  K getKey();
 
 
   /**
@@ -57,7 +57,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * @throws IllegalStateException if off-heap and called after the method that was passed this
    *         EntryEvent returns.
    */
-  public V getOldValue();
+  V getOldValue();
 
   /**
    * Returns the serialized form of the value in the cache before this event.
@@ -68,7 +68,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * 
    * @since GemFire 5.5
    */
-  public SerializedCacheValue<V> getSerializedOldValue();
+  SerializedCacheValue<V> getSerializedOldValue();
 
   /**
    * Returns the value in the cache after this event.
@@ -77,7 +77,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * @throws IllegalStateException if off-heap and called after the method that was passed this
    *         EntryEvent returns.
    */
-  public V getNewValue();
+  V getNewValue();
 
   /**
    * Returns the serialized form of the value in the cache after this event.
@@ -88,7 +88,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * 
    * @since GemFire 5.5
    */
-  public SerializedCacheValue<V> getSerializedNewValue();
+  SerializedCacheValue<V> getSerializedNewValue();
 
   /**
    * Gets the TransactionId for this EntryEvent.
@@ -97,7 +97,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    *         if no transaction involved.
    * @since GemFire 4.0
    */
-  public TransactionId getTransactionId();
+  TransactionId getTransactionId();
 
   /**
    * Returns true if this event originated on a client.
@@ -105,7 +105,7 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * @since GemFire 5.7
    * @return true if this event originated on a client.
    */
-  public boolean hasClientOrigin();
+  boolean hasClientOrigin();
 
   /**
    * Returns <code>true</code> if the old value is "available". Not available means that an old
@@ -114,5 +114,5 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> {
    * 
    * @since GemFire 6.0
    */
-  public boolean isOldValueAvailable();
+  boolean isOldValueAvailable();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java b/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
index 197c9ca..e419777 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryOperation.java
@@ -30,7 +30,7 @@ public interface EntryOperation<K, V> {
    * 
    * @return the region associated with this object or the region that raised this event.
    */
-  public Region<K, V> getRegion();
+  Region<K, V> getRegion();
 
   /**
    * Return a description of the operation that triggered this event. It may return null and should
@@ -41,14 +41,14 @@ public interface EntryOperation<K, V> {
    * @since GemFire 6.0
    * @deprecated
    */
-  public Operation getOperation();
+  Operation getOperation();
 
   /**
    * Returns the key.
    * 
    * @return the key
    */
-  public K getKey();
+  K getKey();
 
   /**
    * Returns the callbackArgument passed to the method that generated this event. Provided primarily
@@ -61,7 +61,7 @@ public interface EntryOperation<K, V> {
    *         {@link TransactionListener} and to {@link CacheListener} on the remote side of a
    *         transaction commit.
    */
-  public Object getCallbackArgument();
+  Object getCallbackArgument();
 
   /**
    * Returns <code>true</code> if the callback argument is "available". Not available means that the
@@ -71,7 +71,7 @@ public interface EntryOperation<K, V> {
    * 
    * @since GemFire 6.0
    */
-  public boolean isCallbackArgumentAvailable();
+  boolean isCallbackArgumentAvailable();
 
   /**
    * Returns the value but may return null and should not be used to generate routing object in
@@ -81,5 +81,5 @@ public interface EntryOperation<K, V> {
    * @return the value.
    * @deprecated
    */
-  public V getNewValue();
+  V getNewValue();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
index 79afa5a..3882adb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributesMutator.java
@@ -31,5 +31,5 @@ public interface EvictionAttributesMutator {
    * 
    * @param maximum value used by the {@link EvictionAlgorithm}
    */
-  public void setMaximum(int maximum);
+  void setMaximum(int maximum);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
index 62c7985..3d67344 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionResolver.java
@@ -69,6 +69,5 @@ public interface FixedPartitionResolver<K, V> extends PartitionResolver<K, V> {
    * @return partition-name associated with node which allows mapping of given data to user defined
    *         partition
    */
-  public String getPartitionName(EntryOperation<K, V> opDetails,
-      @Deprecated Set<String> targetPartitions);
+  String getPartitionName(EntryOperation<K, V> opDetails, @Deprecated Set<String> targetPartitions);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java b/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
index f2a75db..a3fec8a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/GemFireCache.java
@@ -48,13 +48,13 @@ public interface GemFireCache extends RegionService {
    * 
    * @return the String name of this cache
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the distributed system used by this cache. This method does not throw
    * {@code CacheClosedException} if the cache is closed.
    */
-  public DistributedSystem getDistributedSystem();
+  DistributedSystem getDistributedSystem();
 
   /**
    * Returns the {@code ResourceManager} for managing this cache's resources.
@@ -62,14 +62,14 @@ public interface GemFireCache extends RegionService {
    * @return {@code ResourceManager} for managing this cache's resources
    * @since GemFire 6.0
    */
-  public ResourceManager getResourceManager();
+  ResourceManager getResourceManager();
 
   /**
    * Sets the "copy on read" feature for cache read operations.
    *
    * @since GemFire 4.0
    */
-  public void setCopyOnRead(boolean copyOnRead);
+  void setCopyOnRead(boolean copyOnRead);
 
   /**
    * Indicates whether the "copy on read" is enabled for this cache.
@@ -78,7 +78,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.0
    */
-  public boolean getCopyOnRead();
+  boolean getCopyOnRead();
 
   /**
    * Returns the {@code RegionAttributes} with the given {@code id} or {@code null} if no
@@ -88,7 +88,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.1
    */
-  public <K, V> RegionAttributes<K, V> getRegionAttributes(String id);
+  <K, V> RegionAttributes<K, V> getRegionAttributes(String id);
 
   /**
    * Sets the {@code id} of the given {@code RegionAttributes}. If a region attributes named
@@ -103,7 +103,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.1
    */
-  public <K, V> void setRegionAttributes(String id, RegionAttributes<K, V> attrs);
+  <K, V> void setRegionAttributes(String id, RegionAttributes<K, V> attrs);
 
   /**
    * Returns an unmodifiable mapping of ids to region attributes. The keys of the map are
@@ -111,7 +111,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.1
    */
-  public <K, V> Map<String, RegionAttributes<K, V>> listRegionAttributes();
+  <K, V> Map<String, RegionAttributes<K, V>> listRegionAttributes();
 
   /**
    * Loads the cache configuration described in a
@@ -130,7 +130,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.1
    */
-  public void loadCacheXml(InputStream is)
+  void loadCacheXml(InputStream is)
       throws TimeoutException, CacheWriterException, GatewayException, RegionExistsException;
 
   /**
@@ -139,7 +139,7 @@ public interface GemFireCache extends RegionService {
    * 
    * @return the logging object
    */
-  public LogWriter getLogger();
+  LogWriter getLogger();
 
   /**
    * Gets the security logging object for GemFire. This method does not throw
@@ -147,7 +147,7 @@ public interface GemFireCache extends RegionService {
    * 
    * @return the security logging object
    */
-  public LogWriter getSecurityLogger();
+  LogWriter getSecurityLogger();
 
   /**
    * Returns the DiskStore by name or {@code null} if no disk store is found.
@@ -156,16 +156,16 @@ public interface GemFireCache extends RegionService {
    *        it exists, is returned.
    * @since GemFire 6.5
    */
-  public DiskStore findDiskStore(String name);
+  DiskStore findDiskStore(String name);
 
   /**
    * create diskstore factory
    * 
    * @since GemFire 6.5
    */
-  public DiskStoreFactory createDiskStoreFactory();
+  DiskStoreFactory createDiskStoreFactory();
 
-  public GatewaySenderFactory createGatewaySenderFactory();
+  GatewaySenderFactory createGatewaySenderFactory();
 
   /**
    * Returns whether { @link PdxInstance} is preferred for PDX types instead of Java object.
@@ -175,7 +175,7 @@ public interface GemFireCache extends RegionService {
    * 
    * @since GemFire 6.6
    */
-  public boolean getPdxReadSerialized();
+  boolean getPdxReadSerialized();
 
   /**
    * Returns the PdxSerializer used by this cache, or null if no PDX serializer is defined.
@@ -184,7 +184,7 @@ public interface GemFireCache extends RegionService {
    * @see CacheFactory#setPdxSerializer(PdxSerializer)
    * @see ClientCacheFactory#setPdxSerializer(PdxSerializer)
    */
-  public PdxSerializer getPdxSerializer();
+  PdxSerializer getPdxSerializer();
 
   /**
    * Returns the disk store used for PDX meta data
@@ -193,7 +193,7 @@ public interface GemFireCache extends RegionService {
    * @see CacheFactory#setPdxDiskStore(String)
    * @see ClientCacheFactory#setPdxDiskStore(String)
    */
-  public String getPdxDiskStore();
+  String getPdxDiskStore();
 
   /**
    * Returns true if the PDX metadata for this cache is persistent
@@ -202,7 +202,7 @@ public interface GemFireCache extends RegionService {
    * @see CacheFactory#setPdxPersistent(boolean)
    * @see ClientCacheFactory#setPdxPersistent(boolean)
    */
-  public boolean getPdxPersistent();
+  boolean getPdxPersistent();
 
   /**
    * Returns true if fields that are not read during PDX deserialization should be ignored during
@@ -212,7 +212,7 @@ public interface GemFireCache extends RegionService {
    * @see CacheFactory#setPdxIgnoreUnreadFields(boolean)
    * @see ClientCacheFactory#setPdxIgnoreUnreadFields(boolean)
    */
-  public boolean getPdxIgnoreUnreadFields();
+  boolean getPdxIgnoreUnreadFields();
 
   /**
    * Get the CacheTransactionManager instance for this Cache.
@@ -223,7 +223,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.0
    */
-  public CacheTransactionManager getCacheTransactionManager();
+  CacheTransactionManager getCacheTransactionManager();
 
   /**
    * Returns the JNDI context associated with the Cache.
@@ -232,7 +232,7 @@ public interface GemFireCache extends RegionService {
    *
    * @since GemFire 4.0
    */
-  public Context getJNDIContext();
+  Context getJNDIContext();
 
   /**
    * Returns the Declarable used to initialize this cache or {@code null} if it does not have an
@@ -240,7 +240,7 @@ public interface GemFireCache extends RegionService {
    * 
    * @since GemFire 6.6
    */
-  public Declarable getInitializer();
+  Declarable getInitializer();
 
   /**
    * Returns the Properties used to initialize the cache initializer or {@code null} if no
@@ -248,5 +248,5 @@ public interface GemFireCache extends RegionService {
    * 
    * @since GemFire 6.6
    */
-  public Properties getInitializerProps();
+  Properties getInitializerProps();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
index cf80ec7..5f7ea1b 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationEvent.java
@@ -32,54 +32,54 @@ public interface InterestRegistrationEvent {
    *
    * @return the name of the region to which this interest event belongs
    */
-  public String getRegionName();
+  String getRegionName();
 
   /**
    * Returns the region to which this interest belongs.
    * 
    * @return the region to which this interest belongs
    */
-  public Region<?, ?> getRegion();
+  Region<?, ?> getRegion();
 
   /**
    * Returns a <code>Set</code> of keys of interest.
    * 
    * @return a <code>Set</code> of keys of interest
    */
-  public Set<?> getKeysOfInterest();
+  Set<?> getKeysOfInterest();
 
   /**
    * Returns this event's interest type.
    *
    * @return this event's interest type
    */
-  public int getInterestType();
+  int getInterestType();
 
   /**
    * Returns whether this event represents a register interest.
    *
    * @return whether this event represents a register interest
    */
-  public boolean isRegister();
+  boolean isRegister();
 
   /**
    * Returns whether this event's interest type is {@link InterestType#KEY}.
    *
    * @return whether this event's interest type is {@link InterestType#KEY}
    */
-  public boolean isKey();
+  boolean isKey();
 
   /**
    * Returns whether this event's interest type is {@link InterestType#REGULAR_EXPRESSION}.
    *
    * @return whether this event's interest type is {@link InterestType#REGULAR_EXPRESSION}
    */
-  public boolean isRegularExpression();
+  boolean isRegularExpression();
 
   /**
    * Returns the {@link ClientSession} that initiated this event
    * 
    * @return the {@link ClientSession} that initiated this event
    */
-  public ClientSession getClientSession();
+  ClientSession getClientSession();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
index cbe55a3..9769ef9 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/InterestRegistrationListener.java
@@ -73,12 +73,12 @@ public interface InterestRegistrationListener extends CacheCallback {
    *
    * @param event the InterestRegistrationEvent
    */
-  public void afterRegisterInterest(InterestRegistrationEvent event);
+  void afterRegisterInterest(InterestRegistrationEvent event);
 
   /**
    * Handles an after unregister interest event.
    *
    * @param event the InterestRegistrationEvent
    */
-  public void afterUnregisterInterest(InterestRegistrationEvent event);
+  void afterUnregisterInterest(InterestRegistrationEvent event);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java b/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
index 84678b9..de567af 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LoaderHelper.java
@@ -44,7 +44,7 @@ public interface LoaderHelper<K, V> {
    * @throws CacheLoaderException If <code>netSearch</code> is attempted on a
    *         {@linkplain org.apache.geode.cache.Scope#LOCAL local} region.
    */
-  public V netSearch(boolean doNetLoad) throws CacheLoaderException, TimeoutException;
+  V netSearch(boolean doNetLoad) throws CacheLoaderException, TimeoutException;
 
   /**
    * Returns the key for the value being loaded.
@@ -52,7 +52,7 @@ public interface LoaderHelper<K, V> {
    * @return the name Object for the object being loaded
    * @see CacheLoader#load(LoaderHelper) load
    */
-  public K getKey();
+  K getKey();
 
   /**
    * Returns the region to which the entry belongs.
@@ -60,7 +60,7 @@ public interface LoaderHelper<K, V> {
    * @return the name of the region for the object being loaded
    * @see CacheLoader#load(LoaderHelper) load
    */
-  public Region<K, V> getRegion();
+  Region<K, V> getRegion();
 
   /**
    * Return the argument object for the load method that was passed in from application code. This
@@ -68,5 +68,5 @@ public interface LoaderHelper<K, V> {
    * 
    * @return the argument or null if one was not supplied
    */
-  public Object getArgument();
+  Object getArgument();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
index 1c9d6a0..e1d8a30 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionAttributes.java
@@ -63,7 +63,7 @@ public interface PartitionAttributes<K, V> {
    * 
    * @return redundantCopies.
    */
-  public int getRedundantCopies();
+  int getRedundantCopies();
 
   /**
    * This method returns the maximum total size of the region in megabytes.
@@ -72,7 +72,7 @@ public interface PartitionAttributes<K, V> {
    * @return total size in megabytes.
    */
   @Deprecated
-  public long getTotalSize();
+  long getTotalSize();
 
   /**
    * This method returns the maximum total size of the region, in megabytes. Default value is
@@ -80,7 +80,7 @@ public interface PartitionAttributes<K, V> {
    * 
    * @return maximum size of the partitioned region, in megabytes
    */
-  public long getTotalMaxMemory();
+  long getTotalMaxMemory();
 
   /**
    * This method returns total number of buckets for a PartitionedRegion. Default number of buckets
@@ -88,20 +88,20 @@ public interface PartitionAttributes<K, V> {
    * 
    * @return total number of buckets for a PartitionedRegion.
    */
-  public int getTotalNumBuckets();
+  int getTotalNumBuckets();
 
   /**
    * This method returns the maximum amount of local memory that can be used by the Region. By
    * default, a PartitionedRegion can contribute 90% of the maximum memory allocated to a VM.
    */
-  public int getLocalMaxMemory();
+  int getLocalMaxMemory();
 
   /**
    * Returns name of the colocated PartitionedRegion's name
    * 
    * @since GemFire 6.0
    */
-  public String getColocatedWith();
+  String getColocatedWith();
 
   /**
    * This method returns local properties. There are currently no local properties defined that are
@@ -111,7 +111,7 @@ public interface PartitionAttributes<K, V> {
    * @return localProperties
    */
   @Deprecated
-  public Properties getLocalProperties();
+  Properties getLocalProperties();
 
   /**
    * This method returns global properties. There are currently no global properties defined that
@@ -122,7 +122,7 @@ public interface PartitionAttributes<K, V> {
    * @return globalProperties
    */
   @Deprecated
-  public Properties getGlobalProperties();
+  Properties getGlobalProperties();
 
   /**
    * Returns the PartitionResolver set for custom partitioning
@@ -130,7 +130,7 @@ public interface PartitionAttributes<K, V> {
    * @return <code>PartitionResolver</code> for the PartitionedRegion
    * @since GemFire 6.0
    */
-  public PartitionResolver<K, V> getPartitionResolver();
+  PartitionResolver<K, V> getPartitionResolver();
 
   /**
    * Returns the delay in milliseconds that existing members will wait before satisfying redundancy
@@ -139,7 +139,7 @@ public interface PartitionAttributes<K, V> {
    * 
    * @since GemFire 6.0
    */
-  public long getRecoveryDelay();
+  long getRecoveryDelay();
 
   /**
    * Returns the delay in milliseconds that a new member will wait before trying to satisfy
@@ -148,7 +148,7 @@ public interface PartitionAttributes<K, V> {
    * 
    * @since GemFire 6.0
    */
-  public long getStartupRecoveryDelay();
+  long getStartupRecoveryDelay();
 
   /**
    * Returns array of PartitionListener{s} configured on this partitioned region
@@ -157,7 +157,7 @@ public interface PartitionAttributes<K, V> {
    * @return PartitionListener configured on this partitioned region
    * @since GemFire 6.5
    */
-  public PartitionListener[] getPartitionListeners();
+  PartitionListener[] getPartitionListeners();
 
   /**
    * Returns <code>FixedPartitionAttributes</code>'s list of local partitions defined on this
@@ -165,6 +165,6 @@ public interface PartitionAttributes<K, V> {
    * 
    * @since GemFire 6.6
    */
-  public List<FixedPartitionAttributes> getFixedPartitionAttributes();
+  List<FixedPartitionAttributes> getFixedPartitionAttributes();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java b/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
index eebc662..3fdb7cb 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/PartitionResolver.java
@@ -69,12 +69,12 @@ public interface PartitionResolver<K, V> extends CacheCallback {
    * @return object associated with entry operation which allows the Partitioned Region to store
    *         associated data together
    */
-  public Object getRoutingObject(EntryOperation<K, V> opDetails);
+  Object getRoutingObject(EntryOperation<K, V> opDetails);
 
   /**
    * Returns the name of the PartitionResolver
    * 
    * @return String name
    */
-  public String getName();
+  String getName();
 }