geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prhomb...@apache.org
Subject [geode] branch develop updated: GEODE-4431: Remove unnecessary modifiers from interfaces in geode-core:internal
Date Wed, 31 Jan 2018 19:41:27 GMT
This is an automated email from the ASF dual-hosted git repository.

prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new a6ac186  GEODE-4431: Remove unnecessary modifiers from interfaces in geode-core:internal
a6ac186 is described below

commit a6ac1863412bbc3beb17e78984408c16202a0d8a
Author: Patrick Rhomberg <PurelyApplied@users.noreply.github.com>
AuthorDate: Wed Jan 31 11:41:22 2018 -0800

    GEODE-4431: Remove unnecessary modifiers from interfaces in geode-core:internal
    
    * This excludes those interfaces in internal.cache, covered in GEODE-4430.
---
 .../apache/geode/internal/ByteBufferWriter.java    |    2 +-
 .../apache/geode/internal/ConnectionWatcher.java   |    4 +-
 .../java/org/apache/geode/internal/DSCODE.java     |  150 +--
 .../geode/internal/DataSerializableFixedID.java    | 1074 ++++++++++----------
 .../java/org/apache/geode/internal/NanoTimer.java  |    2 +-
 .../geode/internal/ObjToByteArraySerializer.java   |    5 +-
 .../apache/geode/internal/OneTaskOnlyExecutor.java |    2 +-
 .../geode/internal/SerializationVersions.java      |    2 +-
 .../apache/geode/internal/VersionedDataStream.java |    2 +-
 .../geode/internal/admin/AdminBridgeServer.java    |    2 +-
 .../org/apache/geode/internal/admin/Alert.java     |   34 +-
 .../apache/geode/internal/admin/AlertListener.java |    2 +-
 .../apache/geode/internal/admin/ApplicationVM.java |    2 +-
 .../org/apache/geode/internal/admin/CacheInfo.java |   24 +-
 .../apache/geode/internal/admin/CacheSnapshot.java |   14 +-
 .../org/apache/geode/internal/admin/DLockInfo.java |   16 +-
 .../apache/geode/internal/admin/EntrySnapshot.java |    2 +-
 .../geode/internal/admin/EntryValueNode.java       |   10 +-
 .../org/apache/geode/internal/admin/GemFireVM.java |   98 +-
 .../geode/internal/admin/GfManagerAgent.java       |   24 +-
 .../org/apache/geode/internal/admin/GfObject.java  |    8 +-
 .../geode/internal/admin/HealthListener.java       |    2 +-
 .../geode/internal/admin/JoinLeaveListener.java    |    6 +-
 .../geode/internal/admin/RegionSnapshot.java       |    2 +-
 .../geode/internal/admin/SnapshotClient.java       |    2 +-
 .../java/org/apache/geode/internal/admin/Stat.java |    6 +-
 .../geode/internal/admin/StatAlertDefinition.java  |   30 +-
 .../apache/geode/internal/admin/StatListener.java  |    4 +-
 .../apache/geode/internal/admin/StatResource.java  |   16 +-
 .../geode/internal/admin/remote/Cancellable.java   |    2 +-
 .../internal/admin/statalerts/StatisticInfo.java   |   18 +-
 .../org/apache/geode/internal/concurrent/AL.java   |   24 +-
 .../geode/internal/concurrent/MapCallback.java     |   31 +-
 .../geode/internal/concurrent/MapResult.java       |    4 +-
 .../internal/datasource/ConnectionPoolCache.java   |    8 +-
 .../internal/datasource/ConnectionProvider.java    |    8 +-
 .../internal/datasource/DataSourceResources.java   |   14 +-
 .../org/apache/geode/internal/i18n/StringId.java   |   10 +-
 .../org/apache/geode/internal/lang/Filter.java     |    2 +-
 .../org/apache/geode/internal/lang/Initable.java   |    2 +-
 .../geode/internal/lang/MutableIdentifiable.java   |    2 +-
 .../org/apache/geode/internal/lang/Orderable.java  |    2 +-
 .../org/apache/geode/internal/lang/Ordered.java    |    4 +-
 .../geode/internal/logging/InternalLogWriter.java  |   40 +-
 .../geode/internal/logging/MergeLogFiles.java      |   12 +-
 .../internal/logging/log4j/GemFireLogger.java      |  171 ++--
 .../geode/internal/logging/log4j/LogMarker.java    |  123 +--
 .../geode/internal/memcached/CommandProcessor.java |    2 +-
 .../geode/internal/offheap/FreeListManager.java    |   10 +-
 .../geode/internal/offheap/LifecycleListener.java  |   13 +-
 .../geode/internal/offheap/MemoryAllocator.java    |   23 +-
 .../apache/geode/internal/offheap/MemoryBlock.java |   24 +-
 .../geode/internal/offheap/MemoryInspector.java    |   14 +-
 .../internal/offheap/MemoryUsageListener.java      |    2 +-
 .../geode/internal/offheap/OffHeapMemoryStats.java |   48 +-
 .../offheap/OutOfOffHeapMemoryListener.java        |    4 +-
 .../apache/geode/internal/offheap/Releasable.java  |    2 +-
 .../org/apache/geode/internal/offheap/Slab.java    |    6 +-
 .../apache/geode/internal/offheap/SlabFactory.java |    2 +-
 .../geode/internal/offheap/StoredObject.java       |   46 +-
 .../geode/internal/sequencelog/SequenceLogger.java |    8 +-
 .../geode/internal/sequencelog/io/Filter.java      |    5 +-
 .../sequencelog/model/GraphReaderCallback.java     |    6 +-
 .../apache/geode/internal/shared/NativeCalls.java  |    4 +-
 .../geode/internal/shared/NativeCallsJNAImpl.java  |    5 +-
 .../geode/internal/size/ObjectGraphSizer.java      |    2 +-
 .../internal/statistics/LocalStatListener.java     |    2 +-
 .../geode/internal/statistics/SampleHandler.java   |    8 +-
 .../internal/statistics/StatArchiveFormat.java     |   74 +-
 .../statistics/StatArchiveHandlerConfig.java       |   14 +-
 .../geode/internal/statistics/StatisticId.java     |    4 +-
 .../internal/statistics/StatisticsListener.java    |    2 +-
 .../internal/statistics/StatisticsManager.java     |   20 +-
 .../statistics/StatisticsNotification.java         |   16 +-
 .../internal/statistics/StatisticsSampler.java     |    8 +-
 .../geode/internal/statistics/VMStatsContract.java |    4 +-
 .../statistics/platform/OsStatisticsFactory.java   |    5 +-
 .../apache/geode/internal/tcp/BaseMsgStreamer.java |   12 +-
 .../geode/internal/tcp/ByteBufferInputStream.java  |    3 +-
 .../apache/geode/internal/tcp/ServerDelegate.java  |    8 +-
 .../geode/internal/util/ObjectIntProcedure.java    |    2 +-
 .../apache/geode/internal/util/Transformer.java    |    2 +-
 .../apache/geode/internal/util/Versionable.java    |    8 +-
 .../concurrent/CustomEntryConcurrentHashMap.java   |   16 +-
 84 files changed, 1211 insertions(+), 1247 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
index 17d6cbe..5de7511 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
@@ -25,5 +25,5 @@ public interface ByteBufferWriter {
    * interface will keep a reference to bb so callers should expect to give up ownership of bb and
    * should not modify it after calling this method.
    */
-  public void write(ByteBuffer bb);
+  void write(ByteBuffer bb);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java b/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
index 71c7285..a0ae3b1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
@@ -26,11 +26,11 @@ public interface ConnectionWatcher {
    * this is invoked with the connecting socket just prior to issuing a connect() call. It can be
    * used to start another thread or task to monitor the connection attempt.
    */
-  public void beforeConnect(Socket socket);
+  void beforeConnect(Socket socket);
 
   /**
    * this is invoked after the connection attempt has finished. It can be used to cancel the task
    * started by beforeConnect
    */
-  public void afterConnect(Socket socket);
+  void afterConnect(Socket socket);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java b/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
index 80bab9a..b918c4d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
@@ -28,9 +28,9 @@ public interface DSCODE {
    * This byte value, -128, has never been used in any GemFire release so far. It might get used in
    * the future to introduce DataSerializer versioning.
    */
-  public static final byte RESERVED_FOR_FUTURE_USE = -128;
+  byte RESERVED_FOR_FUTURE_USE = -128;
 
-  public static final byte ILLEGAL = -127;
+  byte ILLEGAL = -127;
 
   // -126..0 unused
 
@@ -40,28 +40,28 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte DS_FIXED_ID_BYTE = 1;
+  byte DS_FIXED_ID_BYTE = 1;
   /**
    * A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
    * whose id is a single signed short.
    *
    * @since GemFire 5.7
    */
-  public static final byte DS_FIXED_ID_SHORT = 2;
+  byte DS_FIXED_ID_SHORT = 2;
   /**
    * A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
    * whose id is a single signed int.
    *
    * @since GemFire 5.7
    */
-  public static final byte DS_FIXED_ID_INT = 3;
+  byte DS_FIXED_ID_INT = 3;
   /**
    * A header byte meaning that the next element in the stream is a {@link DataSerializableFixedID}
    * whose id is <code>NO_FIXED_ID</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte DS_NO_FIXED_ID = 4;
+  byte DS_NO_FIXED_ID = 4;
 
   /**
    * A header byte meaning that the object was serialized by a user's <code>DataSerializer</code>
@@ -69,7 +69,7 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte USER_CLASS_2 = 5;
+  byte USER_CLASS_2 = 5;
 
   /**
    * A header byte meaning that the object was serialized by a user's <code>DataSerializer</code>
@@ -77,7 +77,7 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte USER_CLASS_4 = 6;
+  byte USER_CLASS_4 = 6;
 
   // TypeIds 7 and 8 reserved for use by C# Serializable and XmlSerializable.
 
@@ -86,14 +86,14 @@ public interface DSCODE {
   /**
    * A header byte meaning that the next element in the stream is a <code>LinkedList</code>.
    */
-  public static final byte LINKED_LIST = 10;
+  byte LINKED_LIST = 10;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Properties</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte PROPERTIES = 11;
+  byte PROPERTIES = 11;
 
   // 12..16 unused
 
@@ -101,24 +101,24 @@ public interface DSCODE {
    * Codes for the primitive classes, which cannot be recreated with
    * <code>Class.forName(String,boolean,ClassLoader)</code> like other classes
    */
-  public static final byte BOOLEAN_TYPE = 17;
-  public static final byte CHARACTER_TYPE = 18;
-  public static final byte BYTE_TYPE = 19;
-  public static final byte SHORT_TYPE = 20;
-  public static final byte INTEGER_TYPE = 21;
-  public static final byte LONG_TYPE = 22;
-  public static final byte FLOAT_TYPE = 23;
-  public static final byte DOUBLE_TYPE = 24;
-  public static final byte VOID_TYPE = 25;
+  byte BOOLEAN_TYPE = 17;
+  byte CHARACTER_TYPE = 18;
+  byte BYTE_TYPE = 19;
+  byte SHORT_TYPE = 20;
+  byte INTEGER_TYPE = 21;
+  byte LONG_TYPE = 22;
+  byte FLOAT_TYPE = 23;
+  byte DOUBLE_TYPE = 24;
+  byte VOID_TYPE = 25;
 
   /**
    * @since GemFire 5.7
    */
-  public static final byte BOOLEAN_ARRAY = 26;
+  byte BOOLEAN_ARRAY = 26;
   /**
    * @since GemFire 5.7
    */
-  public static final byte CHAR_ARRAY = 27;
+  byte CHAR_ARRAY = 27;
 
   // 28..36 unused
 
@@ -128,7 +128,7 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte USER_DATA_SERIALIZABLE_4 = 37;
+  byte USER_DATA_SERIALIZABLE_4 = 37;
 
   /**
    * A header byte meaning that a DataSerializable that was registered with the Instantiator was
@@ -136,213 +136,213 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte USER_DATA_SERIALIZABLE_2 = 38;
+  byte USER_DATA_SERIALIZABLE_2 = 38;
 
   /**
    * A header byte meaning that a DataSerializable that was registered with the Instantiator was
    * data serialized using a single byte for its ID.
    */
-  public static final byte USER_DATA_SERIALIZABLE = 39;
+  byte USER_DATA_SERIALIZABLE = 39;
 
   /**
    * A header byte meaning that the object was serialized by a user's <code>DataSerializer</code>.
    */
-  public static final byte USER_CLASS = 40;
+  byte USER_CLASS = 40;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>null</code>
    */
-  public static final byte NULL = 41;
+  byte NULL = 41;
 
   /**
    * A header byte meaning that the next element in the stream is a String
    */
-  public static final byte STRING = 42;
+  byte STRING = 42;
 
   /**
    * A header byte meaning that the next element in the stream is a (non-primitive) Class
    */
-  public static final byte CLASS = 43;
+  byte CLASS = 43;
 
   /**
    * A header byte meaning that the next element in the stream is a serialized object
    */
-  public static final byte SERIALIZABLE = 44;
+  byte SERIALIZABLE = 44;
 
   /**
    * A header byte meaning that the next element in the stream is a DataSerializable object
    */
-  public static final byte DATA_SERIALIZABLE = 45;
+  byte DATA_SERIALIZABLE = 45;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>byte</code> array.
    */
-  public static final byte BYTE_ARRAY = 46;
+  byte BYTE_ARRAY = 46;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>short</code> array.
    */
-  public static final byte SHORT_ARRAY = 47;
+  byte SHORT_ARRAY = 47;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>int</code> array.
    */
-  public static final byte INT_ARRAY = 48;
+  byte INT_ARRAY = 48;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>long</code> array.
    */
-  public static final byte LONG_ARRAY = 49;
+  byte LONG_ARRAY = 49;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>float</code> array.
    */
-  public static final byte FLOAT_ARRAY = 50;
+  byte FLOAT_ARRAY = 50;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>double</code> array.
    */
-  public static final byte DOUBLE_ARRAY = 51;
+  byte DOUBLE_ARRAY = 51;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Object</code> array.
    */
-  public static final byte OBJECT_ARRAY = 52;
+  byte OBJECT_ARRAY = 52;
 
   /**
    * A header boolean meaning that the next element in the stream is a <code>Boolean</code>.
    */
-  public static final byte BOOLEAN = 53;
+  byte BOOLEAN = 53;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Character</code>.
    */
-  public static final byte CHARACTER = 54;
+  byte CHARACTER = 54;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Byte</code>.
    */
-  public static final byte BYTE = 55;
+  byte BYTE = 55;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Short</code>.
    */
-  public static final byte SHORT = 56;
+  byte SHORT = 56;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Integer</code>.
    */
-  public static final byte INTEGER = 57;
+  byte INTEGER = 57;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Long</code>.
    */
-  public static final byte LONG = 58;
+  byte LONG = 58;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Float</code>.
    */
-  public static final byte FLOAT = 59;
+  byte FLOAT = 59;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Double</code>.
    */
-  public static final byte DOUBLE = 60;
+  byte DOUBLE = 60;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Date</code>.
    */
-  public static final byte DATE = 61;
+  byte DATE = 61;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>InetAddress</code>.
    */
-  public static final byte INET_ADDRESS = 62;
+  byte INET_ADDRESS = 62;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>File</code>.
    */
-  public static final byte FILE = 63;
+  byte FILE = 63;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>String</code> array.
    */
-  public static final byte STRING_ARRAY = 64;
+  byte STRING_ARRAY = 64;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>ArrayList</code>.
    */
-  public static final byte ARRAY_LIST = 65;
+  byte ARRAY_LIST = 65;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>HashSet</code>.
    */
-  public static final byte HASH_SET = 66;
+  byte HASH_SET = 66;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>HashMap</code>.
    */
-  public static final byte HASH_MAP = 67;
+  byte HASH_MAP = 67;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>TimeUnit</code>.
    */
-  public static final byte TIME_UNIT = 68;
+  byte TIME_UNIT = 68;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>null</code>
    * <code>String</code>.
    */
-  public static final byte NULL_STRING = 69;
+  byte NULL_STRING = 69;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Hashtable</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte HASH_TABLE = 70;
+  byte HASH_TABLE = 70;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Vector</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte VECTOR = 71;
+  byte VECTOR = 71;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>IdentityHashMap</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte IDENTITY_HASH_MAP = 72;
+  byte IDENTITY_HASH_MAP = 72;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>LinkedHashSet</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte LINKED_HASH_SET = 73;
+  byte LINKED_HASH_SET = 73;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>Stack</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte STACK = 74;
+  byte STACK = 74;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>TreeMap</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte TREE_MAP = 75;
+  byte TREE_MAP = 75;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>TreeSet</code>.
    *
    * @since GemFire 5.7
    */
-  public static final byte TREE_SET = 76;
+  byte TREE_SET = 76;
 
   // 75..86 unused
 
@@ -350,7 +350,7 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is a buffer of 1-byte characters to
    * turn into a String whose length is <= 0xFFFF
    */
-  public static final byte STRING_BYTES = 87;
+  byte STRING_BYTES = 87;
 
   /**
    * A header byte meaning that the next element in the stream is a buffer of 1-byte characters to
@@ -358,7 +358,7 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte HUGE_STRING_BYTES = 88;
+  byte HUGE_STRING_BYTES = 88;
 
   /**
    * A header byte meaning that the next element in the stream is a buffer of 2-byte characters to
@@ -366,14 +366,14 @@ public interface DSCODE {
    *
    * @since GemFire 5.7
    */
-  public static final byte HUGE_STRING = 89;
+  byte HUGE_STRING = 89;
 
   // 90 unused
 
   /**
    * A header byte meaning that the next element in the stream is a <code>byte[][]</code>.
    */
-  public static final byte ARRAY_OF_BYTE_ARRAYS = 91;
+  byte ARRAY_OF_BYTE_ARRAYS = 91;
 
   // 92 unused
 
@@ -382,7 +382,7 @@ public interface DSCODE {
    *
    * @since GemFire 6.6
    */
-  public static final byte PDX = 93;
+  byte PDX = 93;
 
   /**
    * A header byte meaning that the next element in the stream is an enum whose type is defined in
@@ -390,20 +390,20 @@ public interface DSCODE {
    *
    * @since GemFire 6.6.2
    */
-  public static final byte PDX_ENUM = 94;
+  byte PDX_ENUM = 94;
 
   /**
    * java.math.BigInteger
    *
    * @since GemFire 6.6.2
    */
-  public static final byte BIG_INTEGER = 95;
+  byte BIG_INTEGER = 95;
   /**
    * java.math.BigDecimal
    *
    * @since GemFire 6.6.2
    */
-  public static final byte BIG_DECIMAL = 96;
+  byte BIG_DECIMAL = 96;
 
   /**
    * This code can only be used by PDX. It can't be used for normal DataSerializer writeObject
@@ -412,41 +412,41 @@ public interface DSCODE {
    *
    * @since GemFire 6.6
    */
-  public static final byte CONCURRENT_HASH_MAP = 97;
+  byte CONCURRENT_HASH_MAP = 97;
 
   /**
    * java.util.UUID
    *
    * @since GemFire 6.6.2
    */
-  public static final byte UUID = 98;
+  byte UUID = 98;
   /**
    * java.sql.Timestamp
    *
    * @since GemFire 6.6.2
    */
-  public static final byte TIMESTAMP = 99;
+  byte TIMESTAMP = 99;
 
   /**
    * Used for enums that need to always be deserialized into their enum domain class.
    *
    * @since GemFire 6.6.2
    */
-  public static final byte GEMFIRE_ENUM = 100;
+  byte GEMFIRE_ENUM = 100;
   /**
    * Used for enums that need to be encoded inline because the pdx registry may not be available.
    * During deserialization this type of enum may be deserialized as a PdxInstance.
    *
    * @since GemFire 6.6.2
    */
-  public static final byte PDX_INLINE_ENUM = 101;
+  byte PDX_INLINE_ENUM = 101;
 
   /**
    * Used for wildcard searches in soplogs with composite keys.
    *
    * @since GemFire 8.0
    */
-  public static final byte WILDCARD = 102;
+  byte WILDCARD = 102;
 
   // 103..127 unused
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
index ce5b3df..ed8688f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
@@ -71,203 +71,203 @@ public interface DataSerializableFixedID extends SerializationVersions {
    *
    * In DSFIDFactory, add a case for the new class case FOO: return new FOO(in);
    */
-  public static final short FINAL_CHECK_PASSED_MESSAGE = -158;
-  public static final short NETWORK_PARTITION_MESSAGE = -157;
-  public static final short SUSPECT_MEMBERS_MESSAGE = -156;
-
-  public static final short HEARTBEAT_RESPONSE = -155;
-  public static final short HEARTBEAT_REQUEST = -154;
-  public static final short REMOVE_MEMBER_REQUEST = -153;
-
-  public static final short LEAVE_REQUEST_MESSAGE = -152;
-
-  public static final short VIEW_ACK_MESSAGE = -151;
-  public static final short INSTALL_VIEW_MESSAGE = -150;
-  public static final short GMSMEMBER = -149;
-  public static final short NETVIEW = -148;
-  public static final short GET_VIEW_REQ = -147;
-  public static final short GET_VIEW_RESP = -146;
-
-  public static final short FIND_COORDINATOR_REQ = -145;
-  public static final short FIND_COORDINATOR_RESP = -144;
-
-  public static final short JOIN_RESPONSE = -143;
-  public static final short JOIN_REQUEST = -142;
-
-  public static final short SNAPPY_COMPRESSED_CACHED_DESERIALIZABLE = -140;
-
-  public static final short GATEWAY_EVENT_IMPL = -136;
-  public static final short GATEWAY_SENDER_EVENT_CALLBACK_ARGUMENT = -135;
-  public static final short GATEWAY_SENDER_EVENT_IMPL = -134;
-
-  public static final short CLIENT_TOMBSTONE_MESSAGE = -133;
-
-  public static final short R_REGION_OP_REPLY = -132;
-  public static final short R_REGION_OP = -131;
-
-  public static final short WAIT_FOR_VIEW_INSTALLATION = -130;
-
-  public static final short DISPATCHED_AND_CURRENT_EVENTS = -129;
-
-  public static final byte DLOCK_QUERY_MESSAGE = -128;
-  public static final byte DLOCK_QUERY_REPLY = -127;
-
-  public static final byte CLIENT_HEALTH_STATS = -126;
-  public static final byte PR_MANAGE_BACKUP_BUCKET_MESSAGE = -125;
-  public static final byte PR_MANAGE_BACKUP_BUCKET_REPLY_MESSAGE = -124;
-  public static final byte SIZED_BASED_LOAD_PROBE = -123;
-
-  public static final byte CLIENT_PING_MESSAGE_IMPL = -122;
-
-  public static final byte REMOTE_PUTALL_REPLY_MESSAGE = -121;
-  public static final byte VERSION_TAG = -120;
-
-  public static final byte REMOTE_PUTALL_MESSAGE = -119;
-
-  public static final byte ADD_CACHESERVER_PROFILE_UPDATE = -118;
-  public static final byte SERVER_INTEREST_REGISTRATION_MESSAGE = -117;
-  public static final byte FILTER_PROFILE_UPDATE = -116;
-  public static final byte JTA_AFTER_COMPLETION_MESSAGE = -115;
-  public static final byte JTA_BEFORE_COMPLETION_MESSAGE = -114;
-  public static final byte INVALIDATE_PARTITIONED_REGION_MESSAGE = -113;
-  public static final byte TX_REMOTE_COMMIT_MESSAGE = -112;
-  public static final byte TX_REMOTE_ROLLBACK_MESSAGE = -111;
-  public static final byte PR_PUTALL_REPLY_MESSAGE = -110;
-  public static final byte PR_PUTALL_MESSAGE = -109;
-  public static final byte RESOURCE_PROFILE_MESSAGE = -108;
-  public static final byte RESOURCE_MANAGER_PROFILE = -107;
-  public static final byte PR_CREATE_BUCKET_MESSAGE = -106;
-  public static final byte PR_CREATE_BUCKET_REPLY_MESSAGE = -105;
-  public static final byte DISTRIBUTED_REGION_FUNCTION_MESSAGE = -104;
-  public static final byte DISTRIBUTED_REGION_FUNCTION_REPLY_MESSAGE = -103;
-
-  public static final byte MEMBER_FUNCTION_MESSAGE = -102;
-  public static final byte MEMBER_FUNCTION_REPLY_MESSAGE = -101;
-  public static final byte PARTITION_REGION_CONFIG = -100;
-  public static final byte PR_FETCH_KEYS_REPLY_MESSAGE = -99;
-  public static final byte PR_DUMP_B2N_REGION_MSG = -98;
-  public static final byte PR_DUMP_B2N_REPLY_MESSAGE = -97;
-  public static final byte PR_INVALIDATE_MESSAGE = -96;
-  public static final byte PR_INVALIDATE_REPLY_MESSAGE = -95;
-  public static final byte PR_FUNCTION_MESSAGE = -94;
-  public static final byte PR_FUNCTION_REPLY_MESSAGE = -93;
-
-  public static final byte PROFILES_REPLY_MESSAGE = -92;
-  public static final byte CACHE_SERVER_PROFILE = -91;
-  public static final byte CONTROLLER_PROFILE = -90;
-
-  public static final byte CREATE_REGION_MESSAGE = -89;
-  public static final byte DESTROY_PARTITIONED_REGION_MESSAGE = -88;
-  public static final byte COMMIT_PROCESS_QUERY_MESSAGE = -87;
-  public static final byte COMMIT_PROCESS_QUERY_REPLY_MESSAGE = -86;
-  public static final byte DESTROY_REGION_WITH_CONTEXT_MESSAGE = -85;
-  public static final byte PUT_ALL_MESSAGE = -84;
-  public static final byte CLEAR_REGION_MESSAGE = -83;
-  public static final byte INVALIDATE_REGION_MESSAGE = -82;
-  public static final byte STATE_MARKER_MESSAGE = -80;
-  public static final byte STATE_STABILIZATION_MESSAGE = -79;
-  public static final byte STATE_STABILIZED_MESSAGE = -78;
-  public static final byte CLIENT_MARKER_MESSAGE_IMPL = -77;
-  public static final byte TX_LOCK_UPDATE_PARTICIPANTS_MESSAGE = -76;
-  public static final byte TX_ORIGINATOR_RECOVERY_MESSAGE = -75;
-  public static final byte TX_ORIGINATOR_RECOVERY_REPLY_MESSAGE = -74;
-  public static final byte QUEUE_REMOVAL_MESSAGE = -73;
-  public static final byte DLOCK_RECOVER_GRANTOR_MESSAGE = -72;
-  public static final byte DLOCK_RECOVER_GRANTOR_REPLY_MESSAGE = -71;
-  public static final byte NON_GRANTOR_DESTROYED_REPLY_MESSAGE = -70;
-  public static final byte TOMBSTONE_MESSAGE = -69;
-  public static final byte IDS_REGISTRATION_MESSAGE = -68;
-  public static final byte TX_LOCK_UPDATE_PARTICIPANTS_REPLY_MESSAGE = -67;
-  public static final byte STREAMING_REPLY_MESSAGE = -66;
-  public static final byte PREFER_BYTES_CACHED_DESERIALIZABLE = -65;
-  public static final byte VM_CACHED_DESERIALIZABLE = -64;
-  public static final byte GATEWAY_EVENT_IMPL_66 = -63;
-  public static final byte SUSPEND_LOCKING_TOKEN = -62;
-  public static final byte OBJECT_TYPE_IMPL = -61;
-  public static final byte STRUCT_TYPE_IMPL = -60;
-  public static final byte COLLECTION_TYPE_IMPL = -59;
-  public static final byte TX_LOCK_BATCH = -58;
-  public static final byte STORE_ALL_CACHED_DESERIALIZABLE = -57;
-  public static final byte GATEWAY_EVENT_CALLBACK_ARGUMENT = -56;
-  public static final byte MAP_TYPE_IMPL = -55;
-  public static final byte LOCATOR_LIST_REQUEST = -54;
-  public static final byte CLIENT_CONNECTION_REQUEST = -53;
-  public static final byte QUEUE_CONNECTION_REQUEST = -52;
-  public static final byte LOCATOR_LIST_RESPONSE = -51;
-  public static final byte CLIENT_CONNECTION_RESPONSE = -50;
-  public static final byte QUEUE_CONNECTION_RESPONSE = -49;
-  public static final byte CLIENT_REPLACEMENT_REQUEST = -48;
-
-  public static final byte INTEREST_EVENT_MESSAGE = -47;
-  public static final byte INTEREST_EVENT_REPLY_MESSAGE = -46;
-  public static final byte CLIENT_BLACKLIST_MESSAGE = -45;
-  public static final byte REMOVE_CLIENT_FROM_BLACKLIST_MESSAGE = -44;
-  public static final byte GET_ALL_SERVERS_REQUEST = -43;
-  public static final byte GET_ALL_SERVRES_RESPONSE = -42;
-
-  public static final byte FIND_REMOTE_TX_REPLY = -41;
-  public static final byte FIND_REMOTE_TX_MESSAGE = -40;
-
-  public static final byte R_REMOTE_COMMIT_REPLY_MESSAGE = -39;
-
-  public static final byte R_FETCH_KEYS_REPLY = -38;
-  public static final byte R_FETCH_KEYS_MESSAGE = -37;
-
-  public static final byte R_SIZE_MESSAGE = -36;
-  public static final byte R_SIZE_REPLY_MESSAGE = -35;
-
-  public static final byte R_FETCH_ENTRY_REPLY_MESSAGE = -34;
-  public static final byte R_FETCH_ENTRY_MESSAGE = -33;
-  public static final byte R_DESTROY_MESSAGE = -32;
-  public static final byte R_INVALIDATE_MESSAGE = -31;
-  public static final byte R_INVALIDATE_REPLY_MESSAGE = -30;
-
-  public static final byte R_PUT_MESSAGE = -29;
-  public static final byte R_PUT_REPLY_MESSAGE = -28;
-
-  public static final byte R_CONTAINS_MESSAGE = -27;
-  public static final byte R_CONTAINS_REPLY_MESSAGE = -26;
-
-  public static final byte R_GET_MESSAGE = -24;
-  public static final byte R_GET_REPLY_MESSAGE = -25;
-
-  public static final byte DURABLE_CLIENT_INFO_RESPONSE = -23;
-
-  public static final byte DURABLE_CLIENT_INFO_REQUEST = -22;
-
-  public static final byte CLIENT_INTEREST_MESSAGE = -21;
-
-  public static final byte LATEST_LAST_ACCESS_TIME_MESSAGE = -20;
+  short FINAL_CHECK_PASSED_MESSAGE = -158;
+  short NETWORK_PARTITION_MESSAGE = -157;
+  short SUSPECT_MEMBERS_MESSAGE = -156;
+
+  short HEARTBEAT_RESPONSE = -155;
+  short HEARTBEAT_REQUEST = -154;
+  short REMOVE_MEMBER_REQUEST = -153;
+
+  short LEAVE_REQUEST_MESSAGE = -152;
+
+  short VIEW_ACK_MESSAGE = -151;
+  short INSTALL_VIEW_MESSAGE = -150;
+  short GMSMEMBER = -149;
+  short NETVIEW = -148;
+  short GET_VIEW_REQ = -147;
+  short GET_VIEW_RESP = -146;
+
+  short FIND_COORDINATOR_REQ = -145;
+  short FIND_COORDINATOR_RESP = -144;
+
+  short JOIN_RESPONSE = -143;
+  short JOIN_REQUEST = -142;
+
+  short SNAPPY_COMPRESSED_CACHED_DESERIALIZABLE = -140;
+
+  short GATEWAY_EVENT_IMPL = -136;
+  short GATEWAY_SENDER_EVENT_CALLBACK_ARGUMENT = -135;
+  short GATEWAY_SENDER_EVENT_IMPL = -134;
+
+  short CLIENT_TOMBSTONE_MESSAGE = -133;
+
+  short R_REGION_OP_REPLY = -132;
+  short R_REGION_OP = -131;
+
+  short WAIT_FOR_VIEW_INSTALLATION = -130;
+
+  short DISPATCHED_AND_CURRENT_EVENTS = -129;
+
+  byte DLOCK_QUERY_MESSAGE = -128;
+  byte DLOCK_QUERY_REPLY = -127;
+
+  byte CLIENT_HEALTH_STATS = -126;
+  byte PR_MANAGE_BACKUP_BUCKET_MESSAGE = -125;
+  byte PR_MANAGE_BACKUP_BUCKET_REPLY_MESSAGE = -124;
+  byte SIZED_BASED_LOAD_PROBE = -123;
+
+  byte CLIENT_PING_MESSAGE_IMPL = -122;
+
+  byte REMOTE_PUTALL_REPLY_MESSAGE = -121;
+  byte VERSION_TAG = -120;
+
+  byte REMOTE_PUTALL_MESSAGE = -119;
+
+  byte ADD_CACHESERVER_PROFILE_UPDATE = -118;
+  byte SERVER_INTEREST_REGISTRATION_MESSAGE = -117;
+  byte FILTER_PROFILE_UPDATE = -116;
+  byte JTA_AFTER_COMPLETION_MESSAGE = -115;
+  byte JTA_BEFORE_COMPLETION_MESSAGE = -114;
+  byte INVALIDATE_PARTITIONED_REGION_MESSAGE = -113;
+  byte TX_REMOTE_COMMIT_MESSAGE = -112;
+  byte TX_REMOTE_ROLLBACK_MESSAGE = -111;
+  byte PR_PUTALL_REPLY_MESSAGE = -110;
+  byte PR_PUTALL_MESSAGE = -109;
+  byte RESOURCE_PROFILE_MESSAGE = -108;
+  byte RESOURCE_MANAGER_PROFILE = -107;
+  byte PR_CREATE_BUCKET_MESSAGE = -106;
+  byte PR_CREATE_BUCKET_REPLY_MESSAGE = -105;
+  byte DISTRIBUTED_REGION_FUNCTION_MESSAGE = -104;
+  byte DISTRIBUTED_REGION_FUNCTION_REPLY_MESSAGE = -103;
+
+  byte MEMBER_FUNCTION_MESSAGE = -102;
+  byte MEMBER_FUNCTION_REPLY_MESSAGE = -101;
+  byte PARTITION_REGION_CONFIG = -100;
+  byte PR_FETCH_KEYS_REPLY_MESSAGE = -99;
+  byte PR_DUMP_B2N_REGION_MSG = -98;
+  byte PR_DUMP_B2N_REPLY_MESSAGE = -97;
+  byte PR_INVALIDATE_MESSAGE = -96;
+  byte PR_INVALIDATE_REPLY_MESSAGE = -95;
+  byte PR_FUNCTION_MESSAGE = -94;
+  byte PR_FUNCTION_REPLY_MESSAGE = -93;
+
+  byte PROFILES_REPLY_MESSAGE = -92;
+  byte CACHE_SERVER_PROFILE = -91;
+  byte CONTROLLER_PROFILE = -90;
+
+  byte CREATE_REGION_MESSAGE = -89;
+  byte DESTROY_PARTITIONED_REGION_MESSAGE = -88;
+  byte COMMIT_PROCESS_QUERY_MESSAGE = -87;
+  byte COMMIT_PROCESS_QUERY_REPLY_MESSAGE = -86;
+  byte DESTROY_REGION_WITH_CONTEXT_MESSAGE = -85;
+  byte PUT_ALL_MESSAGE = -84;
+  byte CLEAR_REGION_MESSAGE = -83;
+  byte INVALIDATE_REGION_MESSAGE = -82;
+  byte STATE_MARKER_MESSAGE = -80;
+  byte STATE_STABILIZATION_MESSAGE = -79;
+  byte STATE_STABILIZED_MESSAGE = -78;
+  byte CLIENT_MARKER_MESSAGE_IMPL = -77;
+  byte TX_LOCK_UPDATE_PARTICIPANTS_MESSAGE = -76;
+  byte TX_ORIGINATOR_RECOVERY_MESSAGE = -75;
+  byte TX_ORIGINATOR_RECOVERY_REPLY_MESSAGE = -74;
+  byte QUEUE_REMOVAL_MESSAGE = -73;
+  byte DLOCK_RECOVER_GRANTOR_MESSAGE = -72;
+  byte DLOCK_RECOVER_GRANTOR_REPLY_MESSAGE = -71;
+  byte NON_GRANTOR_DESTROYED_REPLY_MESSAGE = -70;
+  byte TOMBSTONE_MESSAGE = -69;
+  byte IDS_REGISTRATION_MESSAGE = -68;
+  byte TX_LOCK_UPDATE_PARTICIPANTS_REPLY_MESSAGE = -67;
+  byte STREAMING_REPLY_MESSAGE = -66;
+  byte PREFER_BYTES_CACHED_DESERIALIZABLE = -65;
+  byte VM_CACHED_DESERIALIZABLE = -64;
+  byte GATEWAY_EVENT_IMPL_66 = -63;
+  byte SUSPEND_LOCKING_TOKEN = -62;
+  byte OBJECT_TYPE_IMPL = -61;
+  byte STRUCT_TYPE_IMPL = -60;
+  byte COLLECTION_TYPE_IMPL = -59;
+  byte TX_LOCK_BATCH = -58;
+  byte STORE_ALL_CACHED_DESERIALIZABLE = -57;
+  byte GATEWAY_EVENT_CALLBACK_ARGUMENT = -56;
+  byte MAP_TYPE_IMPL = -55;
+  byte LOCATOR_LIST_REQUEST = -54;
+  byte CLIENT_CONNECTION_REQUEST = -53;
+  byte QUEUE_CONNECTION_REQUEST = -52;
+  byte LOCATOR_LIST_RESPONSE = -51;
+  byte CLIENT_CONNECTION_RESPONSE = -50;
+  byte QUEUE_CONNECTION_RESPONSE = -49;
+  byte CLIENT_REPLACEMENT_REQUEST = -48;
+
+  byte INTEREST_EVENT_MESSAGE = -47;
+  byte INTEREST_EVENT_REPLY_MESSAGE = -46;
+  byte CLIENT_BLACKLIST_MESSAGE = -45;
+  byte REMOVE_CLIENT_FROM_BLACKLIST_MESSAGE = -44;
+  byte GET_ALL_SERVERS_REQUEST = -43;
+  byte GET_ALL_SERVRES_RESPONSE = -42;
+
+  byte FIND_REMOTE_TX_REPLY = -41;
+  byte FIND_REMOTE_TX_MESSAGE = -40;
+
+  byte R_REMOTE_COMMIT_REPLY_MESSAGE = -39;
+
+  byte R_FETCH_KEYS_REPLY = -38;
+  byte R_FETCH_KEYS_MESSAGE = -37;
+
+  byte R_SIZE_MESSAGE = -36;
+  byte R_SIZE_REPLY_MESSAGE = -35;
+
+  byte R_FETCH_ENTRY_REPLY_MESSAGE = -34;
+  byte R_FETCH_ENTRY_MESSAGE = -33;
+  byte R_DESTROY_MESSAGE = -32;
+  byte R_INVALIDATE_MESSAGE = -31;
+  byte R_INVALIDATE_REPLY_MESSAGE = -30;
+
+  byte R_PUT_MESSAGE = -29;
+  byte R_PUT_REPLY_MESSAGE = -28;
+
+  byte R_CONTAINS_MESSAGE = -27;
+  byte R_CONTAINS_REPLY_MESSAGE = -26;
+
+  byte R_GET_MESSAGE = -24;
+  byte R_GET_REPLY_MESSAGE = -25;
+
+  byte DURABLE_CLIENT_INFO_RESPONSE = -23;
+
+  byte DURABLE_CLIENT_INFO_REQUEST = -22;
+
+  byte CLIENT_INTEREST_MESSAGE = -21;
+
+  byte LATEST_LAST_ACCESS_TIME_MESSAGE = -20;
 
   // IDs -19 .. -16 are not used
 
   /**
    * A header byte meaning that the next element in the stream is a <code>VMIdProfile</code>.
    */
-  public static final byte VMID_PROFILE_MESSAGE = -15;
+  byte VMID_PROFILE_MESSAGE = -15;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>LocalRegion.UUIDProfile</code>.
    */
-  public static final byte REGION_UUID_PROFILE_MESSAGE = -14;
+  byte REGION_UUID_PROFILE_MESSAGE = -14;
 
-  public static final short TX_REMOTE_COMMIT_PHASE1_MESSAGE = -13;
-  public static final short TX_BATCH_MESSAGE = -12;
-  public static final short TX_CLEANUP_ENTRY_MESSAGE = -11;
-  public static final short TX_BATCH_REPLY_MESSAGE = -10;
+  short TX_REMOTE_COMMIT_PHASE1_MESSAGE = -13;
+  short TX_BATCH_MESSAGE = -12;
+  short TX_CLEANUP_ENTRY_MESSAGE = -11;
+  short TX_BATCH_REPLY_MESSAGE = -10;
 
-  public static final byte PR_REMOVE_ALL_MESSAGE = -9;
-  public static final byte REMOVE_ALL_MESSAGE = -8;
-  public static final byte PR_REMOVE_ALL_REPLY_MESSAGE = -7;
-  public static final byte REMOTE_REMOVE_ALL_MESSAGE = -6;
-  public static final byte REMOTE_REMOVE_ALL_REPLY_MESSAGE = -5;
-  public static final byte DISTTX_COMMIT_MESSAGE = -4;
-  public static final byte DISTTX_PRE_COMMIT_MESSAGE = -3;
-  public static final byte DISTTX_COMMIT_REPLY_MESSAGE = -2;
-  public static final byte DISTTX_PRE_COMMIT_REPLY_MESSAGE = -1;
+  byte PR_REMOVE_ALL_MESSAGE = -9;
+  byte REMOVE_ALL_MESSAGE = -8;
+  byte PR_REMOVE_ALL_REPLY_MESSAGE = -7;
+  byte REMOTE_REMOVE_ALL_MESSAGE = -6;
+  byte REMOTE_REMOVE_ALL_REPLY_MESSAGE = -5;
+  byte DISTTX_COMMIT_MESSAGE = -4;
+  byte DISTTX_PRE_COMMIT_MESSAGE = -3;
+  byte DISTTX_COMMIT_REPLY_MESSAGE = -2;
+  byte DISTTX_PRE_COMMIT_REPLY_MESSAGE = -1;
 
-  public static final byte ILLEGAL = 0;
+  byte ILLEGAL = 0;
 
   // 1 available for reuse. Retired in Geode v1.0
   // public static final byte JGROUPS_VIEW = 1;
@@ -275,132 +275,132 @@ public interface DataSerializableFixedID extends SerializationVersions {
   // 2 available for reuse. Retired in Geode v1.0
   // public static final byte JGROUPS_JOIN_RESP = 2;
 
-  public static final byte PUTALL_VERSIONS_LIST = 3;
+  byte PUTALL_VERSIONS_LIST = 3;
 
-  public static final byte INITIAL_IMAGE_VERSIONED_OBJECT_LIST = 4;
+  byte INITIAL_IMAGE_VERSIONED_OBJECT_LIST = 4;
 
-  public static final byte FIND_VERSION_TAG = 5;
+  byte FIND_VERSION_TAG = 5;
 
-  public static final byte VERSION_TAG_REPLY = 6;
+  byte VERSION_TAG_REPLY = 6;
 
-  public static final byte VERSIONED_OBJECT_LIST = 7;
+  byte VERSIONED_OBJECT_LIST = 7;
 
-  public static final byte ENUM_ID = 8;
-  public static final byte ENUM_INFO = 9;
+  byte ENUM_ID = 8;
+  byte ENUM_INFO = 9;
 
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>InitialImageOperation.EventStateMessage</code>.
    */
-  public static final byte REGION_STATE_MESSAGE = 10;
+  byte REGION_STATE_MESSAGE = 10;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>ClientInstantiatorMessage</code>.
    */
-  public static final byte CLIENT_INSTANTIATOR_MESSAGE = 11;
+  byte CLIENT_INSTANTIATOR_MESSAGE = 11;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>InternalInstantiator.RegistrationMessage</code>.
    */
-  public static final byte REGISTRATION_MESSAGE = 12;
+  byte REGISTRATION_MESSAGE = 12;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>InternalInstantiator.RegistrationContextMessage</code>.
    */
-  public static final byte REGISTRATION_CONTEXT_MESSAGE = 13;
+  byte REGISTRATION_CONTEXT_MESSAGE = 13;
 
   /** More Query Result Classes */
   // PRQueryProcessor.EndOfBucket
-  public static final byte END_OF_BUCKET = 14;
-  public static final byte RESULTS_BAG = 15;
-  public static final byte STRUCT_BAG = 16;
+  byte END_OF_BUCKET = 14;
+  byte RESULTS_BAG = 15;
+  byte STRUCT_BAG = 16;
 
-  public static final byte BUCKET_PROFILE = 17;
-  public static final byte PARTITION_PROFILE = 18;
+  byte BUCKET_PROFILE = 17;
+  byte PARTITION_PROFILE = 18;
 
-  public static final byte ROLE_EVENT = 19;
-  public static final byte CLIENT_REGION_EVENT = 20;
+  byte ROLE_EVENT = 19;
+  byte CLIENT_REGION_EVENT = 20;
 
-  public static final byte CONCURRENT_HASH_MAP = 21;
-  public static final byte FIND_DURABLE_QUEUE = 22;
-  public static final byte FIND_DURABLE_QUEUE_REPLY = 23;
-  public static final byte CACHE_SERVER_LOAD_MESSAGE = 24;
+  byte CONCURRENT_HASH_MAP = 21;
+  byte FIND_DURABLE_QUEUE = 22;
+  byte FIND_DURABLE_QUEUE_REPLY = 23;
+  byte CACHE_SERVER_LOAD_MESSAGE = 24;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>ObjectPartList</code>.
    */
-  public static final byte OBJECT_PART_LIST = 25;
+  byte OBJECT_PART_LIST = 25;
 
-  public static final byte REGION = 26;
+  byte REGION = 26;
 
   /****** Query Result Classes *******/
-  public static final byte RESULTS_COLLECTION_WRAPPER = 27;
-  public static final byte RESULTS_SET = 28;
-  public static final byte SORTED_RESULT_SET = 29;
-  public static final byte SORTED_STRUCT_SET = 30;
-  public static final byte UNDEFINED = 31;
-  public static final byte STRUCT_IMPL = 32;
-  public static final byte STRUCT_SET = 33;
+  byte RESULTS_COLLECTION_WRAPPER = 27;
+  byte RESULTS_SET = 28;
+  byte SORTED_RESULT_SET = 29;
+  byte SORTED_STRUCT_SET = 30;
+  byte UNDEFINED = 31;
+  byte STRUCT_IMPL = 32;
+  byte STRUCT_SET = 33;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>ClearRegionWithContextMessage</code>.
    */
-  public static final byte CLEAR_REGION_MESSAGE_WITH_CONTEXT = 34;
+  byte CLEAR_REGION_MESSAGE_WITH_CONTEXT = 34;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>ClientUpdateMessage</code>.
    */
-  public static final byte CLIENT_UPDATE_MESSAGE = 35;
+  byte CLIENT_UPDATE_MESSAGE = 35;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>EventID</code>.
    */
-  public static final byte EVENT_ID = 36;
+  byte EVENT_ID = 36;
 
-  public static final byte INTEREST_RESULT_POLICY = 37;
+  byte INTEREST_RESULT_POLICY = 37;
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>ClientProxyMembershipID</code>.
    */
-  public static final byte CLIENT_PROXY_MEMBERSHIPID = 38;
-
-  public static final byte PR_BUCKET_BACKUP_MESSAGE = 39;
-  public static final byte SERVER_BUCKET_PROFILE = 40;
-  public static final byte PR_BUCKET_PROFILE_UPDATE_MESSAGE = 41;
-  public static final byte PR_BUCKET_SIZE_MESSAGE = 42;
-  public static final byte PR_CONTAINS_KEY_VALUE_MESSAGE = 43;
-  public static final byte PR_DUMP_ALL_PR_CONFIG_MESSAGE = 44;
-  public static final byte PR_DUMP_BUCKETS_MESSAGE = 45;
-  public static final byte PR_FETCH_ENTRIES_MESSAGE = 46;
-  public static final byte PR_FETCH_ENTRY_MESSAGE = 47;
-  public static final byte PR_FETCH_KEYS_MESSAGE = 48;
-  public static final byte PR_FLUSH_MESSAGE = 49;
-  public static final byte PR_IDENTITY_REQUEST_MESSAGE = 50;
-  public static final byte PR_IDENTITY_UPDATE_MESSAGE = 51;
-  public static final byte PR_INDEX_CREATION_MSG = 52;
-  public static final byte PR_MANAGE_BUCKET_MESSAGE = 53;
-  public static final byte PR_PRIMARY_REQUEST_MESSAGE = 54;
-  public static final byte PR_PRIMARY_REQUEST_REPLY_MESSAGE = 55;
-  public static final byte PR_SANITY_CHECK_MESSAGE = 56;
-  public static final byte PR_PUT_REPLY_MESSAGE = 57;
-  public static final byte PR_QUERY_MESSAGE = 58;
-  public static final byte PR_REMOVE_INDEXES_MESSAGE = 59;
-  public static final byte PR_REMOVE_INDEXES_REPLY_MESSAGE = 60;
-  public static final byte PR_SIZE_MESSAGE = 61;
-  public static final byte PR_SIZE_REPLY_MESSAGE = 62;
-  public static final byte PR_BUCKET_SIZE_REPLY_MESSAGE = 63;
-  public static final byte PR_CONTAINS_KEY_VALUE_REPLY_MESSAGE = 64;
-  public static final byte PR_FETCH_ENTRIES_REPLY_MESSAGE = 65;
-  public static final byte PR_FETCH_ENTRY_REPLY_MESSAGE = 66;
-  public static final byte PR_IDENTITY_REPLY_MESSAGE = 67;
-  public static final byte PR_INDEX_CREATION_REPLY_MSG = 68;
-  public static final byte PR_MANAGE_BUCKET_REPLY_MESSAGE = 69;
+  byte CLIENT_PROXY_MEMBERSHIPID = 38;
+
+  byte PR_BUCKET_BACKUP_MESSAGE = 39;
+  byte SERVER_BUCKET_PROFILE = 40;
+  byte PR_BUCKET_PROFILE_UPDATE_MESSAGE = 41;
+  byte PR_BUCKET_SIZE_MESSAGE = 42;
+  byte PR_CONTAINS_KEY_VALUE_MESSAGE = 43;
+  byte PR_DUMP_ALL_PR_CONFIG_MESSAGE = 44;
+  byte PR_DUMP_BUCKETS_MESSAGE = 45;
+  byte PR_FETCH_ENTRIES_MESSAGE = 46;
+  byte PR_FETCH_ENTRY_MESSAGE = 47;
+  byte PR_FETCH_KEYS_MESSAGE = 48;
+  byte PR_FLUSH_MESSAGE = 49;
+  byte PR_IDENTITY_REQUEST_MESSAGE = 50;
+  byte PR_IDENTITY_UPDATE_MESSAGE = 51;
+  byte PR_INDEX_CREATION_MSG = 52;
+  byte PR_MANAGE_BUCKET_MESSAGE = 53;
+  byte PR_PRIMARY_REQUEST_MESSAGE = 54;
+  byte PR_PRIMARY_REQUEST_REPLY_MESSAGE = 55;
+  byte PR_SANITY_CHECK_MESSAGE = 56;
+  byte PR_PUT_REPLY_MESSAGE = 57;
+  byte PR_QUERY_MESSAGE = 58;
+  byte PR_REMOVE_INDEXES_MESSAGE = 59;
+  byte PR_REMOVE_INDEXES_REPLY_MESSAGE = 60;
+  byte PR_SIZE_MESSAGE = 61;
+  byte PR_SIZE_REPLY_MESSAGE = 62;
+  byte PR_BUCKET_SIZE_REPLY_MESSAGE = 63;
+  byte PR_CONTAINS_KEY_VALUE_REPLY_MESSAGE = 64;
+  byte PR_FETCH_ENTRIES_REPLY_MESSAGE = 65;
+  byte PR_FETCH_ENTRY_REPLY_MESSAGE = 66;
+  byte PR_IDENTITY_REPLY_MESSAGE = 67;
+  byte PR_INDEX_CREATION_REPLY_MSG = 68;
+  byte PR_MANAGE_BUCKET_REPLY_MESSAGE = 69;
 
   // 70 available for reuse - retired in Geode v1.0
   // public static final byte IP_ADDRESS = 70;
@@ -409,416 +409,416 @@ public interface DataSerializableFixedID extends SerializationVersions {
    * A header byte meaning that the next element in the stream is a
    * <code>UpdateOperation.UpdateMessage</code>.
    */
-  public static final byte UPDATE_MESSAGE = 71;
+  byte UPDATE_MESSAGE = 71;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>ReplyMessage</code>.
    */
-  public static final byte REPLY_MESSAGE = 72;
+  byte REPLY_MESSAGE = 72;
 
   /** <code>DestroyMessage</code> */
-  public static final byte PR_DESTROY = 73;
+  byte PR_DESTROY = 73;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>CreateRegionReplyMessage</code>.
    */
-  public static final byte CREATE_REGION_REPLY_MESSAGE = 74;
+  byte CREATE_REGION_REPLY_MESSAGE = 74;
 
-  public static final byte QUERY_MESSAGE = 75;
-  public static final byte RESPONSE_MESSAGE = 76;
-  public static final byte NET_SEARCH_REQUEST_MESSAGE = 77;
-  public static final byte NET_SEARCH_REPLY_MESSAGE = 78;
-  public static final byte NET_LOAD_REQUEST_MESSAGE = 79;
-  public static final byte NET_LOAD_REPLY_MESSAGE = 80;
-  public static final byte NET_WRITE_REQUEST_MESSAGE = 81;
-  public static final byte NET_WRITE_REPLY_MESSAGE = 82;
+  byte QUERY_MESSAGE = 75;
+  byte RESPONSE_MESSAGE = 76;
+  byte NET_SEARCH_REQUEST_MESSAGE = 77;
+  byte NET_SEARCH_REPLY_MESSAGE = 78;
+  byte NET_LOAD_REQUEST_MESSAGE = 79;
+  byte NET_LOAD_REPLY_MESSAGE = 80;
+  byte NET_WRITE_REQUEST_MESSAGE = 81;
+  byte NET_WRITE_REPLY_MESSAGE = 82;
 
   // DLockRequestProcessor
-  public static final byte DLOCK_REQUEST_MESSAGE = 83;
-  public static final byte DLOCK_RESPONSE_MESSAGE = 84;
+  byte DLOCK_REQUEST_MESSAGE = 83;
+  byte DLOCK_RESPONSE_MESSAGE = 84;
   // DLockReleaseMessage
-  public static final byte DLOCK_RELEASE_MESSAGE = 85;
+  byte DLOCK_RELEASE_MESSAGE = 85;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>SystemMemberCacheMessage</code>.
    */
   // added for feature requests #32887
-  public static final byte ADMIN_CACHE_EVENT_MESSAGE = 86;
+  byte ADMIN_CACHE_EVENT_MESSAGE = 86;
 
-  public static final byte CQ_ENTRY_EVENT = 87;
+  byte CQ_ENTRY_EVENT = 87;
 
   // InitialImageOperation
-  public static final byte REQUEST_IMAGE_MESSAGE = 88;
-  public static final byte IMAGE_REPLY_MESSAGE = 89;
-  public static final byte IMAGE_ENTRY = 90;
+  byte REQUEST_IMAGE_MESSAGE = 88;
+  byte IMAGE_REPLY_MESSAGE = 89;
+  byte IMAGE_ENTRY = 90;
 
   // CloseCacheMessage
-  public static final byte CLOSE_CACHE_MESSAGE = 91;
+  byte CLOSE_CACHE_MESSAGE = 91;
 
-  public static final byte DISTRIBUTED_MEMBER = 92;
+  byte DISTRIBUTED_MEMBER = 92;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>UpdateOperation.UpdateWithContextMessage</code>.
    */
-  public static final byte UPDATE_WITH_CONTEXT_MESSAGE = 93;
+  byte UPDATE_WITH_CONTEXT_MESSAGE = 93;
 
   // GrantorRequestProcessor
-  public static final byte GRANTOR_REQUEST_MESSAGE = 94;
-  public static final byte GRANTOR_INFO_REPLY_MESSAGE = 95;
+  byte GRANTOR_REQUEST_MESSAGE = 94;
+  byte GRANTOR_INFO_REPLY_MESSAGE = 95;
 
   // StartupMessage
-  public static final byte STARTUP_MESSAGE = 96;
+  byte STARTUP_MESSAGE = 96;
 
   // StartupResponseMessage
-  public static final byte STARTUP_RESPONSE_MESSAGE = 97;
+  byte STARTUP_RESPONSE_MESSAGE = 97;
 
   // ShutdownMessage
-  public static final byte SHUTDOWN_MESSAGE = 98;
+  byte SHUTDOWN_MESSAGE = 98;
 
   // DestroyRegionOperation
-  public static final byte DESTROY_REGION_MESSAGE = 99;
+  byte DESTROY_REGION_MESSAGE = 99;
 
-  public static final byte PR_PUT_MESSAGE = 100;
+  byte PR_PUT_MESSAGE = 100;
 
   // InvalidateOperation
-  public static final byte INVALIDATE_MESSAGE = 101;
+  byte INVALIDATE_MESSAGE = 101;
 
   // DestroyOperation
-  public static final byte DESTROY_MESSAGE = 102;
+  byte DESTROY_MESSAGE = 102;
 
   // DistributionAdvisor
-  public static final byte DA_PROFILE = 103;
+  byte DA_PROFILE = 103;
 
   // CacheDistributionAdvisor
-  public static final byte CACHE_PROFILE = 104;
+  byte CACHE_PROFILE = 104;
 
   // EntryEventImpl
-  public static final byte ENTRY_EVENT = 105;
+  byte ENTRY_EVENT = 105;
 
   // UpdateAttributesProcessor
-  public static final byte UPDATE_ATTRIBUTES_MESSAGE = 106;
-  public static final byte PROFILE_REPLY_MESSAGE = 107;
+  byte UPDATE_ATTRIBUTES_MESSAGE = 106;
+  byte PROFILE_REPLY_MESSAGE = 107;
 
   // RegionEventImpl
-  public static final byte REGION_EVENT = 108;
+  byte REGION_EVENT = 108;
 
   // TXId
-  public static final byte TRANSACTION_ID = 109;
+  byte TRANSACTION_ID = 109;
 
-  public static final byte TX_COMMIT_MESSAGE = 110;
+  byte TX_COMMIT_MESSAGE = 110;
 
-  public static final byte HA_PROFILE = 111;
+  byte HA_PROFILE = 111;
 
-  public static final byte ELDER_INIT_MESSAGE = 112;
-  public static final byte ELDER_INIT_REPLY_MESSAGE = 113;
-  public static final byte DEPOSE_GRANTOR_MESSAGE = 114;
+  byte ELDER_INIT_MESSAGE = 112;
+  byte ELDER_INIT_REPLY_MESSAGE = 113;
+  byte DEPOSE_GRANTOR_MESSAGE = 114;
 
   /**
    * A header byte meaning that the next element in the stream is a <code>HAEventWrapper</code>.
    */
-  public static final byte HA_EVENT_WRAPPER = 115;
+  byte HA_EVENT_WRAPPER = 115;
 
-  public static final byte DLOCK_RELEASE_REPLY = 116;
-  public static final byte DLOCK_REMOTE_TOKEN = 117;
+  byte DLOCK_RELEASE_REPLY = 116;
+  byte DLOCK_REMOTE_TOKEN = 117;
 
   // TXCommitMessage.CommitProcessForTXIdMessage
-  public static final byte COMMIT_PROCESS_FOR_TXID_MESSAGE = 118;
+  byte COMMIT_PROCESS_FOR_TXID_MESSAGE = 118;
 
-  public static final byte FILTER_PROFILE = 119;
+  byte FILTER_PROFILE = 119;
 
-  public static final byte PR_GET_MESSAGE = 120;
+  byte PR_GET_MESSAGE = 120;
 
   // TXLockIdImpl
-  public static final byte TRANSACTION_LOCK_ID = 121;
+  byte TRANSACTION_LOCK_ID = 121;
   // TXCommitMessage.CommitProcessForLockIdMessage
-  public static final byte COMMIT_PROCESS_FOR_LOCKID_MESSAGE = 122;
+  byte COMMIT_PROCESS_FOR_LOCKID_MESSAGE = 122;
 
   // NonGrantorDestroyedProcessor.NonGrantorDestroyedMessage (dlock)
-  public static final byte NON_GRANTOR_DESTROYED_MESSAGE = 123;
+  byte NON_GRANTOR_DESTROYED_MESSAGE = 123;
 
   // Token.EndOfStream
-  public static final byte END_OF_STREAM_TOKEN = 124;
+  byte END_OF_STREAM_TOKEN = 124;
 
   /** {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage} */
-  public static final byte PR_GET_REPLY_MESSAGE = 125;
+  byte PR_GET_REPLY_MESSAGE = 125;
 
   /** {@link org.apache.geode.internal.cache.Node} */
-  public static final byte PR_NODE = 126;
+  byte PR_NODE = 126;
 
   /**
    * A header byte meaning that the next element in the stream is a
    * <code>DestroyOperation.DestroyWithContextMessage</code>.
    */
-  public static final byte DESTROY_WITH_CONTEXT_MESSAGE = 127;
+  byte DESTROY_WITH_CONTEXT_MESSAGE = 127;
 
   // NOTE, CODES > 127 will take two bytes to serialize
 
-  public static final short PR_FETCH_PARTITION_DETAILS_MESSAGE = 128;
-  public static final short PR_FETCH_PARTITION_DETAILS_REPLY = 129;
-  public static final short PR_DEPOSE_PRIMARY_BUCKET_MESSAGE = 130;
-  public static final short PR_DEPOSE_PRIMARY_BUCKET_REPLY = 131;
-  public static final short PR_BECOME_PRIMARY_BUCKET_MESSAGE = 132;
-  public static final short PR_BECOME_PRIMARY_BUCKET_REPLY = 133;
-  public static final short PR_REMOVE_BUCKET_MESSAGE = 134;
-  public static final short PR_REMOVE_BUCKET_REPLY = 135;
-  public static final short PR_MOVE_BUCKET_MESSAGE = 136;
-  public static final short PR_MOVE_BUCKET_REPLY = 137;
-  public static final short TX_MANAGER_REMOVE_TRANSACTIONS = 138;
+  short PR_FETCH_PARTITION_DETAILS_MESSAGE = 128;
+  short PR_FETCH_PARTITION_DETAILS_REPLY = 129;
+  short PR_DEPOSE_PRIMARY_BUCKET_MESSAGE = 130;
+  short PR_DEPOSE_PRIMARY_BUCKET_REPLY = 131;
+  short PR_BECOME_PRIMARY_BUCKET_MESSAGE = 132;
+  short PR_BECOME_PRIMARY_BUCKET_REPLY = 133;
+  short PR_REMOVE_BUCKET_MESSAGE = 134;
+  short PR_REMOVE_BUCKET_REPLY = 135;
+  short PR_MOVE_BUCKET_MESSAGE = 136;
+  short PR_MOVE_BUCKET_REPLY = 137;
+  short TX_MANAGER_REMOVE_TRANSACTIONS = 138;
 
-  public static final short REGION_VERSION_VECTOR = 139;
+  short REGION_VERSION_VECTOR = 139;
 
-  public static final short INVALIDATE_WITH_CONTEXT_MESSAGE = 140;
+  short INVALIDATE_WITH_CONTEXT_MESSAGE = 140;
 
-  public static final short TOKEN_INVALID = 141;
-  public static final short TOKEN_LOCAL_INVALID = 142;
-  public static final short TOKEN_DESTROYED = 143;
-  public static final short TOKEN_REMOVED = 144;
-  public static final short TOKEN_REMOVED2 = 145;
+  short TOKEN_INVALID = 141;
+  short TOKEN_LOCAL_INVALID = 142;
+  short TOKEN_DESTROYED = 143;
+  short TOKEN_REMOVED = 144;
+  short TOKEN_REMOVED2 = 145;
 
-  public static final short STARTUP_RESPONSE_WITHVERSION_MESSAGE = 146;
-  public static final short SHUTDOWN_ALL_GATEWAYHUBS_REQUEST = 147;
+  short STARTUP_RESPONSE_WITHVERSION_MESSAGE = 146;
+  short SHUTDOWN_ALL_GATEWAYHUBS_REQUEST = 147;
 
-  public static final short TOKEN_TOMBSTONE = 149;
-  public static final short PR_DESTROY_REPLY_MESSAGE = 150;
-  public static final short R_DESTROY_REPLY_MESSAGE = 151;
+  short TOKEN_TOMBSTONE = 149;
+  short PR_DESTROY_REPLY_MESSAGE = 150;
+  short R_DESTROY_REPLY_MESSAGE = 151;
 
-  public static final short CLI_FUNCTION_RESULT = 152;
+  short CLI_FUNCTION_RESULT = 152;
 
-  public static final short JMX_MANAGER_PROFILE = 153;
-  public static final short JMX_MANAGER_PROFILE_MESSAGE = 154;
+  short JMX_MANAGER_PROFILE = 153;
+  short JMX_MANAGER_PROFILE_MESSAGE = 154;
 
-  public static final short R_FETCH_VERSION_MESSAGE = 155;
-  public static final short R_FETCH_VERSION_REPLY = 156;
+  short R_FETCH_VERSION_MESSAGE = 155;
+  short R_FETCH_VERSION_REPLY = 156;
 
-  public static final short PR_TOMBSTONE_MESSAGE = 157;
+  short PR_TOMBSTONE_MESSAGE = 157;
 
-  public static final short UPDATE_ENTRY_VERSION_MESSAGE = 158;
-  public static final short PR_UPDATE_ENTRY_VERSION_MESSAGE = 159;
+  short UPDATE_ENTRY_VERSION_MESSAGE = 158;
+  short PR_UPDATE_ENTRY_VERSION_MESSAGE = 159;
 
-  public static final short SHUTDOWN_ALL_GATEWAYSENDERS_REQUEST = 160;
-  public static final short SHUTDOWN_ALL_GATEWAYSENDERS_RESPONSE = 161;
+  short SHUTDOWN_ALL_GATEWAYSENDERS_REQUEST = 160;
+  short SHUTDOWN_ALL_GATEWAYSENDERS_RESPONSE = 161;
 
-  public static final short SHUTDOWN_ALL_GATEWAYRECEIVERS_REQUEST = 162;
-  public static final short SHUTDOWN_ALL_GATEWAYRECEIVERS_RESPONSE = 163;
+  short SHUTDOWN_ALL_GATEWAYRECEIVERS_REQUEST = 162;
+  short SHUTDOWN_ALL_GATEWAYRECEIVERS_RESPONSE = 163;
 
-  public static final short TX_COMMIT_MESSAGE_701 = 164;
-  public static final short PR_FETCH_BULK_ENTRIES_MESSAGE = 165;
-  public static final short PR_FETCH_BULK_ENTRIES_REPLY_MESSAGE = 166;
-  public static final short NWAY_MERGE_RESULTS = 167;
-  public static final short CUMULATIVE_RESULTS = 168;
-  public static final short DISTTX_ROLLBACK_MESSAGE = 169;
-  public static final short DISTTX_ROLLBACK_REPLY_MESSAGE = 170;
+  short TX_COMMIT_MESSAGE_701 = 164;
+  short PR_FETCH_BULK_ENTRIES_MESSAGE = 165;
+  short PR_FETCH_BULK_ENTRIES_REPLY_MESSAGE = 166;
+  short NWAY_MERGE_RESULTS = 167;
+  short CUMULATIVE_RESULTS = 168;
+  short DISTTX_ROLLBACK_MESSAGE = 169;
+  short DISTTX_ROLLBACK_REPLY_MESSAGE = 170;
   // 171..999 unused
 
-  public static final short ADD_HEALTH_LISTENER_REQUEST = 1000;
-  public static final short ADD_HEALTH_LISTENER_RESPONSE = 1001;
-  public static final short ADD_STAT_LISTENER_REQUEST = 1002;
-  public static final short ADD_STAT_LISTENER_RESPONSE = 1003;
-  public static final short ADMIN_CONSOLE_DISCONNECT_MESSAGE = 1004;
-  public static final short ADMIN_CONSOLE_MESSAGE = 1005;
-  public static final short ADMIN_FAILURE_RESPONSE = 1006;
-  public static final short ALERT_LEVEL_CHANGE_MESSAGE = 1007;
-  public static final short ALERT_LISTENER_MESSAGE = 1008;
-  public static final short APP_CACHE_SNAPSHOT_MESSAGE = 1009;
-  public static final short BRIDGE_SERVER_REQUEST = 1010;
-  public static final short BRIDGE_SERVER_RESPONSE = 1011;
-  public static final short CACHE_CONFIG_REQUEST = 1012;
-  public static final short CACHE_CONFIG_RESPONSE = 1013;
-  public static final short CACHE_INFO_REQUEST = 1014;
-  public static final short CACHE_INFO_RESPONSE = 1015;
-  public static final short CANCELLATION_MESSAGE = 1016;
-  public static final short CANCEL_STAT_LISTENER_REQUEST = 1017;
-  public static final short CANCEL_STAT_LISTENER_RESPONSE = 1018;
-  public static final short DESTROY_ENTRY_MESSAGE = 1019;
-  public static final short ADMIN_DESTROY_REGION_MESSAGE = 1020;
-  public static final short FETCH_DIST_LOCK_INFO_REQUEST = 1021;
-  public static final short FETCH_DIST_LOCK_INFO_RESPONSE = 1022;
-  public static final short FETCH_HEALTH_DIAGNOSIS_REQUEST = 1023;
-  public static final short FETCH_HEALTH_DIAGNOSIS_RESPONSE = 1024;
-  public static final short FETCH_HOST_REQUEST = 1025;
-  public static final short FETCH_HOST_RESPONSE = 1026;
-  public static final short FETCH_RESOURCE_ATTRIBUTES_REQUEST = 1027;
-  public static final short FETCH_RESOURCE_ATTRIBUTES_RESPONSE = 1028;
-  public static final short FETCH_STATS_REQUEST = 1029;
-  public static final short FETCH_STATS_RESPONSE = 1030;
-  public static final short FETCH_SYS_CFG_REQUEST = 1031;
-  public static final short FETCH_SYS_CFG_RESPONSE = 1032;
-  public static final short FLUSH_APP_CACHE_SNAPSHOT_MESSAGE = 1033;
-  public static final short HEALTH_LISTENER_MESSAGE = 1034;
-  public static final short LICENSE_INFO_REQUEST = 1035;
-  public static final short LICENSE_INFO_RESPONSE = 1036;
-  public static final short OBJECT_DETAILS_REQUEST = 1037;
-  public static final short OBJECT_DETAILS_RESPONSE = 1038;
-  public static final short OBJECT_NAMES_REQUEST = 1039;
-  public static final short OBJECT_NAMES_RESPONSE = 1040;
-  public static final short REGION_ATTRIBUTES_REQUEST = 1041;
-  public static final short REGION_ATTRIBUTES_RESPONSE = 1042;
-  public static final short REGION_REQUEST = 1043;
-  public static final short REGION_RESPONSE = 1044;
-  public static final short REGION_SIZE_REQUEST = 1045;
-  public static final short REGION_SIZE_RESPONSE = 1046;
-  public static final short REGION_STATISTICS_REQUEST = 1047;
-  public static final short REGION_STATISTICS_RESPONSE = 1048;
-  public static final short REMOVE_HEALTH_LISTENER_REQUEST = 1049;
-  public static final short REMOVE_HEALTH_LISTENER_RESPONSE = 1050;
-  public static final short RESET_HEALTH_STATUS_REQUEST = 1051;
-  public static final short RESET_HEALTH_STATUS_RESPONSE = 1052;
-  public static final short ROOT_REGION_REQUEST = 1053;
-  public static final short ROOT_REGION_RESPONSE = 1054;
-  public static final short SNAPSHOT_RESULT_MESSAGE = 1055;
-  public static final short STAT_LISTENER_MESSAGE = 1056;
-  public static final short STORE_SYS_CFG_REQUEST = 1057;
-  public static final short STORE_SYS_CFG_RESPONSE = 1058;
-  public static final short SUB_REGION_REQUEST = 1059;
-  public static final short SUB_REGION_RESPONSE = 1060;
-  public static final short TAIL_LOG_REQUEST = 1061;
-  public static final short TAIL_LOG_RESPONSE = 1062;
-  public static final short VERSION_INFO_REQUEST = 1063;
-  public static final short VERSION_INFO_RESPONSE = 1064;
-  public static final short STAT_ALERTS_MGR_ASSIGN_MESSAGE = 1065;
-  public static final short UPDATE_ALERTS_DEFN_MESSAGE = 1066;
-  public static final short REFRESH_MEMBER_SNAP_REQUEST = 1067;
-  public static final short REFRESH_MEMBER_SNAP_RESPONSE = 1068;
-  public static final short REGION_SUB_SIZE_REQUEST = 1069;
-  public static final short REGION_SUB_SIZE_RESPONSE = 1070;
-  public static final short CHANGE_REFRESH_INT_MESSAGE = 1071;
-  public static final short ALERTS_NOTIF_MESSAGE = 1072;
-  public static final short STAT_ALERT_DEFN_NUM_THRESHOLD = 1073;
-  public static final short STAT_ALERT_DEFN_GAUGE_THRESHOLD = 1074;
-  public static final short STAT_ALERT_NOTIFICATION = 1075;
-  public static final short FILTER_INFO_MESSAGE = 1076;
-  public static final short REQUEST_FILTERINFO_MESSAGE = 1077;
-  public static final short REQUEST_RVV_MESSAGE = 1078;
-  public static final short RVV_REPLY_MESSAGE = 1079;
-
-  public static final short CLIENT_MEMBERSHIP_MESSAGE = 1080;
+  short ADD_HEALTH_LISTENER_REQUEST = 1000;
+  short ADD_HEALTH_LISTENER_RESPONSE = 1001;
+  short ADD_STAT_LISTENER_REQUEST = 1002;
+  short ADD_STAT_LISTENER_RESPONSE = 1003;
+  short ADMIN_CONSOLE_DISCONNECT_MESSAGE = 1004;
+  short ADMIN_CONSOLE_MESSAGE = 1005;
+  short ADMIN_FAILURE_RESPONSE = 1006;
+  short ALERT_LEVEL_CHANGE_MESSAGE = 1007;
+  short ALERT_LISTENER_MESSAGE = 1008;
+  short APP_CACHE_SNAPSHOT_MESSAGE = 1009;
+  short BRIDGE_SERVER_REQUEST = 1010;
+  short BRIDGE_SERVER_RESPONSE = 1011;
+  short CACHE_CONFIG_REQUEST = 1012;
+  short CACHE_CONFIG_RESPONSE = 1013;
+  short CACHE_INFO_REQUEST = 1014;
+  short CACHE_INFO_RESPONSE = 1015;
+  short CANCELLATION_MESSAGE = 1016;
+  short CANCEL_STAT_LISTENER_REQUEST = 1017;
+  short CANCEL_STAT_LISTENER_RESPONSE = 1018;
+  short DESTROY_ENTRY_MESSAGE = 1019;
+  short ADMIN_DESTROY_REGION_MESSAGE = 1020;
+  short FETCH_DIST_LOCK_INFO_REQUEST = 1021;
+  short FETCH_DIST_LOCK_INFO_RESPONSE = 1022;
+  short FETCH_HEALTH_DIAGNOSIS_REQUEST = 1023;
+  short FETCH_HEALTH_DIAGNOSIS_RESPONSE = 1024;
+  short FETCH_HOST_REQUEST = 1025;
+  short FETCH_HOST_RESPONSE = 1026;
+  short FETCH_RESOURCE_ATTRIBUTES_REQUEST = 1027;
+  short FETCH_RESOURCE_ATTRIBUTES_RESPONSE = 1028;
+  short FETCH_STATS_REQUEST = 1029;
+  short FETCH_STATS_RESPONSE = 1030;
+  short FETCH_SYS_CFG_REQUEST = 1031;
+  short FETCH_SYS_CFG_RESPONSE = 1032;
+  short FLUSH_APP_CACHE_SNAPSHOT_MESSAGE = 1033;
+  short HEALTH_LISTENER_MESSAGE = 1034;
+  short LICENSE_INFO_REQUEST = 1035;
+  short LICENSE_INFO_RESPONSE = 1036;
+  short OBJECT_DETAILS_REQUEST = 1037;
+  short OBJECT_DETAILS_RESPONSE = 1038;
+  short OBJECT_NAMES_REQUEST = 1039;
+  short OBJECT_NAMES_RESPONSE = 1040;
+  short REGION_ATTRIBUTES_REQUEST = 1041;
+  short REGION_ATTRIBUTES_RESPONSE = 1042;
+  short REGION_REQUEST = 1043;
+  short REGION_RESPONSE = 1044;
+  short REGION_SIZE_REQUEST = 1045;
+  short REGION_SIZE_RESPONSE = 1046;
+  short REGION_STATISTICS_REQUEST = 1047;
+  short REGION_STATISTICS_RESPONSE = 1048;
+  short REMOVE_HEALTH_LISTENER_REQUEST = 1049;
+  short REMOVE_HEALTH_LISTENER_RESPONSE = 1050;
+  short RESET_HEALTH_STATUS_REQUEST = 1051;
+  short RESET_HEALTH_STATUS_RESPONSE = 1052;
+  short ROOT_REGION_REQUEST = 1053;
+  short ROOT_REGION_RESPONSE = 1054;
+  short SNAPSHOT_RESULT_MESSAGE = 1055;
+  short STAT_LISTENER_MESSAGE = 1056;
+  short STORE_SYS_CFG_REQUEST = 1057;
+  short STORE_SYS_CFG_RESPONSE = 1058;
+  short SUB_REGION_REQUEST = 1059;
+  short SUB_REGION_RESPONSE = 1060;
+  short TAIL_LOG_REQUEST = 1061;
+  short TAIL_LOG_RESPONSE = 1062;
+  short VERSION_INFO_REQUEST = 1063;
+  short VERSION_INFO_RESPONSE = 1064;
+  short STAT_ALERTS_MGR_ASSIGN_MESSAGE = 1065;
+  short UPDATE_ALERTS_DEFN_MESSAGE = 1066;
+  short REFRESH_MEMBER_SNAP_REQUEST = 1067;
+  short REFRESH_MEMBER_SNAP_RESPONSE = 1068;
+  short REGION_SUB_SIZE_REQUEST = 1069;
+  short REGION_SUB_SIZE_RESPONSE = 1070;
+  short CHANGE_REFRESH_INT_MESSAGE = 1071;
+  short ALERTS_NOTIF_MESSAGE = 1072;
+  short STAT_ALERT_DEFN_NUM_THRESHOLD = 1073;
+  short STAT_ALERT_DEFN_GAUGE_THRESHOLD = 1074;
+  short STAT_ALERT_NOTIFICATION = 1075;
+  short FILTER_INFO_MESSAGE = 1076;
+  short REQUEST_FILTERINFO_MESSAGE = 1077;
+  short REQUEST_RVV_MESSAGE = 1078;
+  short RVV_REPLY_MESSAGE = 1079;
+
+  short CLIENT_MEMBERSHIP_MESSAGE = 1080;
   // 1,081...1,199 reserved for more admin msgs
-  public static final short PR_FUNCTION_STREAMING_MESSAGE = 1201;
-  public static final short MEMBER_FUNCTION_STREAMING_MESSAGE = 1202;
-  public static final short DR_FUNCTION_STREAMING_MESSAGE = 1203;
-  public static final short FUNCTION_STREAMING_REPLY_MESSAGE = 1204;
-  public static final short FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE = 1205;
-  public static final short REQUEST_SYNC_MESSAGE = 1206;
+  short PR_FUNCTION_STREAMING_MESSAGE = 1201;
+  short MEMBER_FUNCTION_STREAMING_MESSAGE = 1202;
+  short DR_FUNCTION_STREAMING_MESSAGE = 1203;
+  short FUNCTION_STREAMING_REPLY_MESSAGE = 1204;
+  short FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE = 1205;
+  short REQUEST_SYNC_MESSAGE = 1206;
 
   // 1,209..1,999 unused
 
-  public static final short HIGH_PRIORITY_ACKED_MESSAGE = 2000;
-  public static final short SERIAL_ACKED_MESSAGE = 2001;
-  public static final short CLIENT_DATASERIALIZER_MESSAGE = 2002;
+  short HIGH_PRIORITY_ACKED_MESSAGE = 2000;
+  short SERIAL_ACKED_MESSAGE = 2001;
+  short CLIENT_DATASERIALIZER_MESSAGE = 2002;
 
   // 2003..2098 unused
 
-  public static final short BUCKET_COUNT_LOAD_PROBE = 2099;
-  public static final short PERSISTENT_MEMBERSHIP_VIEW_REQUEST = 2100;
-  public static final short PERSISTENT_MEMBERSHIP_VIEW_REPLY = 2101;
-  public static final short PERSISTENT_STATE_QUERY_REQUEST = 2102;
-  public static final short PERSISTENT_STATE_QUERY_REPLY = 2103;
-  public static final short PREPARE_NEW_PERSISTENT_MEMBER_REQUEST = 2104;
-  public static final short MISSING_PERSISTENT_IDS_REQUEST = 2105;
-  public static final short MISSING_PERSISTENT_IDS_RESPONSE = 2106;
-  public static final short REVOKE_PERSISTENT_ID_REQUEST = 2107;
-  public static final short REVOKE_PERSISTENT_ID_RESPONSE = 2108;
-  public static final short REMOVE_PERSISTENT_MEMBER_REQUEST = 2109;
-  public static final short PERSISTENT_MEMBERSHIP_FLUSH_REQUEST = 2110;
-  public static final short SHUTDOWN_ALL_REQUEST = 2111;
-  public static final short SHUTDOWN_ALL_RESPONSE = 2112;
-  public static final short END_BUCKET_CREATION_MESSAGE = 2113;
-
-  public static final short FINISH_BACKUP_REQUEST = 2114;
-  public static final short FINISH_BACKUP_RESPONSE = 2115;
-  public static final short PREPARE_BACKUP_REQUEST = 2116;
-  public static final short BACKUP_RESPONSE = 2117;
-  public static final short COMPACT_REQUEST = 2118;
-  public static final short COMPACT_RESPONSE = 2119;
-  public static final short FLOW_CONTROL_PERMIT_MESSAGE = 2120;
-
-  public static final short OBJECT_PART_LIST66 = 2121;
-  public static final short LINKED_RESULTSET = 2122;
-  public static final short LINKED_STRUCTSET = 2123;
-  public static final short PR_ALL_BUCKET_PROFILES_UPDATE_MESSAGE = 2124;
-
-  public static final short SERIALIZED_OBJECT_PART_LIST = 2125;
-  public static final short FLUSH_TO_DISK_REQUEST = 2126;
-  public static final short FLUSH_TO_DISK_RESPONSE = 2127;
-
-  public static final short CHECK_TYPE_REGISTRY_STATE = 2128;
-  public static final short PREPARE_REVOKE_PERSISTENT_ID_REQUEST = 2129;
-  public static final short MISSING_PERSISTENT_IDS_RESPONSE_662 = 2130;
-
-  public static final short PERSISTENT_VERSION_TAG = 2131;
-  public static final short PERSISTENT_RVV = 2132;
-  public static final short DISK_STORE_ID = 2133;
-
-  public static final short SNAPSHOT_PACKET = 2134;
-  public static final short SNAPSHOT_RECORD = 2135;
-
-  public static final short FLOW_CONTROL_ACK = 2136;
-  public static final short FLOW_CONTROL_ABORT = 2137;
-
-  public static final short REMOTE_LOCATOR_RESPONSE = 2138;
-  public static final short LOCATOR_JOIN_MESSAGE = 2139;
-
-  public static final short PARALLEL_QUEUE_BATCH_REMOVAL_MESSAGE = 2140;
-  public static final short PARALLEL_QUEUE_BATCH_REMOVAL_REPLY = 2141;
+  short BUCKET_COUNT_LOAD_PROBE = 2099;
+  short PERSISTENT_MEMBERSHIP_VIEW_REQUEST = 2100;
+  short PERSISTENT_MEMBERSHIP_VIEW_REPLY = 2101;
+  short PERSISTENT_STATE_QUERY_REQUEST = 2102;
+  short PERSISTENT_STATE_QUERY_REPLY = 2103;
+  short PREPARE_NEW_PERSISTENT_MEMBER_REQUEST = 2104;
+  short MISSING_PERSISTENT_IDS_REQUEST = 2105;
+  short MISSING_PERSISTENT_IDS_RESPONSE = 2106;
+  short REVOKE_PERSISTENT_ID_REQUEST = 2107;
+  short REVOKE_PERSISTENT_ID_RESPONSE = 2108;
+  short REMOVE_PERSISTENT_MEMBER_REQUEST = 2109;
+  short PERSISTENT_MEMBERSHIP_FLUSH_REQUEST = 2110;
+  short SHUTDOWN_ALL_REQUEST = 2111;
+  short SHUTDOWN_ALL_RESPONSE = 2112;
+  short END_BUCKET_CREATION_MESSAGE = 2113;
+
+  short FINISH_BACKUP_REQUEST = 2114;
+  short FINISH_BACKUP_RESPONSE = 2115;
+  short PREPARE_BACKUP_REQUEST = 2116;
+  short BACKUP_RESPONSE = 2117;
+  short COMPACT_REQUEST = 2118;
+  short COMPACT_RESPONSE = 2119;
+  short FLOW_CONTROL_PERMIT_MESSAGE = 2120;
+
+  short OBJECT_PART_LIST66 = 2121;
+  short LINKED_RESULTSET = 2122;
+  short LINKED_STRUCTSET = 2123;
+  short PR_ALL_BUCKET_PROFILES_UPDATE_MESSAGE = 2124;
+
+  short SERIALIZED_OBJECT_PART_LIST = 2125;
+  short FLUSH_TO_DISK_REQUEST = 2126;
+  short FLUSH_TO_DISK_RESPONSE = 2127;
+
+  short CHECK_TYPE_REGISTRY_STATE = 2128;
+  short PREPARE_REVOKE_PERSISTENT_ID_REQUEST = 2129;
+  short MISSING_PERSISTENT_IDS_RESPONSE_662 = 2130;
+
+  short PERSISTENT_VERSION_TAG = 2131;
+  short PERSISTENT_RVV = 2132;
+  short DISK_STORE_ID = 2133;
+
+  short SNAPSHOT_PACKET = 2134;
+  short SNAPSHOT_RECORD = 2135;
+
+  short FLOW_CONTROL_ACK = 2136;
+  short FLOW_CONTROL_ABORT = 2137;
+
+  short REMOTE_LOCATOR_RESPONSE = 2138;
+  short LOCATOR_JOIN_MESSAGE = 2139;
+
+  short PARALLEL_QUEUE_BATCH_REMOVAL_MESSAGE = 2140;
+  short PARALLEL_QUEUE_BATCH_REMOVAL_REPLY = 2141;
 
   // 2141 unused
-  public static final short REMOTE_LOCATOR_PING_REQUEST = 2142;
-  public static final short REMOTE_LOCATOR_PING_RESPONSE = 2143;
-  public static final short GATEWAY_SENDER_PROFILE = 2144;
-  public static final short REMOTE_LOCATOR_JOIN_REQUEST = 2145;
-  public static final short REMOTE_LOCATOR_JOIN_RESPONSE = 2146;
-  public static final short REMOTE_LOCATOR_REQUEST = 2147;
+  short REMOTE_LOCATOR_PING_REQUEST = 2142;
+  short REMOTE_LOCATOR_PING_RESPONSE = 2143;
+  short GATEWAY_SENDER_PROFILE = 2144;
+  short REMOTE_LOCATOR_JOIN_REQUEST = 2145;
+  short REMOTE_LOCATOR_JOIN_RESPONSE = 2146;
+  short REMOTE_LOCATOR_REQUEST = 2147;
 
 
-  public static final short BATCH_DESTROY_MESSAGE = 2148;
+  short BATCH_DESTROY_MESSAGE = 2148;
 
-  public static final short MANAGER_STARTUP_MESSAGE = 2149;
+  short MANAGER_STARTUP_MESSAGE = 2149;
 
-  public static final short JMX_MANAGER_LOCATOR_REQUEST = 2150;
-  public static final short JMX_MANAGER_LOCATOR_RESPONSE = 2151;
+  short JMX_MANAGER_LOCATOR_REQUEST = 2150;
+  short JMX_MANAGER_LOCATOR_RESPONSE = 2151;
 
-  public static final short MGMT_COMPACT_REQUEST = 2152;
-  public static final short MGMT_COMPACT_RESPONSE = 2153;
+  short MGMT_COMPACT_REQUEST = 2152;
+  short MGMT_COMPACT_RESPONSE = 2153;
 
-  public static final short MGMT_FEDERATION_COMPONENT = 2154;
+  short MGMT_FEDERATION_COMPONENT = 2154;
 
-  public static final short LOCATOR_STATUS_REQUEST = 2155;
-  public static final short LOCATOR_STATUS_RESPONSE = 2156;
-  public static final short RELEASE_CLEAR_LOCK_MESSAGE = 2157;
-  public static final short NULL_TOKEN = 2158;
+  short LOCATOR_STATUS_REQUEST = 2155;
+  short LOCATOR_STATUS_RESPONSE = 2156;
+  short RELEASE_CLEAR_LOCK_MESSAGE = 2157;
+  short NULL_TOKEN = 2158;
 
-  public static final short CONFIGURATION_RESPONSE = 2160;
+  short CONFIGURATION_RESPONSE = 2160;
 
-  public static final short PARALLEL_QUEUE_REMOVAL_MESSAGE = 2161;
+  short PARALLEL_QUEUE_REMOVAL_MESSAGE = 2161;
 
-  public static final short PR_QUERY_TRACE_INFO = 2162;
+  short PR_QUERY_TRACE_INFO = 2162;
 
-  public static final short INDEX_CREATION_DATA = 2163;
+  short INDEX_CREATION_DATA = 2163;
 
-  public static final short SERVER_PING_MESSAGE = 2164;
-  public static final short PR_DESTROY_ON_DATA_STORE_MESSAGE = 2165;
+  short SERVER_PING_MESSAGE = 2164;
+  short PR_DESTROY_ON_DATA_STORE_MESSAGE = 2165;
 
-  public static final short DIST_TX_OP = 2166;
-  public static final short DIST_TX_PRE_COMMIT_RESPONSE = 2167;
-  public static final short DIST_TX_THIN_ENTRY_STATE = 2168;
+  short DIST_TX_OP = 2166;
+  short DIST_TX_PRE_COMMIT_RESPONSE = 2167;
+  short DIST_TX_THIN_ENTRY_STATE = 2168;
 
-  public static final short LUCENE_CHUNK_KEY = 2169;
-  public static final short LUCENE_FILE = 2170;
-  public static final short LUCENE_FUNCTION_CONTEXT = 2171;
-  public static final short LUCENE_STRING_QUERY_PROVIDER = 2172;
-  public static final short LUCENE_TOP_ENTRIES_COLLECTOR_MANAGER = 2173;
-  public static final short LUCENE_ENTRY_SCORE = 2174;
-  public static final short LUCENE_TOP_ENTRIES = 2175;
-  public static final short LUCENE_TOP_ENTRIES_COLLECTOR = 2176;
-  public static final short WAIT_UNTIL_FLUSHED_FUNCTION_CONTEXT = 2177;
-  public static final short DESTROY_LUCENE_INDEX_MESSAGE = 2178;
-  public static final short LUCENE_PAGE_RESULTS = 2179;
-  public static final short LUCENE_RESULT_STRUCT = 2180;
-  public static final short GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_MESSAGE = 2181;
-  public static final short GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_ENTRY = 2182;
+  short LUCENE_CHUNK_KEY = 2169;
+  short LUCENE_FILE = 2170;
+  short LUCENE_FUNCTION_CONTEXT = 2171;
+  short LUCENE_STRING_QUERY_PROVIDER = 2172;
+  short LUCENE_TOP_ENTRIES_COLLECTOR_MANAGER = 2173;
+  short LUCENE_ENTRY_SCORE = 2174;
+  short LUCENE_TOP_ENTRIES = 2175;
+  short LUCENE_TOP_ENTRIES_COLLECTOR = 2176;
+  short WAIT_UNTIL_FLUSHED_FUNCTION_CONTEXT = 2177;
+  short DESTROY_LUCENE_INDEX_MESSAGE = 2178;
+  short LUCENE_PAGE_RESULTS = 2179;
+  short LUCENE_RESULT_STRUCT = 2180;
+  short GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_MESSAGE = 2181;
+  short GATEWAY_SENDER_QUEUE_ENTRY_SYNCHRONIZATION_ENTRY = 2182;
 
   // NOTE, codes > 65535 will take 4 bytes to serialize
 
@@ -827,14 +827,14 @@ public interface DataSerializableFixedID extends SerializationVersions {
    * fixed id. In that case its class name is serialized. Currently only test classes just return
    * this code.
    */
-  public static final int NO_FIXED_ID = Integer.MAX_VALUE;
+  int NO_FIXED_ID = Integer.MAX_VALUE;
 
   //////////////// END CODES ////////////
 
   /**
    * Returns the DataSerializer fixed id for the class that implements this method.
    */
-  public int getDSFID();
+  int getDSFID();
 
   /**
    * Writes the state of this object as primitive data to the given <code>DataOutput</code>.<br>
@@ -847,7 +847,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
    *
    * @throws IOException A problem occurs while writing to <code>out</code>
    */
-  public void toData(DataOutput out) throws IOException;
+  void toData(DataOutput out) throws IOException;
 
   /**
    * Reads the state of this object as primitive data from the given <code>DataInput</code>. <br>
@@ -862,7 +862,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
    * @throws IOException A problem occurs while reading from <code>in</code>
    * @throws ClassNotFoundException A class could not be loaded while reading from <code>in</code>
    */
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException;
+  void fromData(DataInput in) throws IOException, ClassNotFoundException;
 
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
index 6930923..0fcca72 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
@@ -168,6 +168,6 @@ public class NanoTimer {
     /**
      * Returns the current time.
      */
-    public long getTime();
+    long getTime();
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java b/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
index 26b3912..8b5a9e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.internal;
 
-import java.io.*;
+import java.io.DataOutput;
+import java.io.IOException;
 
 
 /**
@@ -30,5 +31,5 @@ public interface ObjToByteArraySerializer extends DataOutput {
    *
    * @throws IOException if something goes wrong during serialization
    */
-  public void writeAsSerializedByteArray(Object v) throws IOException;
+  void writeAsSerializedByteArray(Object v) throws IOException;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
index 2960d1d..e143a8b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
@@ -150,7 +150,7 @@ public class OneTaskOnlyExecutor {
     }
   }
 
-  public static interface ConflatedTaskListener {
+  public interface ConflatedTaskListener {
     void taskDropped();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
index c594647..8bcdd9b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
@@ -32,6 +32,6 @@ public interface SerializationVersions {
    * The method name is formed with the version's product name and its major, minor, release and
    * patch numbers.
    */
-  public Version[] getSerializationVersions();
+  Version[] getSerializationVersions();
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
index b90aa03..12536c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataStream.java
@@ -39,5 +39,5 @@ public interface VersionedDataStream {
    * {@link Version}, then this member cannot do any adjustment to serialization and its the remote
    * peer's responsibility to adjust the serialization/deserialization according to this peer.
    */
-  public Version getVersion();
+  Version getVersion();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java b/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
index 17ebe44..a0f6f45 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/AdminBridgeServer.java
@@ -25,5 +25,5 @@ public interface AdminBridgeServer extends CacheServer {
   /**
    * Returns the VM-unique id of this cache server
    */
-  public int getId();
+  int getId();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java b/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
index be0f8b53..4f5c6c2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/Alert.java
@@ -25,24 +25,24 @@ import org.apache.geode.internal.logging.InternalLogWriter;
  */
 public interface Alert {
   /** The level at which this alert is issued */
-  public int getLevel();
+  int getLevel();
 
   /** The member of the distributed system that issued the alert */
-  public GemFireVM getGemFireVM();
+  GemFireVM getGemFireVM();
 
   /**
    * The name of the <code>GemFireConnection</code> through which the alert was issued.
    */
-  public String getConnectionName();
+  String getConnectionName();
 
   /** The id of the source of the alert (such as a thread in a VM) */
-  public String getSourceId();
+  String getSourceId();
 
   /** The alert's message */
-  public String getMessage();
+  String getMessage();
 
   /** The time at which the alert was issued */
-  public java.util.Date getDate();
+  java.util.Date getDate();
 
   /**
    * Returns a InternalDistributedMember instance representing a member that is sending (or has
@@ -53,16 +53,16 @@ public interface Alert {
    *
    * @since GemFire 6.5
    */
-  public InternalDistributedMember getSender();
+  InternalDistributedMember getSender();
 
-  public static final int ALL = InternalLogWriter.ALL_LEVEL;
-  public static final int OFF = InternalLogWriter.NONE_LEVEL;
-  public static final int FINEST = InternalLogWriter.FINEST_LEVEL;
-  public static final int FINER = InternalLogWriter.FINER_LEVEL;
-  public static final int FINE = InternalLogWriter.FINE_LEVEL;
-  public static final int CONFIG = InternalLogWriter.CONFIG_LEVEL;
-  public static final int INFO = InternalLogWriter.INFO_LEVEL;
-  public static final int WARNING = InternalLogWriter.WARNING_LEVEL;
-  public static final int ERROR = InternalLogWriter.ERROR_LEVEL;
-  public static final int SEVERE = InternalLogWriter.SEVERE_LEVEL;
+  int ALL = InternalLogWriter.ALL_LEVEL;
+  int OFF = InternalLogWriter.NONE_LEVEL;
+  int FINEST = InternalLogWriter.FINEST_LEVEL;
+  int FINER = InternalLogWriter.FINER_LEVEL;
+  int FINE = InternalLogWriter.FINE_LEVEL;
+  int CONFIG = InternalLogWriter.CONFIG_LEVEL;
+  int INFO = InternalLogWriter.INFO_LEVEL;
+  int WARNING = InternalLogWriter.WARNING_LEVEL;
+  int ERROR = InternalLogWriter.ERROR_LEVEL;
+  int SEVERE = InternalLogWriter.SEVERE_LEVEL;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java b/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
index ee8cd7e..775b566 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/AlertListener.java
@@ -22,5 +22,5 @@ public interface AlertListener extends java.util.EventListener {
   /**
    * Invoked when an <code>Alert</code> is received.
    */
-  public void alert(Alert alert);
+  void alert(Alert alert);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
index 54264a5..8191b1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ApplicationVM.java
@@ -27,5 +27,5 @@ public interface ApplicationVM extends GemFireVM {
    *
    * @see org.apache.geode.internal.cache.CacheServerLauncher
    */
-  public boolean isDedicatedCacheServer();
+  boolean isDedicatedCacheServer();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
index 3edec04..e0ca4b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheInfo.java
@@ -24,28 +24,28 @@ public interface CacheInfo {
   /**
    * Returns the name of this cache.
    */
-  public String getName();
+  String getName();
 
   /**
    * Return and Id that can be used to determine what instance of the cache the information pertains
    * to.
    */
-  public int getId();
+  int getId();
 
   /**
    * Returns true if the current cache is closed.
    */
-  public boolean isClosed();
+  boolean isClosed();
 
   /**
    * Gets the number of seconds a cache operation will wait to obtain a distributed lock lease.
    */
-  public int getLockTimeout();
+  int getLockTimeout();
 
   /**
    * Gets the length, in seconds, of distributed lock leases obtained by this cache.
    */
-  public int getLockLease();
+  int getLockLease();
 
   /**
    * Gets the number of seconds a cache {@link org.apache.geode.cache.Region#get(Object) get}
@@ -53,42 +53,42 @@ public interface CacheInfo {
    * spent loading the object. When the search times out it causes the get to fail by throwing an
    * exception.
    */
-  public int getSearchTimeout();
+  int getSearchTimeout();
 
   /**
    * Returns the number of seconds that have elapsed since this cache was created. Returns
    * <code>-1</code> if this cache is closed.
    */
-  public int getUpTime();
+  int getUpTime();
 
   /**
    * Returns the names of all the root regions currently in this cache. Returns null if cache is
    * closed.
    */
-  public java.util.Set getRootRegionNames();
+  java.util.Set getRootRegionNames();
 
   /**
    * Returns the statistic resource that contains this cache's performance statistics. Returns null
    * if the cache is closed;
    */
-  public StatResource getPerfStats();
+  StatResource getPerfStats();
 
   /**
    * Forces this instance to be closed. Does not actually close the cache.
    */
-  public void setClosed();
+  void setClosed();
 
   /**
    * Returns the ids of all of the bridge servers that are associated with this cache.
    *
    * @since GemFire 4.0
    */
-  public int[] getBridgeServerIds();
+  int[] getBridgeServerIds();
 
   /**
    * Returns whether or not this is a cache "server"
    *
    * @since GemFire 4.0
    */
-  public boolean isServer();
+  boolean isServer();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
index 813637e..efba1f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/CacheSnapshot.java
@@ -20,17 +20,17 @@ package org.apache.geode.internal.admin;
  * {@linkplain EntrySnapshot entry} in a cache.
  */
 public interface CacheSnapshot extends java.io.Serializable {
-  public Object getName();
+  Object getName();
 
-  public Object getUserAttribute();
+  Object getUserAttribute();
 
-  public long getLastModifiedTime();
+  long getLastModifiedTime();
 
-  public long getLastAccessTime();
+  long getLastAccessTime();
 
-  public long getNumberOfHits();
+  long getNumberOfHits();
 
-  public long getNumberOfMisses();
+  long getNumberOfMisses();
 
-  public float getHitRatio();
+  float getHitRatio();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
index 51bbee3..c9df3a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/DLockInfo.java
@@ -18,23 +18,23 @@ package org.apache.geode.internal.admin;
 import java.io.Serializable;
 import java.util.Date;
 
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
 /**
  * Represents display information about a single distributed lock
  */
 public interface DLockInfo extends Serializable {
-  public String getService();
+  String getService();
 
-  public String getThreadId();
+  String getThreadId();
 
-  public String getLockName();
+  String getLockName();
 
-  public boolean isAcquired();
+  boolean isAcquired();
 
-  public int getRecursionCount();
+  int getRecursionCount();
 
-  public InternalDistributedMember getOwner();
+  InternalDistributedMember getOwner();
 
-  public Date getLeaseExpireTime();
+  Date getLeaseExpireTime();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
index 83b8be5..87ac381 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/EntrySnapshot.java
@@ -23,5 +23,5 @@ public interface EntrySnapshot extends CacheSnapshot {
   /**
    * Returns the value of the <code>Region</code> entry
    */
-  public Object getValue();
+  Object getValue();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java b/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
index e6f27d0..08417d3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/EntryValueNode.java
@@ -23,26 +23,26 @@ public interface EntryValueNode {
   /**
    * Returns true if this node represents a primitive value or String
    */
-  public boolean isPrimitiveOrString();
+  boolean isPrimitiveOrString();
 
   /**
    * Returns the field name, if any
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the class name
    */
-  public String getType();
+  String getType();
 
   /**
    * Returns the fields in physical inspection, or the logical elements in logical inspection
    */
-  public EntryValueNode[] getChildren();
+  EntryValueNode[] getChildren();
 
   /**
    * Returns the wrapped primitive value if this is a primitive or the result of calling
    * <code>toString()</code> if this is an object.
    */
-  public Object getPrimitiveValue();
+  Object getPrimitiveValue();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
index c5de447..80c0337 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
@@ -15,11 +15,6 @@
 
 package org.apache.geode.internal.admin;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
 import org.apache.geode.admin.AdminException;
 import org.apache.geode.admin.GemFireHealth;
 import org.apache.geode.admin.GemFireHealthConfig;
@@ -39,80 +34,79 @@ public interface GemFireVM {
   /**
    * Constant for lightweight cache inspection. Entry values will be returned as Strings.
    */
-  public static final int LIGHTWEIGHT_CACHE_VALUE = 100;
+  int LIGHTWEIGHT_CACHE_VALUE = 100;
 
   /**
    * Constant for logical cache inspection. Entry values will be returned as a tree of
    * {@link EntryValueNode}s, with each node containing its logical elements.
    */
-  public static final int LOGICAL_CACHE_VALUE = 200;
+  int LOGICAL_CACHE_VALUE = 200;
 
   /**
    * Constant for physical cache inspection. Entry values will be returned as a tree of
    * {@link EntryValueNode}s, with each node containing its declared fields.
    */
-  public static final int PHYSICAL_CACHE_VALUE = 300;
+  int PHYSICAL_CACHE_VALUE = 300;
 
   /**
    * Returns the host the vm is running on.
    */
-  public java.net.InetAddress getHost();
+  java.net.InetAddress getHost();
 
   /**
    * Returns the name of the remote system connection.
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns the directory in which the member runs
    *
    * @since GemFire 4.0
    */
-  public java.io.File getWorkingDirectory();
+  java.io.File getWorkingDirectory();
 
   /**
    * Returns the product directory (the value of GEODE_HOME env variable)
    */
-  public java.io.File getGeodeHomeDir();
+  java.io.File getGeodeHomeDir();
 
   /**
    * Returns the time the system was started
    */
-  public java.util.Date getBirthDate();
+  java.util.Date getBirthDate();
 
   /**
    * Returns a String describing the vm's gemfire version info
    *
    * @since GemFire 3.5
    */
-  public String getVersionInfo();
+  String getVersionInfo();
 
   /**
    * Returns all statistic resources except those involving SharedClass
    */
-  public StatResource[] getStats(String statisticsTypeName);
+  StatResource[] getStats(String statisticsTypeName);
 
   /**
    * Returns all statistic resources
    */
-  public StatResource[] getAllStats();
+  StatResource[] getAllStats();
 
   /**
    * Returns a snapshot of the distributed lock services
    */
-  public DLockInfo[] getDistributedLockInfo();
+  DLockInfo[] getDistributedLockInfo();
 
   /**
    * Adds a {@link StatListener} for the given resource and attribute. Changes in value will be
    * streamed back from the vm.
    */
-  public void addStatListener(StatListener observer, StatResource observedResource,
-      Stat observedStat);
+  void addStatListener(StatListener observer, StatResource observedResource, Stat observedStat);
 
   /**
    * Removes {@link StatListener}
    */
-  public void removeStatListener(StatListener observer);
+  void removeStatListener(StatListener observer);
 
   /**
    * Adds a {@link HealthListener} with the given configuration to the vm. If a health listener has
@@ -121,21 +115,21 @@ public interface GemFireVM {
    * @param cfg determines how and when the health will be checked.
    * @since GemFire 3.5
    */
-  public void addHealthListener(HealthListener observer, GemFireHealthConfig cfg);
+  void addHealthListener(HealthListener observer, GemFireHealthConfig cfg);
 
   /**
    * Removes an added health listener.
    *
    * @since GemFire 3.5
    */
-  public void removeHealthListener();
+  void removeHealthListener();
 
   /**
    * Resets the current health status to "good".
    *
    * @since GemFire 3.5
    */
-  public void resetHealthStatus();
+  void resetHealthStatus();
 
   /**
    * Returns detailed information explaining the current health status. Each array element is a
@@ -146,12 +140,12 @@ public interface GemFireVM {
    *
    * @since GemFire 3.5
    */
-  public String[] getHealthDiagnosis(GemFireHealth.Health healthCode);
+  String[] getHealthDiagnosis(GemFireHealth.Health healthCode);
 
   /**
    * Returns the runtime {@link Config} from the vm
    */
-  public Config getConfig();
+  Config getConfig();
 
   /**
    * Returns the runtime {@link org.apache.geode.admin.GemFireMemberStatus} from the vm The idea is
@@ -160,7 +154,7 @@ public interface GemFireVM {
    *
    * @since GemFire 5.7
    */
-  public GemFireMemberStatus getSnapshot();
+  GemFireMemberStatus getSnapshot();
 
   /**
    * Returns the runtime {@link org.apache.geode.admin.RegionSubRegionSnapshot} from the vm The idea
@@ -168,40 +162,40 @@ public interface GemFireVM {
    *
    * @since GemFire 5.7
    */
-  public RegionSubRegionSnapshot getRegionSnapshot();
+  RegionSubRegionSnapshot getRegionSnapshot();
 
   /**
    * Sets the runtime configurable parameters in the gemfire vm's {@link Config}
    */
-  public void setConfig(Config cfg);
+  void setConfig(Config cfg);
 
   /**
    * Returns the locally running agent through which we access the remote vm
    */
-  public GfManagerAgent getManagerAgent();
+  GfManagerAgent getManagerAgent();
 
 
   /**
    * Returns the the main log and the tail of the currently active child log, or just the tail of
    * the main log if child logging is disabled.
    */
-  public String[] getSystemLogs();
+  String[] getSystemLogs();
 
   /**
    * Sets the additional classpath settings to be used in the remote vm when processing admin
    * messages from the console. It can be changed in between messages.
    */
-  public void setInspectionClasspath(String classpath);
+  void setInspectionClasspath(String classpath);
 
   /**
    * Returns classpath info set by {@link GemFireVM#setInspectionClasspath}
    */
-  public String getInspectionClasspath();
+  String getInspectionClasspath();
 
   /**
    * Returns the root cache region or null if the root region hasn't been created.
    */
-  public Region[] getRootRegions();
+  Region[] getRootRegions();
 
   /**
    * Return the existing region (or subregion) with the specified path that already exists or is
@@ -215,7 +209,7 @@ public interface GemFireVM {
    * @throws IllegalArgumentException if path is null, the empty string, or "/"
    * @since GemFire 3.5
    */
-  public Region getRegion(CacheInfo c, String path);
+  Region getRegion(CacheInfo c, String path);
 
   /**
    * Creates a new root VM region with the given name and attributes in this remote VM. Information
@@ -225,8 +219,7 @@ public interface GemFireVM {
    *
    * @since GemFire 4.0
    */
-  public Region createVMRootRegion(CacheInfo c, String name, RegionAttributes attrs)
-      throws AdminException;
+  Region createVMRootRegion(CacheInfo c, String name, RegionAttributes attrs) throws AdminException;
 
   /**
    * Creates a new root VM region with the given name and attributes in this remote VM. Information
@@ -236,7 +229,7 @@ public interface GemFireVM {
    *
    * @since GemFire 4.0
    */
-  public Region createSubregion(CacheInfo c, String parentPath, String name, RegionAttributes attrs)
+  Region createSubregion(CacheInfo c, String parentPath, String name, RegionAttributes attrs)
       throws AdminException;
 
   /**
@@ -245,13 +238,13 @@ public interface GemFireVM {
    *
    * @throws IllegalArgumentException if the type is not one of the appropriate constants
    */
-  public void setCacheInspectionMode(int mode);
+  void setCacheInspectionMode(int mode);
 
   /**
    * Returns one of these constants {@link #LIGHTWEIGHT_CACHE_VALUE}, {@link #LOGICAL_CACHE_VALUE},
    * or {@link #PHYSICAL_CACHE_VALUE}.
    */
-  public int getCacheInspectionMode();
+  int getCacheInspectionMode();
 
   /**
    * Causes a snapshot of the given region to be taken. Results are streamed back to any
@@ -259,7 +252,7 @@ public interface GemFireVM {
    *
    * @param regionName the region to snapshot
    */
-  public void takeRegionSnapshot(String regionName, int snapshotId);
+  void takeRegionSnapshot(String regionName, int snapshotId);
 
   // /**
   // * Clears any results of a snapshot request still waiting to be streamed back
@@ -280,52 +273,52 @@ public interface GemFireVM {
    * The distribution ID if this VM. Its used to identify this VM by members if this VM's
    * distributed system.
    */
-  public InternalDistributedMember getId();
+  InternalDistributedMember getId();
 
   /**
    * Returns information on this vm's cache. If the vm does not have a cache then <code>null</code>
    * is returned.
    */
-  public CacheInfo getCacheInfo();
+  CacheInfo getCacheInfo();
 
   /**
    * Sets the lockTimeout configuration value for the given cache and then returns the current info
    * for that cache.
    */
-  public CacheInfo setCacheLockTimeout(CacheInfo c, int v) throws AdminException;
+  CacheInfo setCacheLockTimeout(CacheInfo c, int v) throws AdminException;
 
   /**
    * Sets the lockLease configuration value for the given cache and then returns the current info
    * for that cache.
    */
-  public CacheInfo setCacheLockLease(CacheInfo c, int v) throws AdminException;
+  CacheInfo setCacheLockLease(CacheInfo c, int v) throws AdminException;
 
   /**
    * Sets the searchTimeout configuration value for the given cache and then returns the current
    * info for that cache.
    */
-  public CacheInfo setCacheSearchTimeout(CacheInfo c, int v) throws AdminException;
+  CacheInfo setCacheSearchTimeout(CacheInfo c, int v) throws AdminException;
 
   /**
    * Adds a bridge server a cache in this VM
    *
    * @since GemFire 4.0
    */
-  public AdminBridgeServer addCacheServer(CacheInfo cache) throws AdminException;
+  AdminBridgeServer addCacheServer(CacheInfo cache) throws AdminException;
 
   /**
    * Returns information about a bridge server that runs in this VM
    *
    * @param id The unique {@link AdminBridgeServer#getId id} of the bridge server
    */
-  public AdminBridgeServer getBridgeInfo(CacheInfo cache, int id) throws AdminException;
+  AdminBridgeServer getBridgeInfo(CacheInfo cache, int id) throws AdminException;
 
   /**
    * Starts a bridge server in this VM
    *
    * @since GemFire 4.0
    */
-  public AdminBridgeServer startBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
+  AdminBridgeServer startBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
       throws AdminException;
 
   /**
@@ -333,7 +326,7 @@ public interface GemFireVM {
    *
    * @since GemFire 4.0
    */
-  public AdminBridgeServer stopBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
+  AdminBridgeServer stopBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
       throws AdminException;
 
   /**
@@ -347,8 +340,7 @@ public interface GemFireVM {
    *
    * @since GemFire 5.7
    */
-  public void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval,
-      boolean setRemotely);
+  void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval, boolean setRemotely);
 
   /**
    * This method would be used to set refresh interval for the GemFireVM. This method would mostly
@@ -358,7 +350,7 @@ public interface GemFireVM {
    *
    * @since GemFire 5.7
    */
-  public void setRefreshInterval(long refreshInterval);
+  void setRefreshInterval(long refreshInterval);
 
   /**
    * This method would be used to set Sta Alert Definitions for the GemFireVM. This method would
@@ -372,5 +364,5 @@ public interface GemFireVM {
    *
    * @since GemFire 5.7
    */
-  public void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode);
+  void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
index 91f4855..197b0be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GfManagerAgent.java
@@ -30,12 +30,12 @@ public interface GfManagerAgent {
    *
    * @return true if this call resulted in being disconnected
    */
-  public boolean disconnect();
+  boolean disconnect();
 
   /**
    * Returns whether or not the agent is connected to the distributed system.
    */
-  public boolean isConnected();
+  boolean isConnected();
 
   /**
    * Returns whether or not this manager agent has created admin objects for the initial members of
@@ -43,39 +43,39 @@ public interface GfManagerAgent {
    *
    * @since GemFire 4.0
    */
-  public boolean isInitialized();
+  boolean isInitialized();
 
   /**
    * Returns whether or not the agent is listening for messages from the distributed system.
    */
-  public boolean isListening();
+  boolean isListening();
 
   /**
    * Returns information about the application VMs that are members of the distributed system.
    */
-  public ApplicationVM[] listApplications();
+  ApplicationVM[] listApplications();
 
   /**
    * Returns a list of the other distributed systems that this agent knows about. Currently (GemFire
    * 3.0) the agent does not know about any other distributed systems.
    */
-  public GfManagerAgent[] listPeers();
+  GfManagerAgent[] listPeers();
 
   /**
    * Registers a <code>JoinLeaveListener</code>. on this agent that is notified when membership in
    * the distributed system changes.
    */
-  public void addJoinLeaveListener(JoinLeaveListener observer);
+  void addJoinLeaveListener(JoinLeaveListener observer);
 
   /**
    * Sets the <code>CacheCollector</code> to which this agent delivers {@link CacheSnapshot}s.
    */
-  public void setCacheCollector(CacheCollector collector);
+  void setCacheCollector(CacheCollector collector);
 
   /**
    * Deregisters a <code>JoinLeaveListener</code> from this agent.
    */
-  public void removeJoinLeaveListener(JoinLeaveListener observer);
+  void removeJoinLeaveListener(JoinLeaveListener observer);
 
   // public void addSnapshotListener(SnapshotListener listener);
 
@@ -86,18 +86,18 @@ public interface GfManagerAgent {
    *
    * @since GemFire 3.5
    */
-  public DistributionManager getDM();
+  DistributionManager getDM();
 
   /**
    * Sets the alert level for this manager agent.
    */
-  public void setAlertLevel(int level);
+  void setAlertLevel(int level);
 
   /**
    * Returns the distributed system that is administered by this agent.
    *
    * @since GemFire 4.0
    */
-  public InternalDistributedSystem getDSConnection();
+  InternalDistributedSystem getDSConnection();
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
index 9a8d3f0..6b2daed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GfObject.java
@@ -19,11 +19,11 @@ package org.apache.geode.internal.admin;
  * The root of our little client side administration object model
  */
 public interface GfObject {
-  public int getID();
+  int getID();
 
-  public String getName();
+  String getName();
 
-  public String getType();
+  String getType();
 
-  public String getDescription();
+  String getDescription();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java b/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
index 48d5020..d98eb19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/HealthListener.java
@@ -32,6 +32,6 @@ public interface HealthListener {
    * @param member The member whose health has changed
    * @param status the new health status
    */
-  public void healthChanged(GemFireVM member, GemFireHealth.Health status);
+  void healthChanged(GemFireVM member, GemFireHealth.Health status);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java b/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
index 86ce5c5..a9c91bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/JoinLeaveListener.java
@@ -20,9 +20,9 @@ package org.apache.geode.internal.admin;
  * GemFire system
  */
 public interface JoinLeaveListener extends java.util.EventListener {
-  public void nodeJoined(GfManagerAgent source, GemFireVM joined);
+  void nodeJoined(GfManagerAgent source, GemFireVM joined);
 
-  public void nodeLeft(GfManagerAgent source, GemFireVM left);
+  void nodeLeft(GfManagerAgent source, GemFireVM left);
 
-  public void nodeCrashed(GfManagerAgent source, GemFireVM crashed);
+  void nodeCrashed(GfManagerAgent source, GemFireVM crashed);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
index 7200d5e..12da194 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/RegionSnapshot.java
@@ -25,5 +25,5 @@ public interface RegionSnapshot extends CacheSnapshot {
   /**
    * Returns the attributes of the <code>Region</code>
    */
-  public RegionAttributes getAttributes();
+  RegionAttributes getAttributes();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java b/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
index 76ba20e..60a257d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/SnapshotClient.java
@@ -30,5 +30,5 @@ public interface SnapshotClient {
    * @param responders All of the members ({@link GemFireVM}s) that have responded to the snapshot
    *        request.
    */
-  public void updateSnapshot(CacheSnapshot snapshot, List responders);
+  void updateSnapshot(CacheSnapshot snapshot, List responders);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java b/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
index fb2e482..8d99613 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/Stat.java
@@ -24,16 +24,16 @@ public interface Stat extends GfObject {
   /**
    * @return the value of this stat as a <code>java.lang.Number</code>
    */
-  public Number getValue();
+  Number getValue();
 
   /**
    * @return a display string for the unit of measurement (if any) this stat represents
    */
-  public String getUnits();
+  String getUnits();
 
   /**
    * @return true if this stat represents a numeric value which always increases
    */
-  public boolean isCounter();
+  boolean isCounter();
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
index 7b7142a..3886112 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatAlertDefinition.java
@@ -26,11 +26,11 @@ public interface StatAlertDefinition extends DataSerializable {
   /**
    * Get the unique ID for AlertDefinition, created using the hashCode of StringRepresentation
    */
-  public int getId();
+  int getId();
 
-  public StatisticInfo[] getStatisticInfo();
+  StatisticInfo[] getStatisticInfo();
 
-  public void setStatisticInfo(StatisticInfo[] info);
+  void setStatisticInfo(StatisticInfo[] info);
 
   // public boolean isADecoratorOf(Constant decoType [Function,
   // SystemWideFunction, Gauge, Number]);
@@ -38,25 +38,25 @@ public interface StatAlertDefinition extends DataSerializable {
   /**
    * Evaluate using the passed params and not using the getValue
    */
-  public boolean evaluate(Number[] params);
+  boolean evaluate(Number[] params);
 
   /**
    * Evaluate the said AlertDefinition. Value of Statistic would be gotten from StatisticInfo
    * Objects
    */
-  public boolean evaluate();
+  boolean evaluate();
 
   /**
    * Evaluate using the passed params and not using the getValue Return a StatAlert object if one is
    * raised
    */
-  public StatAlert evaluateAndAlert(Number[] params);
+  StatAlert evaluateAndAlert(Number[] params);
 
   /**
    * Evaluate the said AlertDefinition. Value of Statistic would be gotten from StatisticInfo
    * Objects. Return a StatAlert object if one is raised
    */
-  public StatAlert evaluateAndAlert();
+  StatAlert evaluateAndAlert();
 
   /**
    * Get the value of the Statistic this Definition object is created for Depending on the Decorator
@@ -64,7 +64,7 @@ public interface StatAlertDefinition extends DataSerializable {
    *
    * @return Number[]
    */
-  public Number[] getValue();
+  Number[] getValue();
 
   /**
    * Get the value of the Statistic this Definition object is created for Depending on the Decorator
@@ -72,27 +72,27 @@ public interface StatAlertDefinition extends DataSerializable {
    *
    * @return Number[]
    */
-  public Number[] getValue(Number[] vals);
+  Number[] getValue(Number[] vals);
 
-  public boolean verify(StatisticsFactory factory);
+  boolean verify(StatisticsFactory factory);
 
-  public boolean hasDecorator(String decoratorID);
+  boolean hasDecorator(String decoratorID);
 
-  public StatAlertDefinition getDecorator(String decoratorID);
+  StatAlertDefinition getDecorator(String decoratorID);
 
-  public String getStringRepresentation();
+  String getStringRepresentation();
 
   /**
    * This method returns the name of this stat alert definition.
    *
    * @return Name of the StatAlertDefinition
    */
-  public String getName();
+  String getName();
 
   /**
    * This method sets the name of this stat alert definition.
    *
    * @param name name to be set for this StatAlertDefinition.
    */
-  public void setName(String name);
+  void setName(String name);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
index f3033f7..062f1ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatListener.java
@@ -25,12 +25,12 @@ public interface StatListener {
    * @param value The new value of the statistic
    * @param time The time at which the statistic's value change was detected
    */
-  public void statValueChanged(double value, long time);
+  void statValueChanged(double value, long time);
 
   /**
    * Invoked when the value of a statistic has not changed
    *
    * @param time The time of the latest statistic sample
    */
-  public void statValueUnchanged(long time);
+  void statValueUnchanged(long time);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java b/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
index b844325..c96812f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/StatResource.java
@@ -22,22 +22,22 @@ package org.apache.geode.internal.admin;
  */
 public interface StatResource extends GfObject {
 
-  public long getResourceID();
+  long getResourceID();
 
-  public long getResourceUniqueID();
+  long getResourceUniqueID();
 
-  public String getSystemName();
+  String getSystemName();
 
-  public GemFireVM getGemFireVM();
+  GemFireVM getGemFireVM();
 
-  public Stat[] getStats();
+  Stat[] getStats();
 
-  public Stat getStatByName(String name);
+  Stat getStatByName(String name);
 
-  public String getName();
+  String getName();
 
   /**
    * @return the full description of this statistic resource
    */
-  public String getDescription();
+  String getDescription();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
index 0aec9ed..2821c11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/Cancellable.java
@@ -21,5 +21,5 @@ package org.apache.geode.internal.admin.remote;
  * during their processing.
  */
 public interface Cancellable {
-  public void cancel();
+  void cancel();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
index ded2f48..b7e7067 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfo.java
@@ -29,50 +29,50 @@ public interface StatisticInfo extends DataSerializable {
   /**
    * @return name of statistics
    */
-  public String getStatisticName();
+  String getStatisticName();
 
   /**
    *
    * @param statisticName Name of statistic
    */
-  public void setStatisticName(String statisticName);
+  void setStatisticName(String statisticName);
 
   /**
    *
    * @return instance of statistic descriptor
    */
-  public StatisticDescriptor getStatisticDescriptor();
+  StatisticDescriptor getStatisticDescriptor();
 
   /**
    * @return text id of the associated {@link Statistics}
    */
-  public String getStatisticsTextId();
+  String getStatisticsTextId();
 
   /**
    * @param statisticsTextId Text id of the associated {@link Statistics}
    */
-  public void setStatisticsTextId(String statisticsTextId);
+  void setStatisticsTextId(String statisticsTextId);
 
   /**
    * @return instance of associated {@link Statistics}
    */
-  public Statistics getStatistics();
+  Statistics getStatistics();
 
   /**
    *
    * @return associated {@link StatisticsType}
    */
-  public String getStatisticsTypeName();
+  String getStatisticsTypeName();
 
   /**
    *
    * @param statisticsType Associated {@link StatisticsType}
    */
-  public void setStatisticsTypeName(String statisticsType);
+  void setStatisticsTypeName(String statisticsType);
 
   /**
    *
    * @return value of statistic
    */
-  public Number getValue();
+  Number getValue();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java
index f866528..e8db99c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java
@@ -26,14 +26,14 @@ public interface AL {
    *
    * @return the current value
    */
-  public long get();
+  long get();
 
   /**
    * Sets to the given value.
    *
    * @param newValue the new value
    */
-  public void set(long newValue);
+  void set(long newValue);
 
   /**
    * Atomically sets to the given value and returns the old value.
@@ -41,7 +41,7 @@ public interface AL {
    * @param newValue the new value
    * @return the previous value
    */
-  public long getAndSet(long newValue);
+  long getAndSet(long newValue);
 
   /**
    * Atomically sets the value to the given updated value if the current value {@code ==} the
@@ -52,7 +52,7 @@ public interface AL {
    * @return true if successful. False return indicates that the actual value was not equal to the
    *         expected value.
    */
-  public boolean compareAndSet(long expect, long update);
+  boolean compareAndSet(long expect, long update);
 
   /**
    * Atomically sets the value to the given updated value if the current value {@code ==} the
@@ -66,21 +66,21 @@ public interface AL {
    * @param update the new value
    * @return true if successful.
    */
-  public boolean weakCompareAndSet(long expect, long update);
+  boolean weakCompareAndSet(long expect, long update);
 
   /**
    * Atomically increments by one the current value.
    *
    * @return the previous value
    */
-  public long getAndIncrement();
+  long getAndIncrement();
 
   /**
    * Atomically decrements by one the current value.
    *
    * @return the previous value
    */
-  public long getAndDecrement();
+  long getAndDecrement();
 
   /**
    * Atomically adds the given value to the current value.
@@ -88,21 +88,21 @@ public interface AL {
    * @param delta the value to add
    * @return the previous value
    */
-  public long getAndAdd(long delta);
+  long getAndAdd(long delta);
 
   /**
    * Atomically increments by one the current value.
    *
    * @return the updated value
    */
-  public long incrementAndGet();
+  long incrementAndGet();
 
   /**
    * Atomically decrements by one the current value.
    *
    * @return the updated value
    */
-  public long decrementAndGet();
+  long decrementAndGet();
 
   /**
    * Atomically adds the given value to the current value.
@@ -110,7 +110,7 @@ public interface AL {
    * @param delta the value to add
    * @return the updated value
    */
-  public long addAndGet(long delta);
+  long addAndGet(long delta);
 
   /**
    * Atomically sets the value to the given updated value if the given value {@code >} the current
@@ -119,5 +119,5 @@ public interface AL {
    *
    * @param update
    */
-  public boolean setIfGreater(long update);
+  boolean setIfGreater(long update);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java
index b07d7c9..b7f84e2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java
@@ -36,13 +36,13 @@ public interface MapCallback<K, V, C, P> {
   /**
    * Token to return from {@link #removeValue} to indicate that remove has to be aborted.
    */
-  public static final Object ABORT_REMOVE_TOKEN = new Object();
+  Object ABORT_REMOVE_TOKEN = new Object();
 
   /**
    * Token object to indicate that {@link #removeValue} does not need to compare against provided
    * value before removing from segment.
    */
-  public static final Object NO_OBJECT_TOKEN = new Object();
+  Object NO_OBJECT_TOKEN = new Object();
 
   /**
    * Create a new instance of the value object given the key and provided parameters for
@@ -54,7 +54,7 @@ public interface MapCallback<K, V, C, P> {
    *
    * @return the new value to be inserted in the map
    */
-  public V newValue(K key, C context, P createParams, MapResult result);
+  V newValue(K key, C context, P createParams, MapResult result);
 
   /**
    * Invoked when an existing value in map is read by the <code>create</code> method in custom map
@@ -68,7 +68,7 @@ public interface MapCallback<K, V, C, P> {
    * @return updated value to be put in the map, if non-null; if null then retry the map operation
    *         internally
    */
-  public V updateValue(K key, V oldValue, C context, P params);
+  V updateValue(K key, V oldValue, C context, P params);
 
   /**
    * Invoked after put is successful with the result of {@link #updateValue}.
@@ -78,19 +78,19 @@ public interface MapCallback<K, V, C, P> {
    * @param newValue the new value to be replaced
    * @param context any callback argument passed to put overload
    */
-  public void afterUpdate(K key, K mapKey, V newValue, C context);
+  void afterUpdate(K key, K mapKey, V newValue, C context);
 
   /**
    * Returns true if {@link #updateValue} should be invoked else false.
    */
-  public boolean requiresUpdateValue();
+  boolean requiresUpdateValue();
 
   /**
    * Invoked when an existing value in map is read by read ops.
    *
    * @param oldValue the value read by create that will be returned
    */
-  public void oldValueRead(V oldValue);
+  void oldValueRead(V oldValue);
 
   /**
    * Check if the existing value should be removed by the custom <code>remove</code> methods that
@@ -106,7 +106,7 @@ public interface MapCallback<K, V, C, P> {
    * @param context any context in which this method has been invoked
    * @param removeParams parameters, if any, to be passed for cleanup of the object
    */
-  public Object removeValue(Object key, Object value, V existingValue, C context, P removeParams);
+  Object removeValue(Object key, Object value, V existingValue, C context, P removeParams);
 
   /**
    * Invoked after removal of an entry. Some implementations (CustomEntryConcurrentHashMap) will
@@ -121,7 +121,7 @@ public interface MapCallback<K, V, C, P> {
    * @param context any context in which this method has been invoked
    * @param removeParams parameters, if any, to be passed for cleanup of the object
    */
-  public void postRemove(Object key, Object value, V existingValue, C context, P removeParams);
+  void postRemove(Object key, Object value, V existingValue, C context, P removeParams);
 
   /**
    * Invoked when an existing value in map is read by the <code>replace</code> method in custom map
@@ -137,7 +137,7 @@ public interface MapCallback<K, V, C, P> {
    * @return updated value to be actually put in the map, if non-null; if null then retry the map
    *         operation internally
    */
-  public V replaceValue(K key, V oldValue, V existingValue, V newValue, C context, P params);
+  V replaceValue(K key, V oldValue, V existingValue, V newValue, C context, P params);
 
   /**
    * Invoked after the node is found and just before the replace. The replace may still either
@@ -148,7 +148,7 @@ public interface MapCallback<K, V, C, P> {
    * @param context any context argument passed to replace
    * @param params any callback parameters passed to the replace method
    */
-  public Object beforeReplace(K mapKey, V newValue, C context, P params);
+  Object beforeReplace(K mapKey, V newValue, C context, P params);
 
   /**
    * Invoked after replace is successful and passing it the result of {@link #beforeReplace}.
@@ -159,7 +159,7 @@ public interface MapCallback<K, V, C, P> {
    * @param context any context argument passed to replace overload
    * @param params any callback parameters passed to the replace method
    */
-  public void afterReplace(K mapKey, V newValue, Object beforeResult, C context, P params);
+  void afterReplace(K mapKey, V newValue, Object beforeResult, C context, P params);
 
   /**
    * Invoked after replace fails and passing it the result of {@link #beforeReplace}.
@@ -170,7 +170,7 @@ public interface MapCallback<K, V, C, P> {
    * @param context any context argument passed to replace overload
    * @param params any callback parameters passed to the replace method
    */
-  public void onReplaceFailed(K mapKey, V newValue, Object beforeResult, C context, P params);
+  void onReplaceFailed(K mapKey, V newValue, Object beforeResult, C context, P params);
 
   /**
    * Invoked after replace or delete fails at the end, passing it the intermediate values that were
@@ -188,11 +188,10 @@ public interface MapCallback<K, V, C, P> {
    *
    * @return value to be returned as result of operation ignoring failure (or null for failure)
    */
-  public V onOperationFailed(K key, Object oldValue, V updatedValue, V newValue, C context,
-      P params);
+  V onOperationFailed(K key, Object oldValue, V updatedValue, V newValue, C context, P params);
 
   /**
    * Invoked by some implementations like ConcurrentTHashSet to in its toArray.
    */
-  public void onToArray(C context);
+  void onToArray(C context);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java
index fa4de77..87e26f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java
@@ -29,10 +29,10 @@ public interface MapResult {
    * create methods. Default for MapResult is assumed to be true if this method was not invoked by
    * {@link MapCallback} explicitly.
    */
-  public void setNewValueCreated(boolean created);
+  void setNewValueCreated(boolean created);
 
   /**
    * Result set by {@link #setNewValueCreated(boolean)}. Default is required to be true.
    */
-  public boolean isNewValueCreated();
+  boolean isNewValueCreated();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
index 98636c0..a599cac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
@@ -27,23 +27,23 @@ public interface ConnectionPoolCache {
    * @return Object - connection from the pool.
    * @throws PoolException
    */
-  public Object getPooledConnectionFromPool() throws PoolException;
+  Object getPooledConnectionFromPool() throws PoolException;
 
   /**
    * This method will return the Pooled connection object back to the pool.
    *
    * @param connectionObject - Connection object returned to the pool.
    */
-  public void returnPooledConnectionToPool(Object connectionObject);
+  void returnPooledConnectionToPool(Object connectionObject);
 
   /**
    * This method is used to set the time out for active connection so that it can be collected by
    * the cleaner thread Modified by Asif
    */
-  public void expirePooledConnection(Object connectionObject);
+  void expirePooledConnection(Object connectionObject);
 
   /**
    * Clean up the resources before restart of Cache
    */
-  public void clearUp();
+  void clearUp();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
index 0d861d0..f381800 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
@@ -25,22 +25,22 @@ public interface ConnectionProvider {
    *
    * @return a PooledConnection object to the user.
    */
-  public Object borrowConnection() throws PoolException;
+  Object borrowConnection() throws PoolException;
 
   /**
    * Returns a PooledConnection object to the pool.
    *
    * @param connectionObject to be returned to the pool
    */
-  public void returnConnection(Object connectionObject);
+  void returnConnection(Object connectionObject);
 
   /**
    * Closes a PooledConnection object .
    */
-  public void returnAndExpireConnection(Object connectionObject);
+  void returnAndExpireConnection(Object connectionObject);
 
   /**
    * Clean up the resources before restart of Cache
    */
-  public void clearUp();
+  void clearUp();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceResources.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceResources.java
index 513ab31..0a8d934 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceResources.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceResources.java
@@ -24,21 +24,21 @@ package org.apache.geode.internal.datasource;
 public interface DataSourceResources {
 
   /** Creates a new instance of DataSourceResources */
-  public static final String JNDI_CONNECTION_POOL_DATA_SOURCE = "jdbc/ConnectionPoolDataSource";
+  String JNDI_CONNECTION_POOL_DATA_SOURCE = "jdbc/ConnectionPoolDataSource";
   /* Default limit of maximum number of connection in the connection pool */
-  public static final int CONNECTION_POOL_DEFAULT_MAX_LIMIT = 30;
+  int CONNECTION_POOL_DEFAULT_MAX_LIMIT = 30;
   /* Default initial connection pool size */
-  public static final int CONNECTION_POOL_DEFAULT_INIT_LIMIT = 10;
+  int CONNECTION_POOL_DEFAULT_INIT_LIMIT = 10;
   /*
    * Default time in seconds after which the connections in the available pool will expire
    */
-  public static final int CONNECTION_POOL_DEFAULT_EXPIRATION_TIME = 600;
+  int CONNECTION_POOL_DEFAULT_EXPIRATION_TIME = 600;
   // Default time in seconds after which the connections in the active cache
   // will be destroyed */
-  public static final int CONNECTION_POOL_DEFAULT_ACTIVE_TIME_OUT = 120;
+  int CONNECTION_POOL_DEFAULT_ACTIVE_TIME_OUT = 120;
   // Default time in seconds after which the client thread for
   // retrieving connection will experience timeout
-  public static final int CONNECTION_POOL_DEFAULT_CLIENT_TIME_OUT = 30;
+  int CONNECTION_POOL_DEFAULT_CLIENT_TIME_OUT = 30;
   // Default Cleaner thread sleep time in seconds 30
-  public static final int CLEANER_THREAD_SLEEP = 30;
+  int CLEANER_THREAD_SLEEP = 30;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
index bc41be0..3c2795c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
@@ -27,13 +27,13 @@ public interface StringId {
    *
    * @return unformated text
    **/
-  public String getRawText();
+  String getRawText();
 
   /**
    * @return the English translation of this StringId
    **/
   @Override
-  public String toString();
+  String toString();
 
 
   /**
@@ -42,12 +42,12 @@ public interface StringId {
    * @see java.text.MessageFormat
    * @return the English translation of this StringId
    **/
-  public String toString(Object... params);
+  String toString(Object... params);
 
   /**
    * @return the translation of this StringId based on the current {@link java.util.Locale}
    **/
-  public String toLocalizedString();
+  String toLocalizedString();
 
   /**
    * Substitutes parameter Objects into the text
@@ -55,5 +55,5 @@ public interface StringId {
    * @see java.text.MessageFormat
    * @return the translation of this StringId based on the current {@link java.util.Locale}
    **/
-  public String toLocalizedString(Object... params);
+  String toLocalizedString(Object... params);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
index 45bbfea..e6ca76c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
@@ -24,6 +24,6 @@ package org.apache.geode.internal.lang;
  */
 public interface Filter<T> {
 
-  public boolean accept(T obj);
+  boolean accept(T obj);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
index cf0102e..7c9282e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
@@ -30,6 +30,6 @@ public interface Initable {
    * construction by subclasses needing to instantiate other collaborators or starting of additional
    * services, like Threads, and so on.
    */
-  public void init();
+  void init();
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java b/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
index 8d1c1c6..c97e1d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
@@ -34,6 +34,6 @@ public interface MutableIdentifiable<T> extends Identifiable {
    *
    * @param id an identifier uniquely identifying this Object.
    */
-  public void setId(T id);
+  void setId(T id);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
index a998b1e..889b005 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
@@ -35,6 +35,6 @@ public interface Orderable<T extends Comparable<T>> {
    * @return a value that is Comparable to other value of the same type and defines the relative
    *         order of this Object instance to it's peers.
    */
-  public T getOrder();
+  T getOrder();
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java b/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
index 1f2f457..cfbb36e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
@@ -31,7 +31,7 @@ public interface Ordered {
    *
    * @return an integer value indicating the order of this instance relative to it's peers.
    */
-  public int getIndex();
+  int getIndex();
 
   /**
    * Sets the order of this instance relative to it's peers.
@@ -39,6 +39,6 @@ public interface Ordered {
    *
    * @param index an integer value specifying the the order of this instance relative to it's peers.
    */
-  public void setIndex(int index);
+  void setIndex(int index);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
index 16a30bb..d2bb0f0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
@@ -42,64 +42,64 @@ public interface InternalLogWriter extends LogWriter, LogWriterI18n {
   /**
    * If the writer's level is <code>ALL_LEVEL</code> then all messages will be logged.
    */
-  public static final int ALL_LEVEL = Integer.MIN_VALUE;
+  int ALL_LEVEL = Integer.MIN_VALUE;
   /**
    * If the writer's level is <code>FINEST_LEVEL</code> then finest, finer, fine, config, info,
    * warning, error, and severe messages will be logged.
    */
-  public static final int FINEST_LEVEL = 300;
+  int FINEST_LEVEL = 300;
   /**
    * If the writer's level is <code>FINER_LEVEL</code> then finer, fine, config, info, warning,
    * error, and severe messages will be logged.
    */
-  public static final int FINER_LEVEL = 400;
+  int FINER_LEVEL = 400;
   /**
    * If the writer's level is <code>FINE_LEVEL</code> then fine, config, info, warning, error, and
    * severe messages will be logged.
    */
-  public static final int FINE_LEVEL = 500;
+  int FINE_LEVEL = 500;
   /**
    * If the writer's level is <code>CONFIG_LEVEL</code> then config, info, warning, error, and
    * severe messages will be logged.
    */
-  public static final int CONFIG_LEVEL = 700;
+  int CONFIG_LEVEL = 700;
   /**
    * If the writer's level is <code>INFO_LEVEL</code> then info, warning, error, and severe messages
    * will be logged.
    */
-  public static final int INFO_LEVEL = 800;
+  int INFO_LEVEL = 800;
   /**
    * If the writer's level is <code>WARNING_LEVEL</code> then warning, error, and severe messages
    * will be logged.
    */
-  public static final int WARNING_LEVEL = 900;
+  int WARNING_LEVEL = 900;
   /**
    * If the writer's level is <code>SEVERE_LEVEL</code> then only severe messages will be logged.
    */
-  public static final int SEVERE_LEVEL = 1000;
+  int SEVERE_LEVEL = 1000;
   /**
    * If the writer's level is <code>ERROR_LEVEL</code> then error and severe messages will be
    * logged.
    */
-  public static final int ERROR_LEVEL = (WARNING_LEVEL + SEVERE_LEVEL) / 2;
+  int ERROR_LEVEL = (WARNING_LEVEL + SEVERE_LEVEL) / 2;
   /**
    * If the writer's level is <code>NONE_LEVEL</code> then no messages will be logged.
    */
-  public static final int NONE_LEVEL = Integer.MAX_VALUE;
+  int NONE_LEVEL = Integer.MAX_VALUE;
 
-  public static final String[] levelNames = new String[] {"all", "finest", "finer", "fine",
-      "config", "info", "warning", "error", "severe", "none"};
+  String[] levelNames = new String[] {"all", "finest", "finer", "fine", "config", "info", "warning",
+      "error", "severe", "none"};
 
-  public static final int[] allLevels = new int[] {ALL_LEVEL, FINEST_LEVEL, FINER_LEVEL, FINE_LEVEL,
-      CONFIG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL, SEVERE_LEVEL, NONE_LEVEL};
+  int[] allLevels = new int[] {ALL_LEVEL, FINEST_LEVEL, FINER_LEVEL, FINE_LEVEL, CONFIG_LEVEL,
+      INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL, SEVERE_LEVEL, NONE_LEVEL};
 
-  public int getLogWriterLevel();
+  int getLogWriterLevel();
 
-  public void setLogWriterLevel(int LogWriterLevel);
+  void setLogWriterLevel(int LogWriterLevel);
 
-  public boolean isSecure();
+  boolean isSecure();
 
-  public String getConnectionName();
+  String getConnectionName();
 
   /**
    * Logs a message and an exception of the given level.
@@ -108,7 +108,7 @@ public interface InternalLogWriter extends LogWriter, LogWriterI18n {
    * @param msg the actual message to log
    * @param exception the actual Exception to log
    */
-  public void put(int msgLevel, String msg, Throwable exception);
+  void put(int msgLevel, String msg, Throwable exception);
 
   /**
    * Logs a message and an exception of the given level.
@@ -118,5 +118,5 @@ public interface InternalLogWriter extends LogWriter, LogWriterI18n {
    * @param params the Object arguments to plug into the message
    * @param exception the actual Exception to log
    */
-  public void put(int msgLevel, StringId msgId, Object[] params, Throwable exception);
+  void put(int msgLevel, StringId msgId, Object[] params, Throwable exception);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
index d1a81e7..8918a1d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
@@ -467,16 +467,16 @@ public class MergeLogFiles {
   }
 
   /** interface for threaded and non-threaded reader classes */
-  static interface Reader {
-    public LogFileParser.LogEntry peek();
+  interface Reader {
+    LogFileParser.LogEntry peek();
 
-    public LogFileParser.LogEntry poll();
+    LogFileParser.LogEntry poll();
 
-    public String getFileName();
+    String getFileName();
 
-    public void setUniqueId(int id);
+    void setUniqueId(int id);
 
-    public int getUniqueId();
+    int getUniqueId();
   }
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
index 9ebddce..f6a96ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
@@ -18,9 +18,6 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.Message;
 
-import org.apache.geode.LogWriter;
-import org.apache.geode.i18n.LogWriterI18n;
-
 /**
  * Extends Logger interface with convenience methods for the FINEST, FINER, FINE, CONFIG, INFO,
  * WARNING, ERROR and SEVERE custom log levels.
@@ -34,7 +31,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param msg the message string to be logged
    */
-  public void finest(final Marker marker, final Message msg);
+  void finest(final Marker marker, final Message msg);
 
   /**
    * Logs a message with the specific Marker at the;@code FINEST} level.
@@ -43,7 +40,7 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void finest(final Marker marker, final Message msg, final Throwable t);
+  void finest(final Marker marker, final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINEST} level.
@@ -51,7 +48,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void finest(final Marker marker, final Object message);
+  void finest(final Marker marker, final Object message);
 
   /**
    * Logs a message at the;@code FINEST} level including the stack trace of the ;@link
@@ -61,7 +58,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finest(final Marker marker, final Object message, final Throwable t);
+  void finest(final Marker marker, final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINEST} level.
@@ -69,7 +66,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void finest(final Marker marker, final String message);
+  void finest(final Marker marker, final String message);
 
   /**
    * Logs a message with parameters at the;@code FINEST} level.
@@ -79,7 +76,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void finest(final Marker marker, final String message, final Object... params);
+  void finest(final Marker marker, final String message, final Object... params);
 
   /**
    * Logs a message at the;@code FINEST} level including the stack trace of the ;@link
@@ -89,14 +86,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finest(final Marker marker, final String message, final Throwable t);
+  void finest(final Marker marker, final String message, final Throwable t);
 
   /**
    * Logs the specified Message at the;@code FINEST} level.
    *
    * @param msg the message string to be logged
    */
-  public void finest(final Message msg);
+  void finest(final Message msg);
 
   /**
    * Logs the specified Message at the;@code FINEST} level.
@@ -104,14 +101,14 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void finest(final Message msg, final Throwable t);
+  void finest(final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINEST} level.
    *
    * @param message the message object to log.
    */
-  public void finest(final Object message);
+  void finest(final Object message);
 
   /**
    * Logs a message at the;@code FINEST} level including the stack trace of the ;@link
@@ -120,14 +117,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finest(final Object message, final Throwable t);
+  void finest(final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINEST} level.
    *
    * @param message the message object to log.
    */
-  public void finest(final String message);
+  void finest(final String message);
 
   /**
    * Logs a message with parameters at the;@code FINEST} level.
@@ -136,7 +133,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void finest(final String message, final Object... params);
+  void finest(final String message, final Object... params);
 
   /**
    * Logs a message at the;@code FINEST} level including the stack trace of the ;@link
@@ -145,7 +142,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finest(final String message, final Throwable t);
+  void finest(final String message, final Throwable t);
 
   /**
    * Logs a message with the specific Marker at the;@code FINER} level.
@@ -153,7 +150,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param msg the message string to be logged
    */
-  public void finer(final Marker marker, final Message msg);
+  void finer(final Marker marker, final Message msg);
 
   /**
    * Logs a message with the specific Marker at the;@code FINER} level.
@@ -162,7 +159,7 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void finer(final Marker marker, final Message msg, final Throwable t);
+  void finer(final Marker marker, final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINER} level.
@@ -170,7 +167,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void finer(final Marker marker, final Object message);
+  void finer(final Marker marker, final Object message);
 
   /**
    * Logs a message at the;@code FINER} level including the stack trace of the ;@link
@@ -180,7 +177,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finer(final Marker marker, final Object message, final Throwable t);
+  void finer(final Marker marker, final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINER} level.
@@ -188,7 +185,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void finer(final Marker marker, final String message);
+  void finer(final Marker marker, final String message);
 
   /**
    * Logs a message with parameters at the;@code FINER} level.
@@ -198,7 +195,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void finer(final Marker marker, final String message, final Object... params);
+  void finer(final Marker marker, final String message, final Object... params);
 
   /**
    * Logs a message at the;@code FINER} level including the stack trace of the ;@link
@@ -208,14 +205,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finer(final Marker marker, final String message, final Throwable t);
+  void finer(final Marker marker, final String message, final Throwable t);
 
   /**
    * Logs the specified Message at the;@code FINER} level.
    *
    * @param msg the message string to be logged
    */
-  public void finer(final Message msg);
+  void finer(final Message msg);
 
   /**
    * Logs the specified Message at the;@code FINER} level.
@@ -223,14 +220,14 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void finer(final Message msg, final Throwable t);
+  void finer(final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINER} level.
    *
    * @param message the message object to log.
    */
-  public void finer(final Object message);
+  void finer(final Object message);
 
   /**
    * Logs a message at the;@code FINER} level including the stack trace of the ;@link
@@ -239,14 +236,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finer(final Object message, final Throwable t);
+  void finer(final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINER} level.
    *
    * @param message the message object to log.
    */
-  public void finer(final String message);
+  void finer(final String message);
 
   /**
    * Logs a message with parameters at the;@code FINER} level.
@@ -255,7 +252,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void finer(final String message, final Object... params);
+  void finer(final String message, final Object... params);
 
   /**
    * Logs a message at the;@code FINER} level including the stack trace of the ;@link
@@ -264,7 +261,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void finer(final String message, final Throwable t);
+  void finer(final String message, final Throwable t);
 
   /**
    * Logs a message with the specific Marker at the;@code FINE} level.
@@ -272,7 +269,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param msg the message string to be logged
    */
-  public void fine(final Marker marker, final Message msg);
+  void fine(final Marker marker, final Message msg);
 
   /**
    * Logs a message with the specific Marker at the;@code FINE} level.
@@ -281,7 +278,7 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void fine(final Marker marker, final Message msg, final Throwable t);
+  void fine(final Marker marker, final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINE} level.
@@ -289,7 +286,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void fine(final Marker marker, final Object message);
+  void fine(final Marker marker, final Object message);
 
   /**
    * Logs a message at the;@code FINE} level including the stack trace of the ;@link
@@ -299,7 +296,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void fine(final Marker marker, final Object message, final Throwable t);
+  void fine(final Marker marker, final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINE} level.
@@ -307,7 +304,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void fine(final Marker marker, final String message);
+  void fine(final Marker marker, final String message);
 
   /**
    * Logs a message with parameters at the;@code FINE} level.
@@ -317,7 +314,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void fine(final Marker marker, final String message, final Object... params);
+  void fine(final Marker marker, final String message, final Object... params);
 
   /**
    * Logs a message at the;@code FINE} level including the stack trace of the ;@link
@@ -327,14 +324,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void fine(final Marker marker, final String message, final Throwable t);
+  void fine(final Marker marker, final String message, final Throwable t);
 
   /**
    * Logs the specified Message at the;@code FINE} level.
    *
    * @param msg the message string to be logged
    */
-  public void fine(final Message msg);
+  void fine(final Message msg);
 
   /**
    * Logs the specified Message at the;@code FINE} level.
@@ -342,14 +339,14 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void fine(final Message msg, final Throwable t);
+  void fine(final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINE} level.
    *
    * @param message the message object to log.
    */
-  public void fine(final Object message);
+  void fine(final Object message);
 
   /**
    * Logs a message at the;@code FINE} level including the stack trace of the ;@link
@@ -358,14 +355,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void fine(final Object message, final Throwable t);
+  void fine(final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code FINE} level.
    *
    * @param message the message object to log.
    */
-  public void fine(final String message);
+  void fine(final String message);
 
   /**
    * Logs a message with parameters at the;@code FINE} level.
@@ -374,7 +371,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void fine(final String message, final Object... params);
+  void fine(final String message, final Object... params);
 
   /**
    * Logs a message at the;@code FINE} level including the stack trace of the ;@link
@@ -383,7 +380,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void fine(final String message, final Throwable t);
+  void fine(final String message, final Throwable t);
 
   /**
    * Logs a message with the specific Marker at the;@code CONFIG} level.
@@ -391,7 +388,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param msg the message string to be logged
    */
-  public void config(final Marker marker, final Message msg);
+  void config(final Marker marker, final Message msg);
 
   /**
    * Logs a message with the specific Marker at the;@code CONFIG} level.
@@ -400,7 +397,7 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void config(final Marker marker, final Message msg, final Throwable t);
+  void config(final Marker marker, final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code CONFIG} level.
@@ -408,7 +405,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void config(final Marker marker, final Object message);
+  void config(final Marker marker, final Object message);
 
   /**
    * Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
@@ -418,7 +415,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void config(final Marker marker, final Object message, final Throwable t);
+  void config(final Marker marker, final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code CONFIG} level.
@@ -426,7 +423,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void config(final Marker marker, final String message);
+  void config(final Marker marker, final String message);
 
   /**
    * Logs a message with parameters at the;@code CONFIG} level.
@@ -436,7 +433,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void config(final Marker marker, final String message, final Object... params);
+  void config(final Marker marker, final String message, final Object... params);
 
   /**
    * Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
@@ -446,14 +443,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void config(final Marker marker, final String message, final Throwable t);
+  void config(final Marker marker, final String message, final Throwable t);
 
   /**
    * Logs the specified Message at the;@code CONFIG} level.
    *
    * @param msg the message string to be logged
    */
-  public void config(final Message msg);
+  void config(final Message msg);
 
   /**
    * Logs the specified Message at the;@code CONFIG} level.
@@ -461,14 +458,14 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void config(final Message msg, final Throwable t);
+  void config(final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code CONFIG} level.
    *
    * @param message the message object to log.
    */
-  public void config(final Object message);
+  void config(final Object message);
 
   /**
    * Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
@@ -477,14 +474,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void config(final Object message, final Throwable t);
+  void config(final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code CONFIG} level.
    *
    * @param message the message object to log.
    */
-  public void config(final String message);
+  void config(final String message);
 
   /**
    * Logs a message with parameters at the;@code CONFIG} level.
@@ -493,7 +490,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void config(final String message, final Object... params);
+  void config(final String message, final Object... params);
 
   /**
    * Logs a message at the;@code CONFIG} level including the stack trace of the ;@link
@@ -502,7 +499,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void config(final String message, final Throwable t);
+  void config(final String message, final Throwable t);
 
   /**
    * Logs a message with the specific Marker at the;@code WARNING} level.
@@ -510,7 +507,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param msg the message string to be logged
    */
-  public void warning(final Marker marker, final Message msg);
+  void warning(final Marker marker, final Message msg);
 
   /**
    * Logs a message with the specific Marker at the;@code WARNING} level.
@@ -519,7 +516,7 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void warning(final Marker marker, final Message msg, final Throwable t);
+  void warning(final Marker marker, final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code WARNING} level.
@@ -527,7 +524,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void warning(final Marker marker, final Object message);
+  void warning(final Marker marker, final Object message);
 
   /**
    * Logs a message at the;@code WARNING} level including the stack trace of the;@link
@@ -537,7 +534,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void warning(final Marker marker, final Object message, final Throwable t);
+  void warning(final Marker marker, final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code WARNING} level.
@@ -545,7 +542,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void warning(final Marker marker, final String message);
+  void warning(final Marker marker, final String message);
 
   /**
    * Logs a message with parameters at the;@code WARNING} level.
@@ -555,7 +552,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void warning(final Marker marker, final String message, final Object... params);
+  void warning(final Marker marker, final String message, final Object... params);
 
   /**
    * Logs a message at the;@code WARNING} level including the stack trace of the;@link
@@ -565,14 +562,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void warning(final Marker marker, final String message, final Throwable t);
+  void warning(final Marker marker, final String message, final Throwable t);
 
   /**
    * Logs the specified Message at the;@code WARNING} level.
    *
    * @param msg the message string to be logged
    */
-  public void warning(final Message msg);
+  void warning(final Message msg);
 
   /**
    * Logs the specified Message at the;@code WARNING} level.
@@ -580,14 +577,14 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void warning(final Message msg, final Throwable t);
+  void warning(final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code WARNING} level.
    *
    * @param message the message object to log.
    */
-  public void warning(final Object message);
+  void warning(final Object message);
 
   /**
    * Logs a message at the;@code WARNING} level including the stack trace of the;@link
@@ -596,14 +593,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void warning(final Object message, final Throwable t);
+  void warning(final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code WARNING} level.
    *
    * @param message the message object to log.
    */
-  public void warning(final String message);
+  void warning(final String message);
 
   /**
    * Logs a message with parameters at the;@code WARNING} level.
@@ -612,7 +609,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void warning(final String message, final Object... params);
+  void warning(final String message, final Object... params);
 
   /**
    * Logs a message at the;@code WARNING} level including the stack trace of the;@link
@@ -621,7 +618,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void warning(final String message, final Throwable t);
+  void warning(final String message, final Throwable t);
 
   /**
    * Logs a message with the specific Marker at the;@code SEVERE} level.
@@ -629,7 +626,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param msg the message string to be logged
    */
-  public void severe(final Marker marker, final Message msg);
+  void severe(final Marker marker, final Message msg);
 
   /**
    * Logs a message with the specific Marker at the;@code SEVERE} level.
@@ -638,7 +635,7 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void severe(final Marker marker, final Message msg, final Throwable t);
+  void severe(final Marker marker, final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code SEVERE} level.
@@ -646,7 +643,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void severe(final Marker marker, final Object message);
+  void severe(final Marker marker, final Object message);
 
   /**
    * Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
@@ -656,7 +653,7 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void severe(final Marker marker, final Object message, final Throwable t);
+  void severe(final Marker marker, final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code SEVERE} level.
@@ -664,7 +661,7 @@ public interface GemFireLogger extends Logger {
    * @param marker the marker data specific to this log statement
    * @param message the message object to log.
    */
-  public void severe(final Marker marker, final String message);
+  void severe(final Marker marker, final String message);
 
   /**
    * Logs a message with parameters at the;@code SEVERE} level.
@@ -674,7 +671,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void severe(final Marker marker, final String message, final Object... params);
+  void severe(final Marker marker, final String message, final Object... params);
 
   /**
    * Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
@@ -684,14 +681,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void severe(final Marker marker, final String message, final Throwable t);
+  void severe(final Marker marker, final String message, final Throwable t);
 
   /**
    * Logs the specified Message at the;@code SEVERE} level.
    *
    * @param msg the message string to be logged
    */
-  public void severe(final Message msg);
+  void severe(final Message msg);
 
   /**
    * Logs the specified Message at the;@code SEVERE} level.
@@ -699,14 +696,14 @@ public interface GemFireLogger extends Logger {
    * @param msg the message string to be logged
    * @param t A Throwable or null.
    */
-  public void severe(final Message msg, final Throwable t);
+  void severe(final Message msg, final Throwable t);
 
   /**
    * Logs a message object with the;@code SEVERE} level.
    *
    * @param message the message object to log.
    */
-  public void severe(final Object message);
+  void severe(final Object message);
 
   /**
    * Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
@@ -715,14 +712,14 @@ public interface GemFireLogger extends Logger {
    * @param message the message to log.
    * @param t the exception to log, including its stack trace.
    */
-  public void severe(final Object message, final Throwable t);
+  void severe(final Object message, final Throwable t);
 
   /**
    * Logs a message object with the;@code SEVERE} level.
    *
    * @param message the message object to log.
    */
-  public void severe(final String message);
+  void severe(final String message);
 
   /**
    * Logs a message with parameters at the;@code SEVERE} level.
@@ -731,7 +728,7 @@ public interface GemFireLogger extends Logger {
    * @param params parameters to the message.
    * @see #getMessageFactory()
    */
-  public void severe(final String message, final Object... params);
+  void severe(final String message, final Object... params);
 
   /**
    * Logs a message at the;@code SEVERE} level including the stack trace of the ;@link
@@ -741,6 +738,6 @@ public interface GemFireLogger extends Logger {
    * @param t the exception to log, including its stack
    *        trace.LogService.getLogWriterLogger().enter()
    */
-  public void severe(final String message, final Throwable t);
+  void severe(final String message, final Throwable t);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogMarker.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogMarker.java
index dec7b5a..74698bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogMarker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogMarker.java
@@ -27,51 +27,40 @@ public interface LogMarker {
    * @deprecated GEMFIRE_VERBOSE is deprecated in favor of GEODE_VERBOSE
    */
   @Deprecated
-  public static final Marker GEMFIRE_VERBOSE = MarkerManager.getMarker("GEMFIRE_VERBOSE");
+  Marker GEMFIRE_VERBOSE = MarkerManager.getMarker("GEMFIRE_VERBOSE");
 
   /**
    * GEODE_VERBOSE is a parent to all other markers so that they can all be turned off with<br>
    * &ltMarkerFilter marker="GEODE_VERBOSE" onMatch="DENY" onMismatch="NEUTRAL"/&gt
    */
-  public static final Marker GEODE_VERBOSE =
-      MarkerManager.getMarker("GEODE_VERBOSE").setParents(GEMFIRE_VERBOSE);
-
-  public static final Marker BRIDGE_SERVER =
-      MarkerManager.getMarker("BRIDGE_SERVER").addParents(GEODE_VERBOSE);
-  public static final Marker DLS = MarkerManager.getMarker("DLS").addParents(GEODE_VERBOSE);
-
-  public static final Marker PERSIST = MarkerManager.getMarker("PERSIST").addParents(GEODE_VERBOSE);
-  public static final Marker PERSIST_VIEW =
-      MarkerManager.getMarker("PERSIST_VIEW").addParents(PERSIST);
-  public static final Marker PERSIST_ADVISOR =
-      MarkerManager.getMarker("PERSIST_ADVISOR").addParents(PERSIST);
-  public static final Marker PERSIST_RECOVERY =
-      MarkerManager.getMarker("PERSIST_RECOVERY").addParents(PERSIST);
-  public static final Marker PERSIST_WRITES =
-      MarkerManager.getMarker("PERSIST_WRITES").addParents(PERSIST);
-
-  public static final Marker TOMBSTONE =
-      MarkerManager.getMarker("TOMBSTONE").addParents(GEODE_VERBOSE);
-  public static final Marker TOMBSTONE_COUNT =
-      MarkerManager.getMarker("TOMBSTONE_COUNT").addParents(TOMBSTONE);
-
-  public static final Marker LRU = MarkerManager.getMarker("LRU").addParents(GEODE_VERBOSE);
-  public static final Marker LRU_TOMBSTONE_COUNT =
+  Marker GEODE_VERBOSE = MarkerManager.getMarker("GEODE_VERBOSE").setParents(GEMFIRE_VERBOSE);
+
+  Marker BRIDGE_SERVER = MarkerManager.getMarker("BRIDGE_SERVER").addParents(GEODE_VERBOSE);
+  Marker DLS = MarkerManager.getMarker("DLS").addParents(GEODE_VERBOSE);
+
+  Marker PERSIST = MarkerManager.getMarker("PERSIST").addParents(GEODE_VERBOSE);
+  Marker PERSIST_VIEW = MarkerManager.getMarker("PERSIST_VIEW").addParents(PERSIST);
+  Marker PERSIST_ADVISOR = MarkerManager.getMarker("PERSIST_ADVISOR").addParents(PERSIST);
+  Marker PERSIST_RECOVERY = MarkerManager.getMarker("PERSIST_RECOVERY").addParents(PERSIST);
+  Marker PERSIST_WRITES = MarkerManager.getMarker("PERSIST_WRITES").addParents(PERSIST);
+
+  Marker TOMBSTONE = MarkerManager.getMarker("TOMBSTONE").addParents(GEODE_VERBOSE);
+  Marker TOMBSTONE_COUNT = MarkerManager.getMarker("TOMBSTONE_COUNT").addParents(TOMBSTONE);
+
+  Marker LRU = MarkerManager.getMarker("LRU").addParents(GEODE_VERBOSE);
+  Marker LRU_TOMBSTONE_COUNT =
       MarkerManager.getMarker("LRU_TOMBSTONE_COUNT").addParents(LRU, TOMBSTONE_COUNT);
-  public static final Marker LRU_CLOCK = MarkerManager.getMarker("LRU_CLOCK").addParents(LRU);
+  Marker LRU_CLOCK = MarkerManager.getMarker("LRU_CLOCK").addParents(LRU);
 
-  public static final Marker RVV = MarkerManager.getMarker("RVV").addParents(GEODE_VERBOSE);
-  public static final Marker VERSION_TAG =
-      MarkerManager.getMarker("VERSION_TAG").addParents(GEODE_VERBOSE); // gemfire.VersionTag.DEBUG
-  public static final Marker VERSIONED_OBJECT_LIST =
+  Marker RVV = MarkerManager.getMarker("RVV").addParents(GEODE_VERBOSE);
+  Marker VERSION_TAG = MarkerManager.getMarker("VERSION_TAG").addParents(GEODE_VERBOSE); // gemfire.VersionTag.DEBUG
+  Marker VERSIONED_OBJECT_LIST =
       MarkerManager.getMarker("VERSIONED_OBJECT_LIST").addParents(GEODE_VERBOSE); // gemfire.VersionedObjectList.DEBUG
 
   // cache.tier.sockets
-  public static final Marker OBJECT_PART_LIST =
-      MarkerManager.getMarker("OBJECT_PART_LIST").addParents(GEODE_VERBOSE); // gemfire.ObjectPartList.DEBUG
+  Marker OBJECT_PART_LIST = MarkerManager.getMarker("OBJECT_PART_LIST").addParents(GEODE_VERBOSE); // gemfire.ObjectPartList.DEBUG
 
-  public static final Marker SERIALIZER =
-      MarkerManager.getMarker("SERIALIZER").addParents(GEODE_VERBOSE); // DataSerializer.DEBUG
+  Marker SERIALIZER = MarkerManager.getMarker("SERIALIZER").addParents(GEODE_VERBOSE); // DataSerializer.DEBUG
   /**
    * If the <code>"DataSerializer.DUMP_SERIALIZED"</code> system property is set, the class names of
    * the objects that are serialized by
@@ -80,54 +69,42 @@ public interface LogMarker {
    * which classes should implement {@link DataSerializable} (or should be special cased by a custom
    * <code>DataSerializer</code>).
    */
-  public static final Marker DUMP_SERIALIZED =
-      MarkerManager.getMarker("DUMP_SERIALIZED").addParents(SERIALIZER); // DataSerializer.DUMP_SERIALIZED
-  public static final Marker TRACE_SERIALIZABLE =
-      MarkerManager.getMarker("TRACE_SERIALIZABLE").addParents(SERIALIZER); // DataSerializer.TRACE_SERIALIZABLE
-  public static final Marker DEBUG_DSFID =
-      MarkerManager.getMarker("DEBUG_DSFID").addParents(SERIALIZER); // DataSerializer.DEBUG_DSFID
-
-  public static final Marker STATISTICS =
-      MarkerManager.getMarker("STATISTICS").addParents(GEODE_VERBOSE);
-  public static final Marker STATE_FLUSH_OP =
-      MarkerManager.getMarker("STATE_FLUSH_OP").addParents(GEODE_VERBOSE);
-
-  public static final Marker DISTRIBUTION =
-      MarkerManager.getMarker("DISTRIBUTION").addParents(GEODE_VERBOSE);
-  public static final Marker DISTRIBUTION_STATE_FLUSH_OP = MarkerManager
-      .getMarker("DISTRIBUTION_STATE_FLUSH_OP").addParents(DISTRIBUTION, STATE_FLUSH_OP);
-  public static final Marker DISTRIBUTION_BRIDGE_SERVER =
+  Marker DUMP_SERIALIZED = MarkerManager.getMarker("DUMP_SERIALIZED").addParents(SERIALIZER); // DataSerializer.DUMP_SERIALIZED
+  Marker TRACE_SERIALIZABLE = MarkerManager.getMarker("TRACE_SERIALIZABLE").addParents(SERIALIZER); // DataSerializer.TRACE_SERIALIZABLE
+  Marker DEBUG_DSFID = MarkerManager.getMarker("DEBUG_DSFID").addParents(SERIALIZER); // DataSerializer.DEBUG_DSFID
+
+  Marker STATISTICS = MarkerManager.getMarker("STATISTICS").addParents(GEODE_VERBOSE);
+  Marker STATE_FLUSH_OP = MarkerManager.getMarker("STATE_FLUSH_OP").addParents(GEODE_VERBOSE);
+
+  Marker DISTRIBUTION = MarkerManager.getMarker("DISTRIBUTION").addParents(GEODE_VERBOSE);
+  Marker DISTRIBUTION_STATE_FLUSH_OP = MarkerManager.getMarker("DISTRIBUTION_STATE_FLUSH_OP")
+      .addParents(DISTRIBUTION, STATE_FLUSH_OP);
+  Marker DISTRIBUTION_BRIDGE_SERVER =
       MarkerManager.getMarker("DISTRIBUTION_BRIDGE_SERVER").addParents(DISTRIBUTION, BRIDGE_SERVER);
-  public static final Marker DISTRIBUTION_VIEWS =
+  Marker DISTRIBUTION_VIEWS =
       MarkerManager.getMarker("DISTRIBUTION_VIEWS").addParents(DISTRIBUTION);
-  public static final Marker DM = MarkerManager.getMarker("DM").addParents(DISTRIBUTION);
-  public static final Marker DM_BRIDGE_SERVER =
-      MarkerManager.getMarker("DM_BRIDGE").addParents(BRIDGE_SERVER, DM);
-  public static final Marker DA = MarkerManager.getMarker("DA").addParents(DISTRIBUTION);
+  Marker DM = MarkerManager.getMarker("DM").addParents(DISTRIBUTION);
+  Marker DM_BRIDGE_SERVER = MarkerManager.getMarker("DM_BRIDGE").addParents(BRIDGE_SERVER, DM);
+  Marker DA = MarkerManager.getMarker("DA").addParents(DISTRIBUTION);
 
-  public static final Marker GII = MarkerManager.getMarker("GII").addParents(GEODE_VERBOSE);
-  public static final Marker GII_VERSIONED_ENTRY =
-      MarkerManager.getMarker("GII_VERSION_ENTRY").addParents(GII);
+  Marker GII = MarkerManager.getMarker("GII").addParents(GEODE_VERBOSE);
+  Marker GII_VERSIONED_ENTRY = MarkerManager.getMarker("GII_VERSION_ENTRY").addParents(GII);
 
-  public static final Marker JGROUPS = MarkerManager.getMarker("JGROUPS").addParents(GEODE_VERBOSE);
+  Marker JGROUPS = MarkerManager.getMarker("JGROUPS").addParents(GEODE_VERBOSE);
 
-  public static final Marker QA = MarkerManager.getMarker("QA").addParents(GEODE_VERBOSE);
+  Marker QA = MarkerManager.getMarker("QA").addParents(GEODE_VERBOSE);
 
-  public static final Marker P2P = MarkerManager.getMarker("P2P").addParents(GEODE_VERBOSE);
+  Marker P2P = MarkerManager.getMarker("P2P").addParents(GEODE_VERBOSE);
 
-  public static final Marker CONFIG = MarkerManager.getMarker("CONFIG");
+  Marker CONFIG = MarkerManager.getMarker("CONFIG");
 
-  public static final Marker PERSISTENCE =
-      MarkerManager.getMarker("PERSISTENCE").addParents(GEODE_VERBOSE);
-  public static final Marker DISK_STORE_MONITOR =
-      MarkerManager.getMarker("DISK_STORE_MONITOR").addParents(PERSISTENCE);
-  public static final Marker SOPLOG = MarkerManager.getMarker("SOPLOG").addParents(PERSISTENCE);
+  Marker PERSISTENCE = MarkerManager.getMarker("PERSISTENCE").addParents(GEODE_VERBOSE);
+  Marker DISK_STORE_MONITOR = MarkerManager.getMarker("DISK_STORE_MONITOR").addParents(PERSISTENCE);
+  Marker SOPLOG = MarkerManager.getMarker("SOPLOG").addParents(PERSISTENCE);
 
-  public static final Marker MANAGED_ENTITY =
-      MarkerManager.getMarker("MANAGED_ENTITY").addParents(GEODE_VERBOSE);
+  Marker MANAGED_ENTITY = MarkerManager.getMarker("MANAGED_ENTITY").addParents(GEODE_VERBOSE);
 
-  public static final Marker CACHE_XML =
-      MarkerManager.getMarker("CACHE_XML").addParents(GEODE_VERBOSE);
-  public static final Marker CACHE_XML_PARSER =
+  Marker CACHE_XML = MarkerManager.getMarker("CACHE_XML").addParents(GEODE_VERBOSE);
+  Marker CACHE_XML_PARSER =
       MarkerManager.getMarker("CACHE_XML_PARSER").addParents(GEODE_VERBOSE, CACHE_XML);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
index 2aeb9d6..779dd61 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
@@ -33,6 +33,6 @@ public interface CommandProcessor {
    * @param protocol
    * @param cache
    */
-  public ByteBuffer processCommand(RequestReader reader, Protocol protocol, Cache cache);
+  ByteBuffer processCommand(RequestReader reader, Protocol protocol, Cache cache);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
index d964166..2aea0d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
@@ -14,7 +14,13 @@
  */
 package org.apache.geode.internal.offheap;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -389,7 +395,7 @@ public class FreeListManager {
     /**
      * Retrieves and removes the top of this stack, or returns {@code 0L} if this stack is empty.
      */
-    public long poll();
+    long poll();
   }
   /**
    * Manages an array of primitive longs. The array can grow.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
index b2b9ff5..f7f39d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
@@ -31,7 +31,7 @@ public interface LifecycleListener {
    *
    * @param allocator the instance that has just been created
    */
-  public void afterCreate(MemoryAllocatorImpl allocator);
+  void afterCreate(MemoryAllocatorImpl allocator);
 
   /**
    * Callback is invoked after reopening an existing MemoryAllocatorImpl for reuse.
@@ -41,7 +41,7 @@ public interface LifecycleListener {
    *
    * @param allocator the instance that has just been reopened for reuse
    */
-  public void afterReuse(MemoryAllocatorImpl allocator);
+  void afterReuse(MemoryAllocatorImpl allocator);
 
   /**
    * Callback is invoked before closing the MemoryAllocatorImpl
@@ -51,7 +51,7 @@ public interface LifecycleListener {
    *
    * @param allocator the instance that is about to be closed
    */
-  public void beforeClose(MemoryAllocatorImpl allocator);
+  void beforeClose(MemoryAllocatorImpl allocator);
 
   static void invokeBeforeClose(MemoryAllocatorImpl allocator) {
     for (Iterator<LifecycleListener> iter = lifecycleListeners.iterator(); iter.hasNext();) {
@@ -79,7 +79,7 @@ public interface LifecycleListener {
    *
    * @param listener the instance to remove
    */
-  public static void removeLifecycleListener(LifecycleListener listener) {
+  static void removeLifecycleListener(LifecycleListener listener) {
     lifecycleListeners.remove(listener);
   }
 
@@ -88,13 +88,12 @@ public interface LifecycleListener {
    *
    * @param listener the instance to add
    */
-  public static void addLifecycleListener(LifecycleListener listener) {
+  static void addLifecycleListener(LifecycleListener listener) {
     LifecycleListener.lifecycleListeners.add(listener);
   }
 
   /**
    * Following should be private but java 8 does not support that.
    */
-  static final List<LifecycleListener> lifecycleListeners =
-      new CopyOnWriteArrayList<LifecycleListener>();
+  List<LifecycleListener> lifecycleListeners = new CopyOnWriteArrayList<LifecycleListener>();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
index db57629..8353091 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
@@ -26,7 +26,7 @@ public interface MemoryAllocator {
    * @return the allocated chunk of memory.
    * @throws IllegalStateException if the heap does not have enough memory to grant the request
    */
-  public StoredObject allocate(int size);
+  StoredObject allocate(int size);
 
   /**
    * Allocates off heap memory for the given data and returns a StoredObject that is backed by this
@@ -38,8 +38,7 @@ public interface MemoryAllocator {
    * @param isCompressed true if data is compressed; false if it is uncompressed.
    * @throws IllegalStateException if the heap does not have enough memory to grant the request
    */
-  public StoredObject allocateAndInitialize(byte[] data, boolean isSerialized,
-      boolean isCompressed);
+  StoredObject allocateAndInitialize(byte[] data, boolean isSerialized, boolean isCompressed);
 
   /**
    * Allocates off heap memory for the given data and returns a StoredObject that is backed by this
@@ -52,25 +51,25 @@ public interface MemoryAllocator {
    * @param isCompressed true if data is compressed; false if it is uncompressed.
    * @throws IllegalStateException if the heap does not have enough memory to grant the request
    */
-  public StoredObject allocateAndInitialize(byte[] data, boolean isSerialized, boolean isCompressed,
+  StoredObject allocateAndInitialize(byte[] data, boolean isSerialized, boolean isCompressed,
       byte[] originalHeapData);
 
-  public long getFreeMemory();
+  long getFreeMemory();
 
-  public long getUsedMemory();
+  long getUsedMemory();
 
-  public long getTotalMemory();
+  long getTotalMemory();
 
-  public OffHeapMemoryStats getStats();
+  OffHeapMemoryStats getStats();
 
   /**
    * This allocator will no longer be used so free up any system memory that belongs to it.
    */
-  public void close();
+  void close();
 
-  public MemoryInspector getMemoryInspector();
+  MemoryInspector getMemoryInspector();
 
-  public void addMemoryUsageListener(MemoryUsageListener listener);
+  void addMemoryUsageListener(MemoryUsageListener listener);
 
-  public void removeMemoryUsageListener(MemoryUsageListener listener);
+  void removeMemoryUsageListener(MemoryUsageListener listener);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
index 2fba809..6d1d073 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
@@ -23,7 +23,7 @@ package org.apache.geode.internal.offheap;
  */
 public interface MemoryBlock {
 
-  public enum State {
+  enum State {
     /** Unused fragment (not used and not in a free list) */
     UNUSED,
     /** Allocated chunk currently in use */
@@ -32,40 +32,40 @@ public interface MemoryBlock {
     DEALLOCATED
   }
 
-  public State getState();
+  State getState();
 
   /**
    * Returns the unsafe memory address of the first byte of this block.
    */
-  public long getAddress();
+  long getAddress();
 
   /**
    * Returns the size of this memory block in bytes.
    */
-  public int getBlockSize();
+  int getBlockSize();
 
   /**
    * Returns the next memory block immediately after this one.
    */
-  public MemoryBlock getNextBlock();
+  MemoryBlock getNextBlock();
 
   /**
    * Returns the identifier of which slab contains this block.
    */
-  public int getSlabId();
+  int getSlabId();
 
   /**
    * Returns the identifier of which free list contains this block.
    */
-  public int getFreeListId();
+  int getFreeListId();
 
-  public int getRefCount();
+  int getRefCount();
 
-  public String getDataType();
+  String getDataType();
 
-  public boolean isSerialized();
+  boolean isSerialized();
 
-  public boolean isCompressed();
+  boolean isCompressed();
 
-  public Object getDataValue();
+  Object getDataValue();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
index 73ee007..eb9c83b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
@@ -23,18 +23,18 @@ import java.util.List;
  */
 public interface MemoryInspector {
 
-  public void clearSnapshot();
+  void clearSnapshot();
 
-  public void createSnapshot();
+  void createSnapshot();
 
-  public List<MemoryBlock> getSnapshot();
+  List<MemoryBlock> getSnapshot();
 
-  public MemoryBlock getFirstBlock();
+  MemoryBlock getFirstBlock();
 
-  public List<MemoryBlock> getAllBlocks();
+  List<MemoryBlock> getAllBlocks();
 
-  public List<MemoryBlock> getAllocatedBlocks();
+  List<MemoryBlock> getAllocatedBlocks();
 
-  public MemoryBlock getBlockAfter(MemoryBlock block);
+  MemoryBlock getBlockAfter(MemoryBlock block);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
index 1e9b438..108ae1c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
@@ -20,5 +20,5 @@ package org.apache.geode.internal.offheap;
  * @since Geode 1.0
  */
 public interface MemoryUsageListener {
-  public void updateMemoryUsed(long bytesUsed);
+  void updateMemoryUsed(long bytesUsed);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
index a8da697..08e716d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
@@ -23,51 +23,51 @@ import org.apache.geode.Statistics;
  */
 public interface OffHeapMemoryStats {
 
-  public void incFreeMemory(long value);
+  void incFreeMemory(long value);
 
-  public void incMaxMemory(long value);
+  void incMaxMemory(long value);
 
-  public void incUsedMemory(long value);
+  void incUsedMemory(long value);
 
-  public void incObjects(int value);
+  void incObjects(int value);
 
-  public void incReads();
+  void incReads();
 
-  public void setFragments(long value);
+  void setFragments(long value);
 
-  public void setLargestFragment(int value);
+  void setLargestFragment(int value);
 
-  public long startDefragmentation();
+  long startDefragmentation();
 
-  public void endDefragmentation(long start);
+  void endDefragmentation(long start);
 
-  public void setFragmentation(int value);
+  void setFragmentation(int value);
 
-  public long getFreeMemory();
+  long getFreeMemory();
 
-  public long getMaxMemory();
+  long getMaxMemory();
 
-  public long getUsedMemory();
+  long getUsedMemory();
 
-  public long getReads();
+  long getReads();
 
-  public int getObjects();
+  int getObjects();
 
-  public int getDefragmentations();
+  int getDefragmentations();
 
-  public int getDefragmentationsInProgress();
+  int getDefragmentationsInProgress();
 
-  public long getFragments();
+  long getFragments();
 
-  public int getLargestFragment();
+  int getLargestFragment();
 
-  public int getFragmentation();
+  int getFragmentation();
 
-  public long getDefragmentationTime();
+  long getDefragmentationTime();
 
-  public Statistics getStats();
+  Statistics getStats();
 
-  public void close();
+  void close();
 
-  public void initialize(OffHeapMemoryStats stats);
+  void initialize(OffHeapMemoryStats stats);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
index 9604e70..9f2ac1d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
@@ -31,10 +31,10 @@ public interface OutOfOffHeapMemoryListener {
    *
    * @param cause the actual OutOfOffHeapMemoryError that was thrown
    */
-  public void outOfOffHeapMemory(OutOfOffHeapMemoryException cause);
+  void outOfOffHeapMemory(OutOfOffHeapMemoryException cause);
 
   /**
    * Close any resources used by this listener.
    */
-  public void close();
+  void close();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
index 2573ebc..712a01b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
@@ -24,5 +24,5 @@ public interface Releasable {
   /**
    * Release any off-heap data owned by this instance.
    */
-  public void release();
+  void release();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/Slab.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/Slab.java
index 8057103..a6dad1d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/Slab.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/Slab.java
@@ -23,16 +23,16 @@ public interface Slab {
   /**
    * Return the address of the memory of this slab.
    */
-  public long getMemoryAddress();
+  long getMemoryAddress();
 
   /**
    * Returns the size of this memory chunk in bytes.
    */
-  public int getSize();
+  int getSize();
 
   /**
    * Returns any memory allocated for this slab. Note that after free is called the address of this
    * slab should no longer be used.
    */
-  public void free();
+  void free();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
index 25b3f66..2aabc53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
@@ -23,5 +23,5 @@ public interface SlabFactory {
    *
    * @throws OutOfMemoryError if the create fails
    */
-  public Slab create(int size);
+  Slab create(int size);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
index e8d44f1..fe945b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
@@ -38,7 +38,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
    * Returns true if the value stored in this memory chunk is compressed. Returns false if it is
    * uncompressed.
    */
-  public boolean isCompressed();
+  boolean isCompressed();
 
   /**
    * Returns the data stored in this object as a deserialized heap object. If it is not serialized
@@ -47,7 +47,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
    *
    * @return the data stored in this object as a deserialized heap object.
    */
-  public Object getValueAsDeserializedHeapObject();
+  Object getValueAsDeserializedHeapObject();
 
   /**
    * Returns the data stored in this object as a heap byte array. If it is not serialized then the
@@ -56,7 +56,7 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
    *
    * @return the data stored in this object as a heap byte array.
    */
-  public byte[] getValueAsHeapByteArray();
+  byte[] getValueAsHeapByteArray();
 
   /**
    * Take all the bytes in the object and write them to the data output as a byte array. If the
@@ -90,70 +90,70 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
    * @return true if we are able to retain this chunk; false if we need to retry
    */
   @Retained
-  public boolean retain();
+  boolean retain();
 
   /**
    * Returns true if this type of StoredObject uses a references count; false otherwise.
    */
-  public boolean hasRefCount();
+  boolean hasRefCount();
 
   /**
    * Returns the number of users of this memory. If this type of StoredObject does not have a
    * reference count then -1 is returned.
    */
-  public int getRefCount();
+  int getRefCount();
 
   /**
    * Returns the address of the memory used to store this object. This address may not be to the
    * first byte of stored data since the implementation may store some internal data in the first
    * bytes of the memory. This address can be used with AddressableMemoryManager.
    */
-  public long getAddress();
+  long getAddress();
 
   /**
    * Returns the number of bytes of memory used by this object to store an object. This size
    * includes any bytes used for padding and meta-information.
    */
-  public int getSize();
+  int getSize();
 
   /**
    * Returns the number of bytes of memory used to store the object. This size does not include any
    * bytes used for padding.
    */
-  public int getDataSize();
+  int getDataSize();
 
-  public byte readDataByte(int offset);
+  byte readDataByte(int offset);
 
-  public void writeDataByte(int offset, byte value);
+  void writeDataByte(int offset, byte value);
 
-  public void readDataBytes(int offset, byte[] bytes);
+  void readDataBytes(int offset, byte[] bytes);
 
-  public void writeDataBytes(int offset, byte[] bytes);
+  void writeDataBytes(int offset, byte[] bytes);
 
-  public void readDataBytes(int offset, byte[] bytes, int bytesOffset, int size);
+  void readDataBytes(int offset, byte[] bytes, int bytesOffset, int size);
 
-  public void writeDataBytes(int offset, byte[] bytes, int bytesOffset, int size);
+  void writeDataBytes(int offset, byte[] bytes, int bytesOffset, int size);
 
   /**
    * Returns an address that can read data from this StoredObject at the given offset.
    */
-  public long getAddressForReadingData(int offset, int size);
+  long getAddressForReadingData(int offset, int size);
 
   /**
    * Returns a StoredObject that acts as if its data is our data starting at the given offset and
    * limited to the given number of bytes.
    */
-  public StoredObject slice(int offset, int limit);
+  StoredObject slice(int offset, int limit);
 
   /**
    * Returns true if our data is equal to other's data; false otherwise.
    */
-  public boolean checkDataEquals(StoredObject other);
+  boolean checkDataEquals(StoredObject other);
 
   /**
    * Returns true if the given bytes are equal to our data bytes; false otherwise
    */
-  public boolean checkDataEquals(byte[] serializedObj);
+  boolean checkDataEquals(byte[] serializedObj);
 
   /**
    * Creates and returns a direct ByteBuffer that contains the data of this stored object. Note that
@@ -163,24 +163,24 @@ public interface StoredObject extends Sendable, CachedDeserializable, Releasable
    * @return the created direct byte buffer or null if it could not be created.
    */
   @Unretained
-  public ByteBuffer createDirectByteBuffer();
+  ByteBuffer createDirectByteBuffer();
 
   /**
    * Returns true if the data is serialized with PDX
    */
-  public boolean isSerializedPdxInstance();
+  boolean isSerializedPdxInstance();
 
   /**
    * Returns a StoredObject that does not cache the heap form. If a StoredObject is going to be kept
    * around for a while then it is good to call this so that it will not also keep the heap form in
    * memory.
    */
-  public StoredObject getStoredObjectWithoutHeapForm();
+  StoredObject getStoredObjectWithoutHeapForm();
 
   /**
    * Return true if the given "o" is reference to off-heap memory.
    */
-  public static boolean isOffHeapReference(Object o) {
+  static boolean isOffHeapReference(Object o) {
     return (o instanceof StoredObject) && ((StoredObject) o).hasRefCount();
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java
index 40a68f1..9f85165 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/SequenceLogger.java
@@ -46,10 +46,10 @@ public interface SequenceLogger {
    * @param source the source, for example ("member 1, region 1");
    * @param dest the destination, for example ("member 2, region 1");
    */
-  public void logTransition(GraphType type, Object graphName, Object edgeName, Object state,
-      Object source, Object dest);
+  void logTransition(GraphType type, Object graphName, Object edgeName, Object state, Object source,
+      Object dest);
 
-  public boolean isEnabled(GraphType type);
+  boolean isEnabled(GraphType type);
 
-  public void flush() throws InterruptedException;
+  void flush() throws InterruptedException;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/Filter.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/Filter.java
index e4d630c..0bbda18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/Filter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/io/Filter.java
@@ -23,10 +23,9 @@ import org.apache.geode.internal.sequencelog.GraphType;
  */
 public interface Filter {
 
-  public boolean accept(GraphType graphType, String name, String edgeName, String source,
-      String dest);
+  boolean accept(GraphType graphType, String name, String edgeName, String source, String dest);
 
-  public boolean acceptPattern(GraphType graphType, Pattern pattern, String edgeName, String source,
+  boolean acceptPattern(GraphType graphType, Pattern pattern, String edgeName, String source,
       String dest);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/GraphReaderCallback.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/GraphReaderCallback.java
index a1abd96..b644677 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/GraphReaderCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/model/GraphReaderCallback.java
@@ -23,10 +23,10 @@ import org.apache.geode.internal.sequencelog.GraphType;
  */
 public interface GraphReaderCallback {
 
-  public abstract void addEdge(long timestamp, GraphType graphType, String graphName,
-      String edgeName, String state, String source, String dest);
+  void addEdge(long timestamp, GraphType graphType, String graphName, String edgeName, String state,
+      String source, String dest);
 
-  public abstract void addEdgePattern(long timestamp, GraphType graphType, Pattern graphNamePattern,
+  void addEdgePattern(long timestamp, GraphType graphType, Pattern graphNamePattern,
       String edgeName, String state, String source, String dest);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
index 2ae21b9..6b9bf66 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
@@ -431,12 +431,12 @@ public abstract class NativeCalls {
    *
    * @since GemFire 8.0
    */
-  public static interface RehashServerOnSIGHUP {
+  public interface RehashServerOnSIGHUP {
 
     /**
      * Perform the actions required to "rehash" the server.
      */
-    public void rehash();
+    void rehash();
   }
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
index fbd679c..f6204f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
@@ -23,7 +23,6 @@ import java.net.SocketException;
 import java.nio.file.FileStore;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -44,10 +43,8 @@ import com.sun.jna.win32.StdCallLibrary;
 
 import org.apache.geode.SystemFailure;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.cache.DiskStoreImpl;
 import org.apache.geode.internal.process.signal.Signal;
-import org.apache.geode.internal.shared.NativeCalls.RehashServerOnSIGHUP;
 
 
 /**
@@ -135,7 +132,7 @@ public class NativeCallsJNAImpl {
     static final Map<String, String> javaEnv = getModifiableJavaEnv();
 
     /** Signal callback handler for <code>signal</code> native call. */
-    static interface SignalHandler extends Callback {
+    interface SignalHandler extends Callback {
       void callback(int signum);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java b/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java
index 1cffb94..82f0281 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/size/ObjectGraphSizer.java
@@ -233,7 +233,7 @@ public class ObjectGraphSizer {
 
 
 
-  public static interface ObjectFilter {
+  public interface ObjectFilter {
     boolean accept(Object parent, Object object);
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java
index 278ef92..3fc6040 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatListener.java
@@ -31,5 +31,5 @@ public interface LocalStatListener {
    *
    * @param value The new value of the statistic
    */
-  public void statValueChanged(double value);
+  void statValueChanged(double value);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java
index d523a44..9559a7b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleHandler.java
@@ -37,26 +37,26 @@ public interface SampleHandler {
    * @param nanosTimeStamp an arbitrary nanoseconds time stamp for this sample
    * @param resourceInstances the statistics resource instances captured in this sample
    */
-  public void sampled(long nanosTimeStamp, List<ResourceInstance> resourceInstances);
+  void sampled(long nanosTimeStamp, List<ResourceInstance> resourceInstances);
 
   /**
    * Notification that a new statistics {@link ResourceType} has been created.
    *
    * @param resourceType the new statistics ResourceType that was created
    */
-  public void allocatedResourceType(ResourceType resourceType);
+  void allocatedResourceType(ResourceType resourceType);
 
   /**
    * Notification that a new statistics {@link ResourceInstance} has been created.
    *
    * @param resourceInstance the new statistics ResourceInstance that was created
    */
-  public void allocatedResourceInstance(ResourceInstance resourceInstance);
+  void allocatedResourceInstance(ResourceInstance resourceInstance);
 
   /**
    * Notification that an existing statistics {@link ResourceInstance} has been destroyed.
    *
    * @param resourceInstance the existing statistics ResourceInstance that was destroyed
    */
-  public void destroyedResourceInstance(ResourceInstance resourceInstance);
+  void destroyedResourceInstance(ResourceInstance resourceInstance);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveFormat.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveFormat.java
index 169ebd1..b39bc02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveFormat.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveFormat.java
@@ -27,160 +27,160 @@ public interface StatArchiveFormat {
    * <li>Changed from 3 to 4 with addition of largerBetter boolean in statistic descriptor
    * </ol>
    */
-  public static final byte ARCHIVE_VERSION = 4;
+  byte ARCHIVE_VERSION = 4;
 
   /**
    * Token consists of a timestamp and any statistic value changes.
    */
-  public static final byte SAMPLE_TOKEN = 0;
+  byte SAMPLE_TOKEN = 0;
   /**
    * Token defines a new resource type.
    */
-  public static final byte RESOURCE_TYPE_TOKEN = 1;
+  byte RESOURCE_TYPE_TOKEN = 1;
   /**
    * Token defines a new resource instance.
    */
-  public static final byte RESOURCE_INSTANCE_CREATE_TOKEN = 2;
+  byte RESOURCE_INSTANCE_CREATE_TOKEN = 2;
   /**
    * Token notes that a previous resource instance no longer exists and thus will have any more
    * samples of its statistic values taken.
    */
-  public static final byte RESOURCE_INSTANCE_DELETE_TOKEN = 3;
+  byte RESOURCE_INSTANCE_DELETE_TOKEN = 3;
   /**
    * Token defines a new resource instance with initial data.
    */
-  public static final byte RESOURCE_INSTANCE_INITIALIZE_TOKEN = 4;
+  byte RESOURCE_INSTANCE_INITIALIZE_TOKEN = 4;
   /**
    * Token defines a new archive and provides some global information about the environment the
    * archive was created in.
    */
-  public static final byte HEADER_TOKEN = 77;
+  byte HEADER_TOKEN = 77;
 
   /**
    * The value used to signal the end of a list of resource instances.
    */
-  public static final int ILLEGAL_RESOURCE_INST_ID = -1;
+  int ILLEGAL_RESOURCE_INST_ID = -1;
   /**
    * The maximum value a resource inst id can have and still be stored in the archive as an unsigned
    * byte.
    */
-  public static final int MAX_BYTE_RESOURCE_INST_ID = 252;
+  int MAX_BYTE_RESOURCE_INST_ID = 252;
   /**
    * Used to say that the next two bytes contain the resource inst id as an unsigned short.
    */
-  public static final int SHORT_RESOURCE_INST_ID_TOKEN = 253;
+  int SHORT_RESOURCE_INST_ID_TOKEN = 253;
   /**
    * Used to say that the next four bytes contain the resource inst id as an int.
    */
-  public static final int INT_RESOURCE_INST_ID_TOKEN = 254;
+  int INT_RESOURCE_INST_ID_TOKEN = 254;
   /**
    * Used to say that the current byte represents the ILLEGAL_RESOURCE_INST_ID.
    */
-  public static final int ILLEGAL_RESOURCE_INST_ID_TOKEN = 255;
+  int ILLEGAL_RESOURCE_INST_ID_TOKEN = 255;
   /**
    * The maximum value a resource inst id can have and still be stored in the archive as an unsigned
    * short.
    */
-  public static final int MAX_SHORT_RESOURCE_INST_ID = 65535;
+  int MAX_SHORT_RESOURCE_INST_ID = 65535;
   /**
    * The value used to signal the end of a list of statistic samples.
    */
-  public static final int ILLEGAL_STAT_OFFSET = 255;
+  int ILLEGAL_STAT_OFFSET = 255;
 
   /**
    * The maximum value a timestamp can have and still be stored in the archive as an unsigned short.
    */
-  public static final int MAX_SHORT_TIMESTAMP = 65534;
+  int MAX_SHORT_TIMESTAMP = 65534;
   /**
    * Means the next 4 bytes contain the timestamp as an int.
    */
-  public static final int INT_TIMESTAMP_TOKEN = 65535;
+  int INT_TIMESTAMP_TOKEN = 65535;
 
   /**
    * The maximum value a compact value can have and still be stored in the archive as one byte.
    */
-  public static final int MAX_1BYTE_COMPACT_VALUE = Byte.MAX_VALUE;
+  int MAX_1BYTE_COMPACT_VALUE = Byte.MAX_VALUE;
   /**
    * The minimum value a compact value can have and still be stored in the archive as one byte.
    */
-  public static final int MIN_1BYTE_COMPACT_VALUE = Byte.MIN_VALUE + 7;
+  int MIN_1BYTE_COMPACT_VALUE = Byte.MIN_VALUE + 7;
   /**
    * The maximum value a compact value can have and still be stored in the archive as two bytes.
    */
-  public static final int MAX_2BYTE_COMPACT_VALUE = Short.MAX_VALUE;
+  int MAX_2BYTE_COMPACT_VALUE = Short.MAX_VALUE;
   /**
    * The minimum value a compact value can have and still be stored in the archive as two bytes.
    */
-  public static final int MIN_2BYTE_COMPACT_VALUE = Short.MIN_VALUE;
+  int MIN_2BYTE_COMPACT_VALUE = Short.MIN_VALUE;
 
   /**
    * Means the next 2 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_2_TOKEN = Byte.MIN_VALUE;
+  int COMPACT_VALUE_2_TOKEN = Byte.MIN_VALUE;
   /**
    * Means the next 3 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_3_TOKEN = Byte.MIN_VALUE + 1;
+  int COMPACT_VALUE_3_TOKEN = Byte.MIN_VALUE + 1;
   /**
    * Means the next 4 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_4_TOKEN = Byte.MIN_VALUE + 2;
+  int COMPACT_VALUE_4_TOKEN = Byte.MIN_VALUE + 2;
   /**
    * Means the next 5 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_5_TOKEN = Byte.MIN_VALUE + 3;
+  int COMPACT_VALUE_5_TOKEN = Byte.MIN_VALUE + 3;
   /**
    * Means the next 6 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_6_TOKEN = Byte.MIN_VALUE + 4;
+  int COMPACT_VALUE_6_TOKEN = Byte.MIN_VALUE + 4;
   /**
    * Means the next 7 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_7_TOKEN = Byte.MIN_VALUE + 5;
+  int COMPACT_VALUE_7_TOKEN = Byte.MIN_VALUE + 5;
   /**
    * Means the next 8 bytes hold the compact value's data.
    */
-  public static final int COMPACT_VALUE_8_TOKEN = Byte.MIN_VALUE + 6;
+  int COMPACT_VALUE_8_TOKEN = Byte.MIN_VALUE + 6;
 
   /**
    * Statistic represents a <code>boolean</code> java primitive.
    */
-  public static final int BOOLEAN_CODE = 1;
+  int BOOLEAN_CODE = 1;
   /**
    * Statistic represents a <code>char</code> java primitive.
    */
-  public static final int CHAR_CODE = 2;
+  int CHAR_CODE = 2;
   /**
    * Statistic represents a <code>char</code> java primitive.
    */
-  public static final int WCHAR_CODE = 12;
+  int WCHAR_CODE = 12;
   /**
    * Statistic represents a <code>byte</code> java primitive.
    */
-  public static final int BYTE_CODE = 3;
+  int BYTE_CODE = 3;
   /**
    * Statistic represents a <code>short</code> java primitive.
    */
-  public static final int SHORT_CODE = 4;
+  int SHORT_CODE = 4;
   /**
    * Statistic represents a <code>int</code> java primitive.
    */
-  public static final int INT_CODE = 5;
+  int INT_CODE = 5;
   /**
    * Statistic represents a <code>long</code> java primitive.
    */
-  public static final int LONG_CODE = 6;
+  int LONG_CODE = 6;
   /**
    * Statistic represents a <code>float</code> java primitive.
    */
-  public static final int FLOAT_CODE = 7;
+  int FLOAT_CODE = 7;
   /**
    * Statistic represents a <code>double</code> java primitive.
    */
-  public static final int DOUBLE_CODE = 8;
+  int DOUBLE_CODE = 8;
   /**
    * Number of nanoseconds in one millisecond
    */
-  public static final long NANOS_PER_MILLI = 1000000;
+  long NANOS_PER_MILLI = 1000000;
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java
index f63c326..aa43435 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandlerConfig.java
@@ -30,35 +30,35 @@ public interface StatArchiveHandlerConfig {
   /**
    * Gets the name of the archive file.
    */
-  public File getArchiveFileName();
+  File getArchiveFileName();
 
   /**
    * Gets the archive size limit in bytes.
    */
-  public long getArchiveFileSizeLimit();
+  long getArchiveFileSizeLimit();
 
   /**
    * Gets the archive disk space limit in bytes.
    */
-  public long getArchiveDiskSpaceLimit();
+  long getArchiveDiskSpaceLimit();
 
   /**
    * Returns a unique id for the sampler's system.
    */
-  public long getSystemId();
+  long getSystemId();
 
   /**
    * Returns the time this sampler's system was started.
    */
-  public long getSystemStartTime();
+  long getSystemStartTime();
 
   /**
    * Returns the path to this sampler's system directory; if it has one.
    */
-  public String getSystemDirectoryPath();
+  String getSystemDirectoryPath();
 
   /**
    * Returns a description of the product that the stats are on
    */
-  public String getProductDescription();
+  String getProductDescription();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java
index 7c94088..475295e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticId.java
@@ -29,8 +29,8 @@ import org.apache.geode.Statistics;
 public interface StatisticId {
 
   /** Returns the descriptor that this stat is an instance of */
-  public StatisticDescriptor getStatisticDescriptor();
+  StatisticDescriptor getStatisticDescriptor();
 
   /** Returns the statistics instance which owns this stat instance */
-  public Statistics getStatistics();
+  Statistics getStatistics();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsListener.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsListener.java
index 4964297..9af0d2e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsListener.java
@@ -19,6 +19,6 @@ package org.apache.geode.internal.statistics;
  */
 public interface StatisticsListener {
 
-  public void handleNotification(StatisticsNotification notification);
+  void handleNotification(StatisticsNotification notification);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsManager.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsManager.java
index 1cbc474..b1a4247 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsManager.java
@@ -30,51 +30,51 @@ public interface StatisticsManager extends StatisticsFactory {
   /**
    * Called when the Statistics instance <code>s</code> is closed.
    */
-  public void destroyStatistics(Statistics s);
+  void destroyStatistics(Statistics s);
 
   /**
    * Returns a name that can be used to identify the manager
    */
-  public String getName();
+  String getName();
 
   /**
    * Returns a numeric id that can be used to identify the manager
    */
-  public long getId();
+  long getId();
 
   /**
    * Returns the start time of this manager.
    */
-  public long getStartTime();
+  long getStartTime();
 
   /**
    * Returns a value that changes any time a Statistics instance is added or removed from this
    * manager.
    */
-  public int getStatListModCount();
+  int getStatListModCount();
 
   /**
    * Returns a list of all the Statistics this manager is currently managing.
    */
-  public List<Statistics> getStatsList();
+  List<Statistics> getStatsList();
 
   /**
    * Returns the current number of statistics instances.
    */
-  public int getStatisticsCount();
+  int getStatisticsCount();
 
   /**
    * Returns the statistics resource instance given its id.
    */
-  public Statistics findStatistics(long id);
+  Statistics findStatistics(long id);
 
   /**
    * Returns true if the specified statistic resource still exists.
    */
-  public boolean statisticsExists(long id);
+  boolean statisticsExists(long id);
 
   /**
    * Returns an array of all the current statistic resource instances.
    */
-  public Statistics[] getStatistics();
+  Statistics[] getStatistics();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsNotification.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsNotification.java
index 2e0feb2..9a5fa26 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsNotification.java
@@ -25,7 +25,7 @@ import org.apache.geode.StatisticsType;
  */
 public interface StatisticsNotification extends Iterable<StatisticId> {
 
-  public static enum Type {
+  enum Type {
     /** CounterMonitor threshold was exceeded */
     THRESHOLD_VALUE_EXCEEDED,
     /** GaugeMonitor low-threshold was exceeded */
@@ -41,32 +41,32 @@ public interface StatisticsNotification extends Iterable<StatisticId> {
   }
 
   /** Returns the timestamp of the stat sample */
-  public long getTimeStamp();
+  long getTimeStamp();
 
   /** Returns the notification type */
-  public Type getType();
+  Type getType();
 
   /** Returns an iterator of all the stat instances that met the monitor's criteria */
-  public Iterator<StatisticId> iterator();
+  Iterator<StatisticId> iterator();
 
   /**
    * Returns an iterator of all the stat instances for the specified descriptor that met the
    * monitor's criteria
    */
-  public Iterator<StatisticId> iterator(StatisticDescriptor statDesc);
+  Iterator<StatisticId> iterator(StatisticDescriptor statDesc);
 
   /**
    * Returns an iterator of all the stat instances for the specified statistics instance that met
    * the monitor's criteria
    */
-  public Iterator<StatisticId> iterator(Statistics statistics);
+  Iterator<StatisticId> iterator(Statistics statistics);
 
   /**
    * Returns an iterator of all the stat instances for the specified statistics type that met the
    * monitor's criteria
    */
-  public Iterator<StatisticId> iterator(StatisticsType statisticsType);
+  Iterator<StatisticId> iterator(StatisticsType statisticsType);
 
   /** Returns the value for the specified stat instance */
-  public Number getValue(StatisticId statId) throws StatisticNotFoundException;
+  Number getValue(StatisticId statId) throws StatisticNotFoundException;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java
index c1ca990..9716346 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsSampler.java
@@ -27,12 +27,12 @@ public interface StatisticsSampler {
   /**
    * Returns the number of times a statistics resource has been add or deleted.
    */
-  public int getStatisticsModCount();
+  int getStatisticsModCount();
 
   /**
    * Returns an array of all the current statistics resource instances.
    */
-  public Statistics[] getStatistics();
+  Statistics[] getStatistics();
 
   /**
    * Waits for the SampleCollector to be created and initialized.
@@ -41,7 +41,7 @@ public interface StatisticsSampler {
    * @return the initialized SampleCollector or null if timed out
    * @throws InterruptedException if the current thread is interrupted while waiting
    */
-  public SampleCollector waitForSampleCollector(long timeout) throws InterruptedException;
+  SampleCollector waitForSampleCollector(long timeout) throws InterruptedException;
 
   /**
    * Waits for at least one statistics sample to occur before returning.
@@ -50,5 +50,5 @@ public interface StatisticsSampler {
    * @return true if a statistics sample occurred; false if wait timed out
    * @throws InterruptedException if the current thread is interrupted while waiting
    */
-  public boolean waitForSample(long timeout) throws InterruptedException;
+  boolean waitForSample(long timeout) throws InterruptedException;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java
index 569127e..7c65281 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContract.java
@@ -26,10 +26,10 @@ public interface VMStatsContract {
   /**
    * Called by sampler when it wants the VMStats statistics values to be refetched from the system.
    */
-  public void refresh();
+  void refresh();
 
   /**
    * Called by sampler when it wants the VMStats to go away.
    */
-  public void close();
+  void close();
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java
index 7d112c9..a8166ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OsStatisticsFactory.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.internal.statistics.platform;
 
-import org.apache.geode.*;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
 
 /**
  * Instances of this interface provide methods that create operating system instances of
@@ -35,6 +36,6 @@ public interface OsStatisticsFactory {
    * <p>
    * The created instance may not be {@link Statistics#isAtomic atomic}.
    */
-  public Statistics createOsStatistics(StatisticsType type, String textId, long numericId,
+  Statistics createOsStatistics(StatisticsType type, String textId, long numericId,
       int osStatFlags);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java
index bd7e805..550def8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/BaseMsgStreamer.java
@@ -18,8 +18,6 @@ package org.apache.geode.internal.tcp;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.geode.i18n.LogWriterI18n;
-
 /**
  * Base interface for {@link MsgStreamer} and {@link MsgStreamerList} to send a message over a list
  * of connections to one or more peers.
@@ -28,31 +26,31 @@ import org.apache.geode.i18n.LogWriterI18n;
  */
 public interface BaseMsgStreamer {
 
-  public void reserveConnections(long startTime, long ackTimeout, long ackSDTimeout);
+  void reserveConnections(long startTime, long ackTimeout, long ackSDTimeout);
 
   /**
    * Returns a list of the Connections that the message was sent to. Call this after
    * {@link #writeMessage}.
    */
-  public List<?> getSentConnections();
+  List<?> getSentConnections();
 
   /**
    * Returns an exception the describes which cons the message was not sent to. Call this after
    * {@link #writeMessage}.
    */
-  public ConnectExceptions getConnectExceptions();
+  ConnectExceptions getConnectExceptions();
 
   /**
    * Writes the message to the connected streams and returns the number of bytes written.
    *
    * @throws IOException if serialization failure
    */
-  public int writeMessage() throws IOException;
+  int writeMessage() throws IOException;
 
   /**
    * Close this streamer.
    *
    * @throws IOException on exception
    */
-  public void close() throws IOException;
+  void close() throws IOException;
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
index 16e9571..43641fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
@@ -28,7 +28,6 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import org.apache.geode.internal.ByteBufferWriter;
-import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.offheap.AddressableMemoryManager;
 import org.apache.geode.internal.offheap.StoredObject;
 
@@ -53,7 +52,7 @@ public class ByteBufferInputStream extends InputStream
    *
    *
    */
-  public static interface ByteSource {
+  public interface ByteSource {
     int position();
 
     int limit();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java
index 39d400e..07b952e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ServerDelegate.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.tcp;
 
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.DistributionMessage;
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.i18n.LogWriterI18n;
 
 
@@ -34,12 +34,12 @@ import org.apache.geode.i18n.LogWriterI18n;
  */
 public interface ServerDelegate {
 
-  public void receive(DistributionMessage message, int bytesRead, DistributedMember connId);
+  void receive(DistributionMessage message, int bytesRead, DistributedMember connId);
 
-  public LogWriterI18n getLogger();
+  LogWriterI18n getLogger();
 
   /**
    * Called when a possibly new member is detected by receiving a direct channel message from him.
    */
-  public void newMemberConnected(InternalDistributedMember member);
+  void newMemberConnected(InternalDistributedMember member);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java b/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java
index 5673961..93ffd63 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/ObjectIntProcedure.java
@@ -21,6 +21,6 @@ package org.apache.geode.internal.util;
  */
 public interface ObjectIntProcedure {
 
-  public boolean executeWith(Object a, int b);
+  boolean executeWith(Object a, int b);
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java b/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java
index 21ee610..0fa8bb5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/Transformer.java
@@ -27,5 +27,5 @@ public interface Transformer<T1, T2> {
    * @param t the data to be transferred from.
    * @return the transformed data.
    */
-  public T2 transform(T1 t);
+  T2 transform(T1 t);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java b/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java
index f1fdce4..fe87520 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/Versionable.java
@@ -22,11 +22,11 @@ package org.apache.geode.internal.util;
  */
 public interface Versionable {
 
-  public abstract Comparable getVersion();
+  Comparable getVersion();
 
-  public abstract boolean isNewerThan(Versionable other);
+  boolean isNewerThan(Versionable other);
 
-  public abstract boolean isSame(Versionable other);
+  boolean isSame(Versionable other);
 
-  public abstract boolean isOlderThan(Versionable other);
+  boolean isOlderThan(Versionable other);
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 82756da..204321e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -256,7 +256,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
    * {@link org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry}
    * objects for each entry in the map.
    */
-  public static interface HashEntry<K, V> {
+  public interface HashEntry<K, V> {
 
     /**
      * Get the key object for this entry.
@@ -377,19 +377,19 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
    * {@link org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry}
    * objects by caller. This can be used, for example, to return GemFire RegionEntries directly.
    */
-  public static interface HashEntryCreator<K, V> {
+  public interface HashEntryCreator<K, V> {
 
     /**
      * Create a new
      * {@link org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry}
      * given the key, hash, value and next element.
      */
-    public HashEntry<K, V> newEntry(K key, int hash, HashEntry<K, V> next, V value);
+    HashEntry<K, V> newEntry(K key, int hash, HashEntry<K, V> next, V value);
 
     /**
      * Get the hashCode for given key object.
      */
-    public int keyHashCode(Object key, boolean compareValues);
+    int keyHashCode(Object key, boolean compareValues);
   }
 
   // End GemStone addition
@@ -1559,7 +1559,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
    * @param <C> the type of context parameter passed to the creation/removal methods
    * @param <P> the type of extra parameter passed to the creation/removal methods
    */
-  public static interface MapCallback<K, V, C, P> {
+  public interface MapCallback<K, V, C, P> {
 
     /**
      * Create a new instance of the value object given the key and provided parameters for
@@ -1569,7 +1569,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
      * @param context any context in which this method has been invoked
      * @param createParams parameters, if any, required for construction of a new value object
      */
-    public V newValue(K key, C context, P createParams);
+    V newValue(K key, C context, P createParams);
 
     /**
      * Invoked when an existing value in map is read by the
@@ -1578,7 +1578,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
      *
      * @param value the value read by create that will be returned
      */
-    public void oldValueRead(V value);
+    void oldValueRead(V value);
 
     /**
      * Check if the existing value should be removed by the
@@ -1588,7 +1588,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
      * @param context any context in which this method has been invoked
      * @param removeParams parameters, if any, to be passed for cleanup of the object
      */
-    public boolean doRemoveValue(V value, C context, P removeParams);
+    boolean doRemoveValue(V value, C context, P removeParams);
   }
 
   /**

-- 
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.

Mime
View raw message