Run spotlessApply
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/006b135b Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/006b135b Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/006b135b Branch: refs/heads/feature/GEODE-2632-17 Commit: 006b135b6137d9a0a0f2ce6fb5f663137aa63740 Parents: 46c5b97 Author: Kirk Lund <kl...@apache.org> Authored: Fri May 19 15:23:12 2017 -0700 Committer: Kirk Lund <kl...@apache.org> Committed: Wed May 24 16:41:07 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/GemFireException.java | 7 +- .../geode/cache/CacheRuntimeException.java | 4 +- .../geode/internal/cache/ha/HARegionQueue.java | 18 +-- .../cache/tier/sockets/BaseCommand.java | 152 ++++++++++++------- .../cache/tier/sockets/CacheClientNotifier.java | 8 +- .../ServerInterestRegistrationMessage.java | 31 ++-- .../cache/tier/sockets/command/AddPdxEnum.java | 3 +- .../cache/tier/sockets/command/AddPdxType.java | 3 +- .../cache/tier/sockets/command/ClearRegion.java | 14 +- .../cache/tier/sockets/command/ClientReady.java | 12 +- .../tier/sockets/command/CloseConnection.java | 11 +- .../tier/sockets/command/CommitCommand.java | 3 +- .../cache/tier/sockets/command/ContainsKey.java | 9 +- .../tier/sockets/command/ContainsKey66.java | 9 +- .../tier/sockets/command/CreateRegion.java | 10 +- .../cache/tier/sockets/command/Default.java | 10 +- .../cache/tier/sockets/command/Destroy.java | 15 +- .../cache/tier/sockets/command/Destroy65.java | 34 +++-- .../tier/sockets/command/DestroyRegion.java | 11 +- .../tier/sockets/command/ExecuteFunction.java | 3 +- .../tier/sockets/command/ExecuteFunction65.java | 3 +- .../tier/sockets/command/ExecuteFunction66.java | 3 +- .../tier/sockets/command/ExecuteFunction70.java | 3 +- .../sockets/command/ExecuteRegionFunction.java | 3 +- .../command/ExecuteRegionFunction61.java | 3 +- .../command/ExecuteRegionFunction65.java | 3 +- .../command/ExecuteRegionFunction66.java | 3 +- .../command/ExecuteRegionFunctionSingleHop.java | 3 +- .../sockets/command/GatewayReceiverCommand.java | 85 +++++------ .../cache/tier/sockets/command/Get70.java | 14 +- .../cache/tier/sockets/command/GetAll.java | 8 +- .../cache/tier/sockets/command/GetAll651.java | 8 +- .../cache/tier/sockets/command/GetAll70.java | 11 +- .../sockets/command/GetAllWithCallback.java | 11 +- .../command/GetClientPRMetadataCommand.java | 6 +- .../command/GetClientPRMetadataCommand66.java | 6 +- .../sockets/command/GetFunctionAttribute.java | 3 +- .../tier/sockets/command/GetPDXEnumById.java | 5 +- .../tier/sockets/command/GetPDXIdForEnum.java | 3 +- .../tier/sockets/command/GetPDXIdForType.java | 3 +- .../tier/sockets/command/GetPDXTypeById.java | 5 +- .../cache/tier/sockets/command/Invalid.java | 7 +- .../cache/tier/sockets/command/Invalidate.java | 18 ++- .../cache/tier/sockets/command/KeySet.java | 12 +- .../cache/tier/sockets/command/MakePrimary.java | 7 +- .../cache/tier/sockets/command/PeriodicAck.java | 5 +- .../cache/tier/sockets/command/Ping.java | 11 +- .../cache/tier/sockets/command/Put.java | 25 +-- .../cache/tier/sockets/command/Put61.java | 20 ++- .../cache/tier/sockets/command/Put65.java | 35 +++-- .../cache/tier/sockets/command/PutAll.java | 23 ++- .../cache/tier/sockets/command/PutAll70.java | 31 ++-- .../cache/tier/sockets/command/PutAll80.java | 35 +++-- .../sockets/command/PutUserCredentials.java | 9 +- .../cache/tier/sockets/command/Query.java | 3 +- .../cache/tier/sockets/command/Query651.java | 12 +- .../command/RegisterDataSerializers.java | 12 +- .../sockets/command/RegisterInstantiators.java | 14 +- .../tier/sockets/command/RegisterInterest.java | 21 +-- .../sockets/command/RegisterInterest61.java | 19 +-- .../sockets/command/RegisterInterestList.java | 18 ++- .../sockets/command/RegisterInterestList61.java | 18 ++- .../sockets/command/RegisterInterestList66.java | 15 +- .../cache/tier/sockets/command/RemoveAll.java | 36 +++-- .../tier/sockets/command/RemoveUserAuth.java | 4 +- .../cache/tier/sockets/command/Request.java | 14 +- .../tier/sockets/command/RequestEventValue.java | 20 ++- .../cache/tier/sockets/command/Size.java | 6 +- .../command/TXSynchronizationCommand.java | 13 +- .../sockets/command/UnregisterInterest.java | 14 +- .../sockets/command/UnregisterInterestList.java | 11 +- .../command/UpdateClientNotification.java | 3 +- .../cache/tier/sockets/command/CloseCQ.java | 16 +- .../cache/tier/sockets/command/ExecuteCQ.java | 13 +- .../cache/tier/sockets/command/ExecuteCQ61.java | 16 +- .../cache/tier/sockets/command/GetCQStats.java | 12 +- .../tier/sockets/command/GetDurableCQs.java | 10 +- .../cache/tier/sockets/command/MonitorCQ.java | 18 ++- .../cache/tier/sockets/command/StopCQ.java | 16 +- 79 files changed, 677 insertions(+), 474 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/GemFireException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/GemFireException.java b/geode-core/src/main/java/org/apache/geode/GemFireException.java index 3a69307..cd80019 100644 --- a/geode-core/src/main/java/org/apache/geode/GemFireException.java +++ b/geode-core/src/main/java/org/apache/geode/GemFireException.java @@ -19,8 +19,7 @@ package org.apache.geode; * GemFire. * <p> * Since these exceptions are unchecked, this class really <em>ought</em> to be called - * {@code GemFireRuntimeException}; however, the current name is retained for compatibility's - * sake. + * {@code GemFireRuntimeException}; however, the current name is retained for compatibility's sake. * <p> * This class is abstract to enforce throwing more specific exception types. Please avoid using * GemFireException to describe an arbitrary error condition @@ -60,8 +59,8 @@ public abstract class GemFireException extends RuntimeException { } /** - * Returns the root cause of this {@code GemFireException} or {@code null} if the cause - * is nonexistent or unknown. + * Returns the root cause of this {@code GemFireException} or {@code null} if the cause is + * nonexistent or unknown. */ public Throwable getRootCause() { if (this.getCause() == null) { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java index 89b596f..7732e96 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java +++ b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java @@ -41,8 +41,8 @@ public abstract class CacheRuntimeException extends GemFireException { } /** - * Constructs an instance of {@code CacheRuntimeException} with the specified detail message - * and cause. + * Constructs an instance of {@code CacheRuntimeException} with the specified detail message and + * cause. * * @param msg the detail message * @param cause the causal Throwable http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java index c0d3342..66e34b9 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java @@ -2059,7 +2059,7 @@ public class HARegionQueue implements RegionQueue { private static class BlockingHARegionQueue extends HARegionQueue { private static final String EVENT_ENQUEUE_WAIT_TIME_NAME = - DistributionConfig.GEMFIRE_PREFIX + "subscription.EVENT_ENQUEUE_WAIT_TIME"; + DistributionConfig.GEMFIRE_PREFIX + "subscription.EVENT_ENQUEUE_WAIT_TIME"; private static final int DEFAULT_EVENT_ENQUEUE_WAIT_TIME = 100; @@ -2068,7 +2068,7 @@ public class HARegionQueue implements RegionQueue { * logged. */ private static final String MAX_QUEUE_LOG_FREQUENCY = - DistributionConfig.GEMFIRE_PREFIX + "logFrequency.clientQueueReachedMaxLimit"; + DistributionConfig.GEMFIRE_PREFIX + "logFrequency.clientQueueReachedMaxLimit"; private static final long DEFAULT_LOG_FREQUENCY = 1000; @@ -2095,8 +2095,7 @@ public class HARegionQueue implements RegionQueue { private final Object permitMon = new Object(); /** - * Lock on which the take & remove threads block awaiting data from put - * operations + * Lock on which the take & remove threads block awaiting data from put operations */ private final StoppableReentrantLock lock; @@ -2107,9 +2106,9 @@ public class HARegionQueue implements RegionQueue { /** * System property value denoting the time in milliseconds. Any thread putting an event into a - * subscription queue, which is full, will wait this much time for the queue to make space. It'll - * then enqueue the event possibly causing the queue to grow beyond its capacity/max-size. See - * #51400. + * subscription queue, which is full, will wait this much time for the queue to make space. + * It'll then enqueue the event possibly causing the queue to grow beyond its capacity/max-size. + * See #51400. */ private final int enqueueEventWaitTime; @@ -2142,8 +2141,7 @@ public class HARegionQueue implements RegionQueue { } private static int calcEnqueueEventWaitTime() { - int value = - Integer.getInteger(EVENT_ENQUEUE_WAIT_TIME_NAME, DEFAULT_EVENT_ENQUEUE_WAIT_TIME); + int value = Integer.getInteger(EVENT_ENQUEUE_WAIT_TIME_NAME, DEFAULT_EVENT_ENQUEUE_WAIT_TIME); if (value < 0) { value = DEFAULT_EVENT_ENQUEUE_WAIT_TIME; } @@ -2209,7 +2207,7 @@ public class HARegionQueue implements RegionQueue { if ((this.maxQueueSizeHitCount % this.logFrequency) == 0) { logger.warn(LocalizedMessage.create( LocalizedStrings.HARegionQueue_CLIENT_QUEUE_FOR_0_IS_FULL, - new Object[] { this.region.getName() })); + new Object[] {this.region.getName()})); this.maxQueueSizeHitCount = 0; } ++this.maxQueueSizeHitCount; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java index f09c854..1fb8c8c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java @@ -87,7 +87,8 @@ public abstract class BaseCommand implements Command { private static final byte[] OK_BYTES = new byte[] {0}; - public static final int MAXIMUM_CHUNK_SIZE = Integer.getInteger("BridgeServer.MAXIMUM_CHUNK_SIZE", 100); + public static final int MAXIMUM_CHUNK_SIZE = + Integer.getInteger("BridgeServer.MAXIMUM_CHUNK_SIZE", 100); /** Whether to suppress logging of IOExceptions */ private static final boolean SUPPRESS_IO_EXCEPTION_LOGGING = @@ -99,14 +100,16 @@ public abstract class BaseCommand implements Command { * of them completes or fails. The bytes are computed based in the size sent in the incoming msg * header. */ - private static final int MAX_INCOMING_DATA = Integer.getInteger("BridgeServer.MAX_INCOMING_DATA", -1); + private static final int MAX_INCOMING_DATA = + Integer.getInteger("BridgeServer.MAX_INCOMING_DATA", -1); /** * Maximum number of concurrent incoming client messages that a bridge server will allow. Once a * server is working on this number additional incoming client messages will wait until one of * them completes or fails. */ - private static final int MAX_INCOMING_MESSAGES = Integer.getInteger("BridgeServer.MAX_INCOMING_MSGS", -1); + private static final int MAX_INCOMING_MESSAGES = + Integer.getInteger("BridgeServer.MAX_INCOMING_MSGS", -1); private static final Semaphore INCOMING_DATA_LIMITER; @@ -192,8 +195,10 @@ public abstract class BaseCommand implements Command { * * @return true if thread should masquerade as a transactional thread. */ - protected boolean shouldMasqueradeForTx(Message clientMessage, ServerConnection serverConnection) { - return serverConnection.getClientVersion().compareTo(Version.GFE_66) >= 0 && clientMessage.getTransactionId() > TXManagerImpl.NOTX; + protected boolean shouldMasqueradeForTx(Message clientMessage, + ServerConnection serverConnection) { + return serverConnection.getClientVersion().compareTo(Version.GFE_66) >= 0 + && clientMessage.getTransactionId() > TXManagerImpl.NOTX; } /** @@ -260,8 +265,8 @@ public abstract class BaseCommand implements Command { return tag; } - public abstract void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) - throws IOException, ClassNotFoundException, InterruptedException; + public abstract void cmdExecute(Message clientMessage, ServerConnection serverConnection, + long start) throws IOException, ClassNotFoundException, InterruptedException; protected void writeReply(Message origMsg, ServerConnection serverConnection) throws IOException { Message replyMsg = serverConnection.getReplyMessage(); @@ -292,7 +297,8 @@ public abstract class BaseCommand implements Command { } } - private static void handleEOFException(Message msg, ServerConnection serverConnection, Exception eof) { + private static void handleEOFException(Message msg, ServerConnection serverConnection, + Exception eof) { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); boolean potentialModification = serverConnection.getPotentialModification(); @@ -307,7 +313,8 @@ public abstract class BaseCommand implements Command { int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE; logger.warn(LocalizedMessage.create( LocalizedStrings.BaseCommand_0_EOFEXCEPTION_DURING_A_WRITE_OPERATION_ON_REGION__1_KEY_2_MESSAGEID_3, - new Object[] {serverConnection.getName(), serverConnection.getModRegion(), serverConnection.getModKey(), transId })); + new Object[] {serverConnection.getName(), serverConnection.getModRegion(), + serverConnection.getModKey(), transId})); } else { logger.debug("EOF exception", eof); logger.info(LocalizedMessage.create( @@ -332,7 +339,8 @@ public abstract class BaseCommand implements Command { serverConnection.setClientDisconnectedException(e); } - private static void handleIOException(Message msg, ServerConnection serverConnection, Exception e) { + private static void handleIOException(Message msg, ServerConnection serverConnection, + Exception e) { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); boolean potentialModification = serverConnection.getPotentialModification(); @@ -342,7 +350,8 @@ public abstract class BaseCommand implements Command { int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE; logger.warn(LocalizedMessage.create( LocalizedStrings.BaseCommand_0_UNEXPECTED_IOEXCEPTION_DURING_OPERATION_FOR_REGION_1_KEY_2_MESSID_3, - new Object[] {serverConnection.getName(), serverConnection.getModRegion(), serverConnection.getModKey(), transId }), + new Object[] {serverConnection.getName(), serverConnection.getModRegion(), + serverConnection.getModKey(), transId}), e); } else { logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_IOEXCEPTION, @@ -354,7 +363,8 @@ public abstract class BaseCommand implements Command { serverConnection.setClientDisconnectedException(e); } - private static void handleShutdownException(Message msg, ServerConnection serverConnection, Exception e) { + private static void handleShutdownException(Message msg, ServerConnection serverConnection, + Exception e) { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); boolean potentialModification = serverConnection.getPotentialModification(); @@ -363,11 +373,14 @@ public abstract class BaseCommand implements Command { int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE; logger.warn(LocalizedMessage.create( LocalizedStrings.BaseCommand_0_UNEXPECTED_SHUTDOWNEXCEPTION_DURING_OPERATION_ON_REGION_1_KEY_2_MESSAGEID_3, - new Object[] {serverConnection.getName(), serverConnection.getModRegion(), serverConnection.getModKey(), transId }), + new Object[] {serverConnection.getName(), serverConnection.getModRegion(), + serverConnection.getModKey(), transId}), e); } else { - logger.warn(LocalizedMessage.create( - LocalizedStrings.BaseCommand_0_UNEXPECTED_SHUTDOWNEXCEPTION, serverConnection.getName()), e); + logger.warn( + LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_SHUTDOWNEXCEPTION, + serverConnection.getName()), + e); } } serverConnection.setFlagProcessMessagesAsFalse(); @@ -399,12 +412,14 @@ public abstract class BaseCommand implements Command { if (!wroteExceptionResponse) { logger.warn(LocalizedMessage.create( LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION_DURING_OPERATION_ON_REGION_1_KEY_2_MESSAGEID_3, - new Object[] {serverConnection.getName(), serverConnection.getModRegion(), serverConnection.getModKey(), transId }), + new Object[] {serverConnection.getName(), serverConnection.getModRegion(), + serverConnection.getModKey(), transId}), e); } else { if (logger.isDebugEnabled()) { logger.debug("{}: Exception during operation on region: {} key: {} messageId: {}", - serverConnection.getName(), serverConnection.getModRegion(), serverConnection.getModKey(), transId, e); + serverConnection.getName(), serverConnection.getModRegion(), + serverConnection.getModKey(), transId, e); } } } else { @@ -426,7 +441,8 @@ public abstract class BaseCommand implements Command { } } - private static void handleThrowable(Message msg, ServerConnection serverConnection, Throwable th) { + private static void handleThrowable(Message msg, ServerConnection serverConnection, + Throwable th) { boolean requiresResponse = serverConnection.getTransientFlag(REQUIRES_RESPONSE); boolean responded = serverConnection.getTransientFlag(RESPONDED); boolean requiresChunkedResponse = serverConnection.getTransientFlag(REQUIRES_CHUNKED_RESPONSE); @@ -435,8 +451,10 @@ public abstract class BaseCommand implements Command { try { try { if (th instanceof Error) { - logger.fatal(LocalizedMessage.create( - LocalizedStrings.BaseCommand_0_UNEXPECTED_ERROR_ON_SERVER, serverConnection.getName()), th); + logger.fatal( + LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_ERROR_ON_SERVER, + serverConnection.getName()), + th); } if (requiresResponse && !responded) { if (requiresChunkedResponse) { @@ -452,7 +470,8 @@ public abstract class BaseCommand implements Command { int transId = msg != null ? msg.getTransactionId() : Integer.MIN_VALUE; logger.warn(LocalizedMessage.create( LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION_DURING_OPERATION_ON_REGION_1_KEY_2_MESSAGEID_3, - new Object[] {serverConnection.getName(), serverConnection.getModRegion(), serverConnection.getModKey(), transId }), + new Object[] {serverConnection.getName(), serverConnection.getModRegion(), + serverConnection.getModKey(), transId}), th); } else { logger.warn(LocalizedMessage.create(LocalizedStrings.BaseCommand_0_UNEXPECTED_EXCEPTION, @@ -471,15 +490,19 @@ public abstract class BaseCommand implements Command { } } - protected static void writeChunkedException(Message origMsg, Throwable e, ServerConnection serverConnection) throws IOException { - writeChunkedException(origMsg, e, serverConnection, serverConnection.getChunkedResponseMessage()); + protected static void writeChunkedException(Message origMsg, Throwable e, + ServerConnection serverConnection) throws IOException { + writeChunkedException(origMsg, e, serverConnection, + serverConnection.getChunkedResponseMessage()); } - protected static void writeChunkedException(Message origMsg, Throwable e, ServerConnection serverConnection, ChunkedMessage originalResponse) throws IOException { + protected static void writeChunkedException(Message origMsg, Throwable e, + ServerConnection serverConnection, ChunkedMessage originalResponse) throws IOException { writeChunkedException(origMsg, e, serverConnection, originalResponse, 2); } - private static void writeChunkedException(Message origMsg, Throwable exception, ServerConnection serverConnection, ChunkedMessage originalResponse, int numOfParts) + private static void writeChunkedException(Message origMsg, Throwable exception, + ServerConnection serverConnection, ChunkedMessage originalResponse, int numOfParts) throws IOException { Throwable e = getClientException(serverConnection, exception); ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); @@ -492,8 +515,8 @@ public abstract class BaseCommand implements Command { chunkedResponseMsg.addStringPart(getExceptionTrace(e)); } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk while reply in progress: {}", serverConnection.getName(), - e.getMessage(), e); + logger.debug("{}: Sending exception chunk while reply in progress: {}", + serverConnection.getName(), e.getMessage(), e); } } else { chunkedResponseMsg.setMessageType(MessageType.EXCEPTION); @@ -506,7 +529,8 @@ public abstract class BaseCommand implements Command { chunkedResponseMsg.addStringPart(getExceptionTrace(e)); } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(), e); + logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(), + e); } } chunkedResponseMsg.sendChunk(serverConnection); @@ -673,8 +697,8 @@ public abstract class BaseCommand implements Command { } } - static void writeQueryResponseChunk(Object queryResponseChunk, CollectionType collectionType, boolean lastChunk, ServerConnection serverConnection) - throws IOException { + static void writeQueryResponseChunk(Object queryResponseChunk, CollectionType collectionType, + boolean lastChunk, ServerConnection serverConnection) throws IOException { ChunkedMessage queryResponseMsg = serverConnection.getQueryResponseMessage(); queryResponseMsg.setNumberOfParts(2); queryResponseMsg.setLastChunk(lastChunk); @@ -683,7 +707,8 @@ public abstract class BaseCommand implements Command { queryResponseMsg.sendChunk(serverConnection); } - protected static void writeQueryResponseException(Message origMsg, Throwable exception, ServerConnection serverConnection) throws IOException { + protected static void writeQueryResponseException(Message origMsg, Throwable exception, + ServerConnection serverConnection) throws IOException { Throwable e = getClientException(serverConnection, exception); ChunkedMessage queryResponseMsg = serverConnection.getQueryResponseMessage(); ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); @@ -696,8 +721,8 @@ public abstract class BaseCommand implements Command { queryResponseMsg.addObjPart(e); queryResponseMsg.addStringPart(getExceptionTrace(e)); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk while reply in progress: {}", serverConnection.getName(), - e.getMessage(), e); + logger.debug("{}: Sending exception chunk while reply in progress: {}", + serverConnection.getName(), e.getMessage(), e); } queryResponseMsg.sendChunk(serverConnection); } else { @@ -710,7 +735,8 @@ public abstract class BaseCommand implements Command { chunkedResponseMsg.addObjPart(e); chunkedResponseMsg.addStringPart(getExceptionTrace(e)); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(), e); + logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(), + e); } chunkedResponseMsg.sendChunk(serverConnection); } @@ -721,7 +747,8 @@ public abstract class BaseCommand implements Command { // Send chunked response header identifying error message ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending error message header type: {} transaction: {}", serverConnection.getName(), messageType, origMsg.getTransactionId()); + logger.debug("{}: Sending error message header type: {} transaction: {}", + serverConnection.getName(), messageType, origMsg.getTransactionId()); } chunkedResponseMsg.setMessageType(messageType); chunkedResponseMsg.setTransactionId(origMsg.getTransactionId()); @@ -737,7 +764,8 @@ public abstract class BaseCommand implements Command { chunkedResponseMsg.sendChunk(serverConnection); } - protected static void writeFunctionResponseException(Message origMsg, int messageType, ServerConnection serverConnection, Throwable exception) throws IOException { + protected static void writeFunctionResponseException(Message origMsg, int messageType, + ServerConnection serverConnection, Throwable exception) throws IOException { Throwable e = getClientException(serverConnection, exception); ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage(); ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); @@ -748,8 +776,8 @@ public abstract class BaseCommand implements Command { functionResponseMsg.addObjPart(e); functionResponseMsg.addStringPart(getExceptionTrace(e)); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk while reply in progress: {}", serverConnection.getName(), - e.getMessage(), e); + logger.debug("{}: Sending exception chunk while reply in progress: {}", + serverConnection.getName(), e.getMessage(), e); } functionResponseMsg.sendChunk(serverConnection); } else { @@ -762,7 +790,8 @@ public abstract class BaseCommand implements Command { chunkedResponseMsg.addObjPart(e); chunkedResponseMsg.addStringPart(getExceptionTrace(e)); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(), e); + logger.debug("{}: Sending exception chunk: {}", serverConnection.getName(), e.getMessage(), + e); } chunkedResponseMsg.sendChunk(serverConnection); } @@ -955,14 +984,17 @@ public abstract class BaseCommand implements Command { /** * @param list is a List of entry keys */ - private static void sendRegisterInterestResponseChunk(Region region, Object riKey, List list, boolean lastChunk, ServerConnection servConn) throws IOException { + private static void sendRegisterInterestResponseChunk(Region region, Object riKey, List list, + boolean lastChunk, ServerConnection servConn) throws IOException { ChunkedMessage chunkedResponseMsg = servConn.getRegisterInterestResponseMessage(); chunkedResponseMsg.setNumberOfParts(1); chunkedResponseMsg.setLastChunk(lastChunk); chunkedResponseMsg.addObjPart(list, false); String regionName = region == null ? " null " : region.getFullPath(); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending{}register interest response chunk for region: {} for keys: {} chunk=<{}>", servConn.getName(), lastChunk ? " last " : " ", regionName, riKey, chunkedResponseMsg); + logger.debug( + "{}: Sending{}register interest response chunk for region: {} for keys: {} chunk=<{}>", + servConn.getName(), lastChunk ? " last " : " ", regionName, riKey, chunkedResponseMsg); } chunkedResponseMsg.sendChunk(servConn); @@ -977,7 +1009,7 @@ public abstract class BaseCommand implements Command { private static boolean sendTombstonesInRIResults(ServerConnection servConn, InterestResultPolicy policy) { return policy == InterestResultPolicy.KEYS_VALUES - && servConn.getClientVersion().compareTo(Version.GFE_80) >= 0; + && servConn.getClientVersion().compareTo(Version.GFE_80) >= 0; } /** @@ -998,7 +1030,8 @@ public abstract class BaseCommand implements Command { // Handle list of keys if (region != null) { for (Object entryKey : keyList) { - if (region.containsKey(entryKey) || sendTombstonesInRIResults(servConn, policy) && region.containsTombstone(entryKey)) { + if (region.containsKey(entryKey) + || sendTombstonesInRIResults(servConn, policy) && region.containsTombstone(entryKey)) { appendInterestResponseKey(region, keyList, entryKey, newKeyList, servConn); } @@ -1016,8 +1049,8 @@ public abstract class BaseCommand implements Command { justification = "Null value handled in sendNewRegisterInterestResponseChunk()") private static void handleKVSingleton(LocalRegion region, Object entryKey, boolean serializeValues, ServerConnection servConn) throws IOException { - VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true, region == null || region.getAttributes().getConcurrencyChecksEnabled(), - serializeValues); + VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true, + region == null || region.getAttributes().getConcurrencyChecksEnabled(), serializeValues); if (region != null) { if (region.containsKey(entryKey) || region.containsTombstone(entryKey)) { @@ -1083,8 +1116,8 @@ public abstract class BaseCommand implements Command { return; } - VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true, region == null || region.getAttributes().getConcurrencyChecksEnabled(), - serializeValues); + VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true, + region == null || region.getAttributes().getConcurrencyChecksEnabled(), serializeValues); if (region != null) { @@ -1190,7 +1223,7 @@ public abstract class BaseCommand implements Command { private static boolean isRemovalToken(final Object value) { return value == Token.REMOVED_PHASE1 || value == Token.REMOVED_PHASE2 - || value == Token.DESTROYED || value == Token.TOMBSTONE; + || value == Token.DESTROYED || value == Token.TOMBSTONE; } public static void appendNewRegisterInterestResponseChunkFromLocal(LocalRegion region, @@ -1207,7 +1240,8 @@ public abstract class BaseCommand implements Command { if (values.size() == MAXIMUM_CHUNK_SIZE) { // Send the chunk and clear the list // values.setKeys(null); // Now we need to send keys too. - sendNewRegisterInterestResponseChunk(region, riKeys != null ? riKeys : "ALL_KEYS", values, false, servConn); + sendNewRegisterInterestResponseChunk(region, riKeys != null ? riKeys : "ALL_KEYS", values, + false, servConn); values.clear(); } } // for @@ -1245,7 +1279,8 @@ public abstract class BaseCommand implements Command { } if (values.size() == MAXIMUM_CHUNK_SIZE) { // Send the chunk and clear the list - sendNewRegisterInterestResponseChunk(region, riKeys != null ? riKeys : "ALL_KEYS", values, false, servConn); + sendNewRegisterInterestResponseChunk(region, riKeys != null ? riKeys : "ALL_KEYS", values, + false, servConn); values.clear(); } } // for @@ -1259,9 +1294,9 @@ public abstract class BaseCommand implements Command { chunkedResponseMsg.addObjPart(list, false); String regionName = region == null ? " null " : region.getFullPath(); if (logger.isDebugEnabled()) { - logger.debug("{}: Sending{}register interest response chunk for region: {} for keys: {} chunk=<{}>", - servConn.getName(), lastChunk ? " last " : " ", regionName, riKey, chunkedResponseMsg - ); + logger.debug( + "{}: Sending{}register interest response chunk for region: {} for keys: {} chunk=<{}>", + servConn.getName(), lastChunk ? " last " : " ", regionName, riKey, chunkedResponseMsg); } chunkedResponseMsg.sendChunk(servConn); } @@ -1341,8 +1376,8 @@ public abstract class BaseCommand implements Command { handleKVKeysPR((PartitionedRegion) region, keyList, serializeValues, servConn); return; } - VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true, region == null || region.getAttributes().getConcurrencyChecksEnabled(), - serializeValues); + VersionedObjectList values = new VersionedObjectList(MAXIMUM_CHUNK_SIZE, true, + region == null || region.getAttributes().getConcurrencyChecksEnabled(), serializeValues); // Handle list of keys if (region != null) { @@ -1384,7 +1419,8 @@ public abstract class BaseCommand implements Command { * @param entryKey key we're responding to * @param list list to append to */ - private static void appendInterestResponseKey(LocalRegion region, Object riKey, Object entryKey, List list, ServerConnection servConn) throws IOException { + private static void appendInterestResponseKey(LocalRegion region, Object riKey, Object entryKey, + List list, ServerConnection servConn) throws IOException { list.add(entryKey); if (logger.isDebugEnabled()) { logger.debug("{}: appendInterestResponseKey <{}>; list size was {}; region: {}", @@ -1397,8 +1433,8 @@ public abstract class BaseCommand implements Command { } } - private static void appendInterestResponseKeys(LocalRegion region, Object riKey, Collection entryKeys, List collector, ServerConnection servConn) - throws IOException { + private static void appendInterestResponseKeys(LocalRegion region, Object riKey, + Collection entryKeys, List collector, ServerConnection servConn) throws IOException { for (final Object entryKey : entryKeys) { appendInterestResponseKey(region, riKey, entryKey, collector, servConn); } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java index 5631184..4c19df2 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java @@ -125,16 +125,16 @@ public class CacheClientNotifier { * BridgeServer.SOCKET_BUFFER_SIZE system property. */ private static final int socketBufferSize = - Integer.getInteger("BridgeServer.SOCKET_BUFFER_SIZE", 32768); + Integer.getInteger("BridgeServer.SOCKET_BUFFER_SIZE", 32768); private static final long CLIENT_PING_TASK_PERIOD = - Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "serverToClientPingPeriod", 60000); + Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "serverToClientPingPeriod", 60000); /** * package-private to avoid synthetic accessor */ static final long CLIENT_PING_TASK_COUNTER = - Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "serverToClientPingCounter", 3); + Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "serverToClientPingCounter", 3); private static volatile CacheClientNotifier ccnSingleton; @@ -189,7 +189,7 @@ public class CacheClientNotifier { * provide a read-only {@code Set} of listeners. */ private final Set readableInterestRegistrationListeners = - Collections.unmodifiableSet(this.writableInterestRegistrationListeners); + Collections.unmodifiableSet(this.writableInterestRegistrationListeners); private final Map<String, DefaultQuery> compiledQueries = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java index 5860982..7118347 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage.java @@ -1,18 +1,16 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. */ package org.apache.geode.internal.cache.tier.sockets; @@ -31,7 +29,8 @@ import org.apache.geode.distributed.internal.ReplyProcessor21; import org.apache.geode.internal.InternalDataSerializer; /** - * Send interest registration to another server. Since interest registration performs a state-flush operation this message must not transmitted on an ordered socket. + * Send interest registration to another server. Since interest registration performs a state-flush + * operation this message must not transmitted on an ordered socket. * <p> * Extracted from CacheClientNotifier */ @@ -42,7 +41,8 @@ public class ServerInterestRegistrationMessage extends HighPriorityDistributionM private ClientInterestMessageImpl clientMessage; private int processorId; - ServerInterestRegistrationMessage(ClientProxyMembershipID clientId, ClientInterestMessageImpl clientInterestMessage) { + ServerInterestRegistrationMessage(ClientProxyMembershipID clientId, + ClientInterestMessageImpl clientInterestMessage) { this.clientId = clientId; this.clientMessage = clientInterestMessage; } @@ -51,7 +51,8 @@ public class ServerInterestRegistrationMessage extends HighPriorityDistributionM // deserializing in fromData } - static void sendInterestChange(DM dm, ClientProxyMembershipID clientId, ClientInterestMessageImpl clientInterestMessage) { + static void sendInterestChange(DM dm, ClientProxyMembershipID clientId, + ClientInterestMessageImpl clientInterestMessage) { ServerInterestRegistrationMessage registrationMessage = new ServerInterestRegistrationMessage(clientId, clientInterestMessage); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java index fb0bd50..2cb36cd 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java @@ -44,7 +44,8 @@ public class AddPdxEnum extends BaseCommand { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { logger.debug("{}: Received get pdx id for enum request ({} parts) from {}", - serverConnection.getName(), clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int noOfParts = clientMessage.getNumberOfParts(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java index 10a065c..3feba0d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java @@ -44,7 +44,8 @@ public class AddPdxType extends BaseCommand { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { logger.debug("{}: Received get pdx id for type request ({} parts) from {}", - serverConnection.getName(), clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int noOfParts = clientMessage.getNumberOfParts(); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java index c9c5a9d..ab19954 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java @@ -78,8 +78,9 @@ public class ClearRegion extends BaseCommand { } regionName = regionNamePart.getString(); if (logger.isDebugEnabled()) { - logger.debug(serverConnection.getName() + ": Received clear region request (" + clientMessage.getPayloadLength() - + " bytes) from " + serverConnection.getSocketString() + " for region " + regionName); + logger.debug(serverConnection.getName() + ": Received clear region request (" + + clientMessage.getPayloadLength() + " bytes) from " + serverConnection.getSocketString() + + " for region " + regionName); } // Process the clear region request @@ -91,7 +92,8 @@ public class ClearRegion extends BaseCommand { LocalizedStrings.ClearRegion_THE_INPUT_REGION_NAME_FOR_THE_CLEAR_REGION_REQUEST_IS_NULL .toLocalizedString(); - writeErrorResponse(clientMessage, MessageType.CLEAR_REGION_DATA_ERROR, errMessage, serverConnection); + writeErrorResponse(clientMessage, MessageType.CLEAR_REGION_DATA_ERROR, errMessage, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -108,7 +110,8 @@ public class ClearRegion extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); try { // Clear the region @@ -141,7 +144,8 @@ public class ClearRegion extends BaseCommand { writeReply(clientMessage, serverConnection); serverConnection.setAsTrue(RESPONDED); if (logger.isDebugEnabled()) { - logger.debug(serverConnection.getName() + ": Sent clear region response for region " + regionName); + logger.debug( + serverConnection.getName() + ": Sent clear region response for region " + regionName); } stats.incWriteClearRegionResponseTime(DistributionStats.getStatTime() - start); } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java index 053ef8a..cf9c470 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java @@ -35,7 +35,8 @@ public class ClientReady extends BaseCommand { private ClientReady() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CacheServerStats stats = serverConnection.getCacheServerStats(); { long oldStart = start; @@ -47,11 +48,12 @@ public class ClientReady extends BaseCommand { int clientPort = serverConnection.getSocketPort(); if (logger.isDebugEnabled()) { logger.debug("{}: Received client ready request ({} bytes) from {} on {}:{}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getProxyID(), clientHost, - clientPort); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getProxyID(), clientHost, clientPort); } - serverConnection.getAcceptor().getCacheClientNotifier().readyForEvents(serverConnection.getProxyID()); + serverConnection.getAcceptor().getCacheClientNotifier() + .readyForEvents(serverConnection.getProxyID()); long oldStart = start; start = DistributionStats.getStatTime(); @@ -62,7 +64,7 @@ public class ClientReady extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug(serverConnection.getName() + ": Processed client ready request from " - + serverConnection.getProxyID() + " on " + clientHost + ":" + clientPort); + + serverConnection.getProxyID() + " on " + clientHost + ":" + clientPort); } } finally { stats.incWriteClientReadyResponseTime(DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java index 378a322..21f0cad 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java @@ -39,7 +39,8 @@ public class CloseConnection extends BaseCommand { private CloseConnection() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CacheServerStats stats = serverConnection.getCacheServerStats(); long oldStart = start; boolean respondToClient = serverConnection.getClientVersion().compareTo(Version.GFE_90) >= 0; @@ -64,12 +65,12 @@ public class CloseConnection extends BaseCommand { byte[] keepaliveByte = keepalivePart.getSerializedForm(); boolean keepalive = (keepaliveByte == null || keepaliveByte[0] == 0) ? false : true; - serverConnection.getAcceptor().getCacheClientNotifier().setKeepAlive(serverConnection.getProxyID(), - keepalive); + serverConnection.getAcceptor().getCacheClientNotifier() + .setKeepAlive(serverConnection.getProxyID(), keepalive); if (logger.isDebugEnabled()) { - logger.debug("{}: Processed close request from {}:{}, keepAlive: {}", serverConnection.getName(), - clientHost, clientPort, keepalive); + logger.debug("{}: Processed close request from {}:{}, keepAlive: {}", + serverConnection.getName(), clientHost, clientPort, keepalive); } } finally { if (respondToClient) { http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java index b2bba4f..366d77c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java @@ -50,7 +50,8 @@ public class CommitCommand extends BaseCommand { private CommitCommand() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { serverConnection.setAsTrue(REQUIRES_RESPONSE); TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager(); InternalDistributedMember client = http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java index 50d1197..9cb2528 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey.java @@ -51,7 +51,8 @@ public class ContainsKey extends BaseCommand { } @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null; Part keyPart = null; String regionName = null; @@ -78,7 +79,8 @@ public class ContainsKey extends BaseCommand { } if (logger.isDebugEnabled()) { logger.debug("{}: Received containsKey request ({} bytes) from {} for region {} key {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key); } // Process the containsKey request @@ -99,7 +101,8 @@ public class ContainsKey extends BaseCommand { LocalizedStrings.ContainsKey_THE_INPUT_REGION_NAME_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL .toLocalizedString(); } - writeErrorResponse(clientMessage, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage, serverConnection); + writeErrorResponse(clientMessage, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java index 53bb414..b2ce055 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66.java @@ -55,7 +55,8 @@ public class ContainsKey66 extends BaseCommand { } @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null, keyPart = null; String regionName = null; Object key = null; @@ -82,7 +83,8 @@ public class ContainsKey66 extends BaseCommand { } if (logger.isDebugEnabled()) { logger.debug("{}: Received containsKey request ({} bytes) from {} for region {} key {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key); } // Process the containsKey request @@ -103,7 +105,8 @@ public class ContainsKey66 extends BaseCommand { LocalizedStrings.ContainsKey_THE_INPUT_REGION_NAME_FOR_THE_CONTAINSKEY_REQUEST_IS_NULL .toLocalizedString(); } - writeErrorResponse(clientMessage, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage, serverConnection); + writeErrorResponse(clientMessage, MessageType.CONTAINS_KEY_DATA_ERROR, errMessage, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java index b7ab01b..0dec596 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java @@ -41,7 +41,8 @@ public class CreateRegion extends BaseCommand { } @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null; String regionName = null; serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -59,8 +60,8 @@ public class CreateRegion extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received create region request ({} bytes) from {} for parent region {} region {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), parentRegionName, - regionName); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), parentRegionName, regionName); } // Process the create region request @@ -82,7 +83,8 @@ public class CreateRegion extends BaseCommand { LocalizedStrings.CreateRegion_THE_INPUT_REGION_NAME_FOR_THE_CREATE_REGION_REQUEST_IS_NULL .toLocalizedString(); } - writeErrorResponse(clientMessage, MessageType.CREATE_REGION_DATA_ERROR, errMessage, serverConnection); + writeErrorResponse(clientMessage, MessageType.CREATE_REGION_DATA_ERROR, errMessage, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java index 359e1b4..3daaec5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java @@ -37,14 +37,16 @@ public class Default extends BaseCommand { private Default() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { // requiresResponse = true; NOT NEEDED... ALWAYS SEND ERROR RESPONSE logger.fatal( LocalizedMessage.create(LocalizedStrings.Default_0_UNKNOWN_MESSAGE_TYPE_1_WITH_TX_2_FROM_3, - new Object[] { - serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()), - Integer.valueOf(clientMessage.getTransactionId()), serverConnection.getSocketString()})); + new Object[] {serverConnection.getName(), + MessageType.getString(clientMessage.getMessageType()), + Integer.valueOf(clientMessage.getTransactionId()), + serverConnection.getSocketString()})); writeErrorResponse(clientMessage, MessageType.UNKNOWN_MESSAGE_TYPE_ERROR, serverConnection); // responded = true; NOT NEEDED... ALWAYS SEND ERROR RESPONSE } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java index 0699c8b..83ab394 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java @@ -90,7 +90,8 @@ public class Destroy extends BaseCommand { } if (logger.isDebugEnabled()) { logger.debug("{}: Received destroy request ({} bytes) from {} for region {} key {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key); } // Process the destroy request @@ -110,7 +111,8 @@ public class Destroy extends BaseCommand { .append(LocalizedStrings.Destroy__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REQUEST_IS_NULL .toLocalizedString()); } - writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -128,7 +130,8 @@ public class Destroy extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); try { // for integrated security @@ -154,7 +157,7 @@ public class Destroy extends BaseCommand { // exception happens. Just log it and continue. logger.info(LocalizedMessage.create( LocalizedStrings.Destroy_0_DURING_ENTRY_DESTROY_NO_ENTRY_WAS_FOUND_FOR_KEY_1, - new Object[] { serverConnection.getName(), key})); + new Object[] {serverConnection.getName(), key})); } catch (RegionDestroyedException rde) { writeException(clientMessage, rde, false, serverConnection); serverConnection.setAsTrue(RESPONDED); @@ -198,8 +201,8 @@ public class Destroy extends BaseCommand { } serverConnection.setAsTrue(RESPONDED); if (logger.isDebugEnabled()) { - logger.debug("{}: Sent destroy response for region {} key {}", serverConnection.getName(), regionName, - key); + logger.debug("{}: Sent destroy response for region {} key {}", serverConnection.getName(), + regionName, key); } stats.incWriteDestroyResponseTime(DistributionStats.getStatTime() - start); } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java index 0ee0fc4..3aebbb5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java @@ -158,8 +158,9 @@ public class Destroy65 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received destroy65 request ({} bytes; op={}) from {} for region {} key {}{} txId {}", - serverConnection.getName(), clientMessage.getPayloadLength(), operation, serverConnection.getSocketString(), - regionName, key, (operation == Operation.REMOVE ? " value=" + expectedOldValue : ""), + serverConnection.getName(), clientMessage.getPayloadLength(), operation, + serverConnection.getSocketString(), regionName, key, + (operation == Operation.REMOVE ? " value=" + expectedOldValue : ""), clientMessage.getTransactionId()); } boolean entryNotFoundForRemove = false; @@ -181,7 +182,8 @@ public class Destroy65 extends BaseCommand { .append(LocalizedStrings.Destroy__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REQUEST_IS_NULL .toLocalizedString()); } - writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.DESTROY_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -199,7 +201,8 @@ public class Destroy65 extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); EventIDHolder clientEvent = new EventIDHolder(eventId); Breadcrumbs.setEventId(eventId); @@ -236,7 +239,8 @@ public class Destroy65 extends BaseCommand { } } if (operation == null || operation == Operation.DESTROY) { - region.basicBridgeDestroy(key, callbackArg, serverConnection.getProxyID(), true, clientEvent); + region.basicBridgeDestroy(key, callbackArg, serverConnection.getProxyID(), true, + clientEvent); } else { // this throws exceptions if expectedOldValue checks fail try { @@ -254,15 +258,15 @@ public class Destroy65 extends BaseCommand { } // try the operation anyway to ensure that it's been distributed to all servers try { - region.basicBridgeRemove(key, expectedOldValue, callbackArg, serverConnection.getProxyID(), - true, clientEvent); + region.basicBridgeRemove(key, expectedOldValue, callbackArg, + serverConnection.getProxyID(), true, clientEvent); } catch (EntryNotFoundException e) { // ignore, and don't set entryNotFoundForRemove because this was a successful // operation - bug #51664 } } else { - region.basicBridgeRemove(key, expectedOldValue, callbackArg, serverConnection.getProxyID(), - true, clientEvent); + region.basicBridgeRemove(key, expectedOldValue, callbackArg, + serverConnection.getProxyID(), true, clientEvent); if (logger.isDebugEnabled()) { logger.debug("region.remove succeeded"); } @@ -281,7 +285,7 @@ public class Destroy65 extends BaseCommand { // exception happens. Just log it and continue. logger.info(LocalizedMessage.create( LocalizedStrings.Destroy_0_DURING_ENTRY_DESTROY_NO_ENTRY_WAS_FOUND_FOR_KEY_1, - new Object[] { serverConnection.getName(), key})); + new Object[] {serverConnection.getName(), key})); entryNotFoundForRemove = true; } catch (RegionDestroyedException rde) { writeException(clientMessage, rde, false, serverConnection); @@ -318,17 +322,19 @@ public class Destroy65 extends BaseCommand { pr.getNetworkHopType(), clientEvent.getVersionTag()); pr.clearNetworkHopData(); } else { - writeReply(clientMessage, serverConnection, entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(), + writeReply(clientMessage, serverConnection, + entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(), clientEvent.getVersionTag()); } } else { - writeReply(clientMessage, serverConnection, entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(), + writeReply(clientMessage, serverConnection, + entryNotFoundForRemove | clientEvent.getIsRedestroyedEntry(), clientEvent.getVersionTag()); } serverConnection.setAsTrue(RESPONDED); if (logger.isDebugEnabled()) { - logger.debug("{}: Sent destroy response for region {} key {}", serverConnection.getName(), regionName, - key); + logger.debug("{}: Sent destroy response for region {} key {}", serverConnection.getName(), + regionName, key); } stats.incWriteDestroyResponseTime(DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java index de37040..886994e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegion.java @@ -89,7 +89,8 @@ public class DestroyRegion extends BaseCommand { regionName = regionNamePart.getString(); if (logger.isDebugEnabled()) { logger.debug("{}: Received destroy region request ({} bytes) from {} for region {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName); } // Process the destroy region request @@ -101,7 +102,8 @@ public class DestroyRegion extends BaseCommand { LocalizedStrings.DestroyRegion__THE_INPUT_REGION_NAME_FOR_THE_DESTROY_REGION_REQUEST_IS_NULL .toLocalizedString()); - writeErrorResponse(clientMessage, MessageType.DESTROY_REGION_DATA_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.DESTROY_REGION_DATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -120,7 +122,8 @@ public class DestroyRegion extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); try { // user needs to have data:manage on all regions in order to destory a particular region @@ -138,7 +141,7 @@ public class DestroyRegion extends BaseCommand { } catch (DistributedSystemDisconnectedException e) { // FIXME better exception hierarchy would avoid this check if (serverConnection.getCachedRegionHelper().getCache().getCancelCriterion() - .cancelInProgress() != null) { + .cancelInProgress() != null) { if (logger.isDebugEnabled()) { logger.debug( "{} ignoring message of type {} from client {} because shutdown occurred during message processing.", http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java index 1d0fc8c..c146d27 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java @@ -64,7 +64,8 @@ public class ExecuteFunction extends BaseCommand { } @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { Object function = null; Object args = null; MemberMappedArgument memberMappedArg = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java index 4a0a993..23d5b18 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java @@ -63,7 +63,8 @@ public class ExecuteFunction65 extends BaseCommand { ExecuteFunction65() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { Object function = null; Object args = null; MemberMappedArgument memberMappedArg = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java index f4aac7a..46302bc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java @@ -87,7 +87,8 @@ public class ExecuteFunction66 extends BaseCommand { ExecuteFunction66() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { Object function = null; Object args = null; MemberMappedArgument memberMappedArg = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java index bf5f70b..09fe20e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java @@ -51,7 +51,8 @@ public class ExecuteFunction70 extends ExecuteFunction66 { private ExecuteFunction70() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { super.cmdExecute(clientMessage, serverConnection, start); } http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java index 3147fe5..82a378d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction.java @@ -63,7 +63,8 @@ public class ExecuteRegionFunction extends BaseCommand { private ExecuteRegionFunction() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java index 73ab621..12919d0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java @@ -63,7 +63,8 @@ public class ExecuteRegionFunction61 extends BaseCommand { private ExecuteRegionFunction61() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java index f1540f9..3be907b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java @@ -60,7 +60,8 @@ public class ExecuteRegionFunction65 extends BaseCommand { private ExecuteRegionFunction65() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java index 25d69d6..674082c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java @@ -64,7 +64,8 @@ public class ExecuteRegionFunction66 extends BaseCommand { private ExecuteRegionFunction66() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; http://git-wip-us.apache.org/repos/asf/geode/blob/006b135b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java index 725f03b..cf96137 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java @@ -62,7 +62,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { private ExecuteRegionFunctionSingleHop() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null;
