geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [31/40] geode git commit: GEODE-2980: remove unnecessary explicit keywords from interfaces
Date Thu, 15 Jun 2017 21:55:04 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java
index 636fb6e..250b000 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java
@@ -41,7 +41,7 @@ public interface JoinLeave extends Service {
    * Invoked by the Manager, this notifies the HealthMonitor that a ShutdownMessage has been
    * received from the given member
    */
-  public void memberShutdown(DistributedMember mbr, String reason);
+  void memberShutdown(DistributedMember mbr, String reason);
 
   /**
    * returns the local address

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java
index 9fe39a5..f00aeaf 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java
@@ -22,6 +22,6 @@ import org.apache.geode.distributed.internal.DistributionMessage;
  */
 public interface MessageHandler {
 
-  public void processMessage(DistributionMessage m);
+  void processMessage(DistributionMessage m);
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java
index 0dccd6c..291ccc8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java
@@ -18,6 +18,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
 
 public interface HasMemberID {
 
-  public InternalDistributedMember getMemberID();
+  InternalDistributedMember getMemberID();
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java b/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
index fd7d331..b0bc9ef 100644
--- a/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
+++ b/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java
@@ -79,302 +79,302 @@ public interface LogWriterI18n {
   /**
    * @return true if "severe" log messages are enabled.
    */
-  public boolean severeEnabled();
+  boolean severeEnabled();
 
   /**
    * Writes an exception to this writer. The exception level is "severe".
    */
-  public void severe(Throwable ex);
+  void severe(Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "severe".
    * 
    * @since GemFire 6.0
    */
-  public void severe(StringId msgID, Object[] params, Throwable ex);
+  void severe(StringId msgID, Object[] params, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "severe".
    * 
    * @since GemFire 6.0
    */
-  public void severe(StringId msgID, Object param, Throwable ex);
+  void severe(StringId msgID, Object param, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "severe".
    * 
    * @since GemFire 6.0
    */
-  public void severe(StringId msgID, Throwable ex);
+  void severe(StringId msgID, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "severe".
    * 
    * @since GemFire 6.0
    */
-  public void severe(StringId msgID, Object[] params);
+  void severe(StringId msgID, Object[] params);
 
   /**
    * Writes a message to this writer. The message level is "severe".
    * 
    * @since GemFire 6.0
    */
-  public void severe(StringId msgID, Object param);
+  void severe(StringId msgID, Object param);
 
   /**
    * Writes a message to this writer. The message level is "severe".
    * 
    * @since GemFire 6.0
    */
-  public void severe(StringId msgID);
+  void severe(StringId msgID);
 
   /**
    * @return true if "error" log messages are enabled.
    */
-  public boolean errorEnabled();
+  boolean errorEnabled();
 
   /**
    * Writes an exception to this writer. The exception level is "error".
    */
-  public void error(Throwable ex);
+  void error(Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "error".
    * 
    * @since GemFire 6.0
    */
-  public void error(StringId msgID, Object[] params, Throwable ex);
+  void error(StringId msgID, Object[] params, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "error".
    * 
    * @since GemFire 6.0
    */
-  public void error(StringId msgID, Object param, Throwable ex);
+  void error(StringId msgID, Object param, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "error".
    * 
    * @since GemFire 6.0
    */
-  public void error(StringId msgID, Throwable ex);
+  void error(StringId msgID, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "error".
    * 
    * @since GemFire 6.0
    */
-  public void error(StringId msgID, Object[] params);
+  void error(StringId msgID, Object[] params);
 
   /**
    * Writes a message to this writer. The message level is "error".
    * 
    * @since GemFire 6.0
    */
-  public void error(StringId msgID, Object param);
+  void error(StringId msgID, Object param);
 
   /**
    * Writes a message to this writer. The message level is "error".
    * 
    * @since GemFire 6.0
    */
-  public void error(StringId msgID);
+  void error(StringId msgID);
 
   /**
    * @return true if "warning" log messages are enabled.
    */
-  public boolean warningEnabled();
+  boolean warningEnabled();
 
   /**
    * Writes an exception to this writer. The exception level is "warning".
    */
-  public void warning(Throwable ex);
+  void warning(Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "warning".
    * 
    * @since GemFire 6.0
    */
-  public void warning(StringId msgID, Object[] params, Throwable ex);
+  void warning(StringId msgID, Object[] params, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "warning".
    * 
    * @since GemFire 6.0
    */
-  public void warning(StringId msgID, Object param, Throwable ex);
+  void warning(StringId msgID, Object param, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "warning".
    * 
    * @since GemFire 6.0
    */
-  public void warning(StringId msgID, Throwable ex);
+  void warning(StringId msgID, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "warning".
    * 
    * @since GemFire 6.0
    */
-  public void warning(StringId msgID, Object[] params);
+  void warning(StringId msgID, Object[] params);
 
   /**
    * Writes a message to this writer. The message level is "warning".
    * 
    * @since GemFire 6.0
    */
-  public void warning(StringId msgID, Object param);
+  void warning(StringId msgID, Object param);
 
   /**
    * Writes a message to this writer. The message level is "warning".
    * 
    * @since GemFire 6.0
    */
-  public void warning(StringId msgID);
+  void warning(StringId msgID);
 
   /**
    * @return true if "info" log messages are enabled.
    */
-  public boolean infoEnabled();
+  boolean infoEnabled();
 
   /**
    * Writes an exception to this writer. The exception level is "information".
    */
-  public void info(Throwable ex);
+  void info(Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "info".
    * 
    * @since GemFire 6.0
    */
-  public void info(StringId msgID, Object[] params, Throwable ex);
+  void info(StringId msgID, Object[] params, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "info".
    * 
    * @since GemFire 6.0
    */
-  public void info(StringId msgID, Object param, Throwable ex);
+  void info(StringId msgID, Object param, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "info".
    * 
    * @since GemFire 6.0
    */
-  public void info(StringId msgID, Throwable ex);
+  void info(StringId msgID, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "info".
    * 
    * @since GemFire 6.0
    */
-  public void info(StringId msgID, Object[] params);
+  void info(StringId msgID, Object[] params);
 
   /**
    * Writes a message to this writer. The message level is "info".
    * 
    * @since GemFire 6.0
    */
-  public void info(StringId msgID, Object param);
+  void info(StringId msgID, Object param);
 
   /**
    * Writes a message to this writer. The message level is "info".
    * 
    * @since GemFire 6.0
    */
-  public void info(StringId msgID);
+  void info(StringId msgID);
 
   /**
    * @return true if "config" log messages are enabled.
    */
-  public boolean configEnabled();
+  boolean configEnabled();
 
   /**
    * Writes an exception to this writer. The exception level is "config".
    */
-  public void config(Throwable ex);
+  void config(Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "config".
    * 
    * @since GemFire 6.0
    */
-  public void config(StringId msgID, Object[] params, Throwable ex);
+  void config(StringId msgID, Object[] params, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "config".
    * 
    * @since GemFire 6.0
    */
-  public void config(StringId msgID, Object param, Throwable ex);
+  void config(StringId msgID, Object param, Throwable ex);
 
   /**
    * Writes both a message and exception to this writer. The message level is "config".
    * 
    * @since GemFire 6.0
    */
-  public void config(StringId msgID, Throwable ex);
+  void config(StringId msgID, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "config".
    * 
    * @since GemFire 6.0
    */
-  public void config(StringId msgID, Object[] params);
+  void config(StringId msgID, Object[] params);
 
   /**
    * Writes a message to this writer. The message level is "config".
    * 
    * @since GemFire 6.0
    */
-  public void config(StringId msgID, Object param);
+  void config(StringId msgID, Object param);
 
   /**
    * Writes a message to this writer. The message level is "config".
    * 
    * @since GemFire 6.0
    */
-  public void config(StringId msgID);
+  void config(StringId msgID);
 
   /**
    * @return true if "fine" log messages are enabled.
    */
-  public boolean fineEnabled();
+  boolean fineEnabled();
 
   /**
    * Writes both a message and exception to this writer. The message level is "fine".
    */
-  public void fine(String msg, Throwable ex);
+  void fine(String msg, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "fine".
    */
-  public void fine(String msg);
+  void fine(String msg);
 
   /**
    * Writes an exception to this writer. The exception level is "fine".
    */
-  public void fine(Throwable ex);
+  void fine(Throwable ex);
 
   /**
    * @return true if "finer" log messages are enabled.
    */
-  public boolean finerEnabled();
+  boolean finerEnabled();
 
   /**
    * Writes both a message and exception to this writer. The message level is "finer".
    */
-  public void finer(String msg, Throwable ex);
+  void finer(String msg, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "finer".
    */
-  public void finer(String msg);
+  void finer(String msg);
 
   /**
    * Writes an exception to this writer. The exception level is "finer".
    */
-  public void finer(Throwable ex);
+  void finer(Throwable ex);
 
   /**
    * Log a method entry.
@@ -385,7 +385,7 @@ public interface LogWriterI18n {
    * @param sourceClass Name of class that issued the logging request.
    * @param sourceMethod Name of the method that issued the logging request.
    */
-  public void entering(String sourceClass, String sourceMethod);
+  void entering(String sourceClass, String sourceMethod);
 
   /**
    * Log a method return.
@@ -396,7 +396,7 @@ public interface LogWriterI18n {
    * @param sourceClass Name of class that issued the logging request.
    * @param sourceMethod Name of the method that issued the logging request.
    */
-  public void exiting(String sourceClass, String sourceMethod);
+  void exiting(String sourceClass, String sourceMethod);
 
   /**
    * Log throwing an exception.
@@ -412,39 +412,39 @@ public interface LogWriterI18n {
    * @param sourceMethod Name of the method that issued the logging request.
    * @param thrown The Throwable that is being thrown.
    */
-  public void throwing(String sourceClass, String sourceMethod, Throwable thrown);
+  void throwing(String sourceClass, String sourceMethod, Throwable thrown);
 
   /**
    * @return true if "finest" log messages are enabled.
    */
-  public boolean finestEnabled();
+  boolean finestEnabled();
 
   /**
    * Writes both a message and exception to this writer. The message level is "finest".
    */
-  public void finest(String msg, Throwable ex);
+  void finest(String msg, Throwable ex);
 
   /**
    * Writes a message to this writer. The message level is "finest".
    */
-  public void finest(String msg);
+  void finest(String msg);
 
   /**
    * Writes an exception to this writer. The exception level is "finest".
    */
-  public void finest(Throwable ex);
+  void finest(Throwable ex);
 
   /**
    * Returns a 1.4 logging handler that can be used to direct application output to this GemFire
    * logger using the standard JDK logger APIs. Each time this method is called it creates a new
    * instance of a Handler so care should be taken to not call this method too often.
    */
-  public Handler getHandler();
+  Handler getHandler();
 
   /**
    * A mechanism for accessing the abstraction layer used for a plain logger.
    * 
    * @return LogWriter
    */
-  public LogWriter convertToLogWriter();
+  LogWriter convertToLogWriter();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java
----------------------------------------------------------------------
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);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java
----------------------------------------------------------------------
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 95393b4..eb21e90 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);
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java
----------------------------------------------------------------------
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 4289233..6be08b0 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
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
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 18f382b..6d9addf 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
@@ -68,200 +68,200 @@ public interface DataSerializableFixedID extends SerializationVersions {
    * 
    * In DSFIDFactory, add a case for the new class case FOO: return new FOO(in);
    */
-  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;
+  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;
 
   // IDs -20 .. -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;
@@ -269,132 +269,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;
@@ -403,415 +403,415 @@ 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 PREPARE_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 PREPARE_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_REQUEST = 2159;
-  public static final short CONFIGURATION_RESPONSE = 2160;
+  short CONFIGURATION_REQUEST = 2159;
+  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;
+  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;
 
   // NOTE, codes > 65535 will take 4 bytes to serialize
 
@@ -820,14 +820,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>
@@ -840,7 +840,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>
@@ -855,7 +855,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;
 
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
----------------------------------------------------------------------
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 247f9a9..7c7a7de 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,7 +168,7 @@ public class NanoTimer {
     /**
      * Returns the current time.
      */
-    public long getTime();
+    long getTime();
   }
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/ObjToByteArraySerializer.java
----------------------------------------------------------------------
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 6a5069c..4fb5f6f 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
@@ -30,5 +30,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;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/ebb691dd/geode-core/src/main/java/org/apache/geode/internal/OneTaskOnlyExecutor.java
----------------------------------------------------------------------
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 26a89ce..8270826 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();
   }
 


Mime
View raw message