You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/06/14 18:39:09 UTC
[05/18] geode git commit: GEODE-2980: remove unnecessary explicit
keywords from interfaces
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCache.java
----------------------------------------------------------------------
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 823db71..dceaea7 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionProvider.java
----------------------------------------------------------------------
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 8ec0d70..f5f5624 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceResources.java
----------------------------------------------------------------------
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;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/i18n/StringId.java
----------------------------------------------------------------------
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 d247c00..cacb74e 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/lang/Filter.java
----------------------------------------------------------------------
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 99d822f..e9f1692 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/lang/Initable.java
----------------------------------------------------------------------
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 65d4618..91349b5 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/lang/MutableIdentifiable.java
----------------------------------------------------------------------
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 88356da..cdbd99e 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/lang/Orderable.java
----------------------------------------------------------------------
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 11dbec5..439a18a 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/lang/Ordered.java
----------------------------------------------------------------------
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 6e17eb2..95b11d8 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
----------------------------------------------------------------------
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 4c04ca6..3ccc422 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 final static 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 final static 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 final static 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 final static 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 final static 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 final static 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 final static 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 final static 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 final static 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 final static 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
----------------------------------------------------------------------
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 27f2116..e969311 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
@@ -466,16 +466,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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GemFireLogger.java
----------------------------------------------------------------------
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 59afa52..2305739 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
@@ -34,7 +34,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 +43,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 +51,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 +61,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 +69,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 +79,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 +89,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 +104,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 +120,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 +136,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 +145,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 +153,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 +162,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 +170,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 +180,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 +188,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 +198,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 +208,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 +223,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 +239,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 +255,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 +264,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 +272,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 +281,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 +289,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 +299,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 +307,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 +317,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 +327,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 +342,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 +358,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 +374,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 +383,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 +391,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 +400,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 +408,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 +418,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 +426,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 +436,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 +446,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 +461,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 +477,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 +493,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 +502,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 +510,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 +519,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 +527,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 +537,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 +545,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 +555,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 +565,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 +580,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 +596,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 +612,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 +621,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 +629,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 +638,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 +646,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 +656,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 +664,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 +674,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 +684,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 +699,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 +715,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 +731,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 +741,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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogMarker.java
----------------------------------------------------------------------
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>
* <MarkerFilter marker="GEODE_VERBOSE" onMatch="DENY" onMismatch="NEUTRAL"/>
*/
- 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/memcached/CommandProcessor.java
----------------------------------------------------------------------
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 3f0ed4f..631a894 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
----------------------------------------------------------------------
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 ad9fa09..6ab80da 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
@@ -388,7 +388,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.
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/LifecycleListener.java
----------------------------------------------------------------------
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 25216ea..474f466 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>();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocator.java
----------------------------------------------------------------------
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 80189a4..7f51764 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryBlock.java
----------------------------------------------------------------------
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 904cfe0..6eee843 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryInspector.java
----------------------------------------------------------------------
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 0e3bee3..dea1661 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryUsageListener.java
----------------------------------------------------------------------
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 18d1dc8..1dc261e 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapMemoryStats.java
----------------------------------------------------------------------
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 cf80639..0d241e2 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryListener.java
----------------------------------------------------------------------
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 b64e44e..cf3ca3b 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/Releasable.java
----------------------------------------------------------------------
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 75ec9b4..a5f3bbd 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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/Slab.java
----------------------------------------------------------------------
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();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/SlabFactory.java
----------------------------------------------------------------------
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 e502d8f..0cc2e81 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);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/offheap/StoredObject.java
----------------------------------------------------------------------
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 348476e..2cc0f37 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();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
index 0af8758..6c82a13 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
@@ -154,6 +154,6 @@ class ControlFileWatchdog implements Runnable {
* Defines the callback to be invoked when the control file exists.
*/
interface ControlRequestHandler {
- public void handleRequest() throws IOException;
+ void handleRequest() throws IOException;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
index 246c1e8..344da3c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControlNotificationHandler.java
@@ -24,7 +24,7 @@ import org.apache.geode.distributed.AbstractLauncher.ServiceState;
* @since GemFire 8.0
*/
public interface ControlNotificationHandler {
- public void handleStop();
+ void handleStop();
- public ServiceState<?> handleStatus();
+ ServiceState<?> handleStatus();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
index 0beb9ff..12701a5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileControllerParameters.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.process.ProcessController.Arguments;
* @since GemFire 8.0
*/
interface FileControllerParameters extends Arguments {
- public File getPidFile();
+ File getPidFile();
- public File getWorkingDirectory();
+ File getWorkingDirectory();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
index 857c52d..ecbec05 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanControllerParameters.java
@@ -25,15 +25,15 @@ import org.apache.geode.internal.process.ProcessController.Arguments;
* @since GemFire 8.0
*/
interface MBeanControllerParameters extends Arguments {
- public ObjectName getNamePattern();
+ ObjectName getNamePattern();
- public String getPidAttribute();
+ String getPidAttribute();
- public String getStatusMethod();
+ String getStatusMethod();
- public String getStopMethod();
+ String getStopMethod();
- public String[] getAttributes();
+ String[] getAttributes();
- public Object[] getValues();
+ Object[] getValues();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
index 2aa4732..a79bc1a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessController.java
@@ -27,19 +27,19 @@ public interface ProcessController {
/**
* Returns the status of a running GemFire {@link ControllableProcess}.
*/
- public String status() throws UnableToControlProcessException, ConnectionFailedException,
- IOException, MBeanInvocationFailedException, InterruptedException, TimeoutException;
+ String status() throws UnableToControlProcessException, ConnectionFailedException, IOException,
+ MBeanInvocationFailedException, InterruptedException, TimeoutException;
/**
* Stops a running GemFire {@link ControllableProcess}.
*/
- public void stop() throws UnableToControlProcessException, ConnectionFailedException, IOException,
+ void stop() throws UnableToControlProcessException, ConnectionFailedException, IOException,
MBeanInvocationFailedException;
/**
* Returns the PID of a running GemFire {@link ControllableProcess}.
*/
- public int getProcessId();
+ int getProcessId();
/**
* Checks if {@link #status} and {@link #stop} are supported if only the PID is provided. Only the
@@ -48,14 +48,14 @@ public interface ProcessController {
*
* @throws org.apache.geode.lang.AttachAPINotFoundException if the Attach API is not found
*/
- public void checkPidSupport();
+ void checkPidSupport();
/**
* Defines the arguments that a client must provide to the ProcessController.
*/
- static interface Arguments {
- public int getProcessId();
+ interface Arguments {
+ int getProcessId();
- public ProcessType getProcessType();
+ ProcessType getProcessType();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
index b514c6a..ea66f20 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessStreamReader.java
@@ -198,8 +198,8 @@ public abstract class ProcessStreamReader implements Runnable {
/**
* Defines the callback for lines of output found in the stream.
*/
- public static interface InputListener {
- public void notifyInputLine(String line);
+ public interface InputListener {
+ void notifyInputLine(String line);
}
/** Default ReadingMode is BLOCKING */
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
index 3ff74d8..ea57795 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
@@ -178,12 +178,12 @@ public class ProcessUtils {
* Defines the SPI for ProcessUtils
*/
interface InternalProcessUtils {
- public boolean isProcessAlive(int pid);
+ boolean isProcessAlive(int pid);
- public boolean killProcess(int pid);
+ boolean killProcess(int pid);
- public boolean isAvailable();
+ boolean isAvailable();
- public boolean isAttachApiAvailable();
+ boolean isAttachApiAvailable();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/StartupStatusListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/StartupStatusListener.java b/geode-core/src/main/java/org/apache/geode/internal/process/StartupStatusListener.java
index 0e3abb7..2eaa29a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/StartupStatusListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/StartupStatusListener.java
@@ -24,5 +24,5 @@ public interface StartupStatusListener {
* Report the current status of system startup. The status message reported to this method should
* already be internationalized.
*/
- public void setStatus(String status);
+ void setStatus(String status);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/process/signal/SignalListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/signal/SignalListener.java b/geode-core/src/main/java/org/apache/geode/internal/process/signal/SignalListener.java
index 4570eb8..f8a230d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/signal/SignalListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/signal/SignalListener.java
@@ -27,6 +27,6 @@ import java.util.EventListener;
@SuppressWarnings("unused")
public interface SignalListener extends EventListener {
- public void handle(SignalEvent event);
+ void handle(SignalEvent event);
}