http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/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 cf59ad5..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 @@ -49,7 +49,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; /** * @since GemFire 6.6 @@ -65,8 +64,8 @@ public class ExecuteRegionFunction66 extends BaseCommand { private ExecuteRegionFunction66() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; Object args = null; @@ -78,14 +77,14 @@ public class ExecuteRegionFunction66 extends BaseCommand { int removedNodesSize = 0; Set<Object> removedNodesSet = null; int filterSize = 0, partNumber = 0; - CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); + CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); byte functionState = 0; int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT; try { byte[] bytes = clientMessage.getPart(0).getSerializedForm(); functionState = bytes[0]; if (bytes.length >= 5 - && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { + && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { functionTimeout = Part.decodeInt(bytes, 1); } if (functionState != 1) { @@ -94,8 +93,8 @@ public class ExecuteRegionFunction66 extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -108,7 +107,7 @@ public class ExecuteRegionFunction66 extends BaseCommand { } } byte[] flags = clientMessage.getPart(5).getSerializedForm(); - if (serverConnection.getClientVersion().ordinal() > Version.GFE_81.ordinal()) { + if (servConn.getClientVersion().ordinal() > Version.GFE_81.ordinal()) { isBucketsAsFilter = (flags[0] & ExecuteFunctionHelper.BUCKETS_AS_FILTER_MASK) != 0; isReExecute = (flags[0] & ExecuteFunctionHelper.IS_REXECUTE_MASK) != 0 ? (byte) 1 : 0; } else { @@ -141,11 +140,11 @@ public class ExecuteRegionFunction66 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); + writeChunkedException(clientMessage, exception, servConn); } else { - writeException(clientMessage, exception, false, serverConnection); + writeException(clientMessage, exception, false, servConn); } - serverConnection.setAsTrue(RESPONDED); + servConn.setAsTrue(RESPONDED); return; } if (function == null || regionName == null) { @@ -160,8 +159,8 @@ public class ExecuteRegionFunction66 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("region"); } - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -170,11 +169,11 @@ public class ExecuteRegionFunction66 extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST .toLocalizedString(regionName); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(functionTimeout); ServerToClientFunctionResultSender resultSender = null; @@ -186,8 +185,8 @@ public class ExecuteRegionFunction66 extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } else { byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -200,8 +199,8 @@ public class ExecuteRegionFunction66 extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } @@ -209,10 +208,10 @@ public class ExecuteRegionFunction66 extends BaseCommand { functionObject = (Function) function; } - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -223,11 +222,10 @@ public class ExecuteRegionFunction66 extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); - resultSender = - new ServerToClientFunctionResultSender65(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT, - serverConnection, functionObject, executeContext); + resultSender = new ServerToClientFunctionResultSender65(m, + MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); if (execution instanceof PartitionedRegionFunctionExecutor) { if ((hasResult == 1) && filter != null && filter.size() == 1) { @@ -245,8 +243,7 @@ public class ExecuteRegionFunction66 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "Executing Function: {} on Server: {} with Execution: {} functionState={} reExecute={} hasResult={}", - functionObject.getId(), serverConnection, execution, functionState, isReExecute, - hasResult); + functionObject.getId(), servConn, execution, functionState, isReExecute, hasResult); } if (hasResult == 1) { if (function instanceof String) { @@ -280,7 +277,7 @@ public class ExecuteRegionFunction66 extends BaseCommand { } else { execution.execute(functionObject); } - writeReply(clientMessage, serverConnection); + writeReply(clientMessage, servConn); } } catch (IOException ioe) { logger.warn(LocalizedMessage.create( @@ -288,7 +285,7 @@ public class ExecuteRegionFunction66 extends BaseCommand { function), ioe); final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioe); + sendException(hasResult, clientMessage, message, servConn, ioe); } catch (FunctionException fe) { String message = fe.getMessage(); Object cause = fe.getCause(); @@ -325,7 +322,7 @@ public class ExecuteRegionFunction66 extends BaseCommand { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), fe); - sendException(hasResult, clientMessage, message, serverConnection, fe); + sendException(hasResult, clientMessage, message, servConn, fe); } } catch (Exception e) { @@ -333,43 +330,42 @@ public class ExecuteRegionFunction66 extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } finally { handShake.setClientReadTimeout(earlierClientReadTimeout); ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0); } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { synchronized (msg) { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e); + writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e); } else { - writeException(msg, e, false, serverConnection); + writeException(msg, e, false, servConn); } - serverConnection.setAsTrue(RESPONDED); + servConn.setAsTrue(RESPONDED); } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { synchronized (msg) { if (hasResult == 1) { writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - serverConnection); + servConn); } else { - writeErrorResponse(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - serverConnection); + writeErrorResponse(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, servConn); } - serverConnection.setAsTrue(RESPONDED); + servConn.setAsTrue(RESPONDED); } } protected static void writeFunctionResponseException(Message origMsg, int messageType, - String message, ServerConnection serverConnection, Throwable e) throws IOException { - ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage(); - ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); + String message, ServerConnection servConn, Throwable e) throws IOException { + ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage(); + ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage(); int numParts = 0; if (functionResponseMsg.headerHasBeenSent()) { if (e instanceof FunctionException @@ -388,13 +384,13 @@ public class ExecuteRegionFunction66 extends BaseCommand { numParts = 2; } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk while reply in progress: ", - serverConnection.getName(), e); + logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(), + e); } - functionResponseMsg.setServerConnection(serverConnection); + functionResponseMsg.setServerConnection(servConn); functionResponseMsg.setLastChunkAndNumParts(true, numParts); // functionResponseMsg.setLastChunk(true); - functionResponseMsg.sendChunk(serverConnection); + functionResponseMsg.sendChunk(servConn); } else { chunkedResponseMsg.setMessageType(messageType); chunkedResponseMsg.setTransactionId(origMsg.getTransactionId()); @@ -415,11 +411,11 @@ public class ExecuteRegionFunction66 extends BaseCommand { numParts = 2; } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e); + logger.debug("{}: Sending exception chunk: ", servConn.getName(), e); } - chunkedResponseMsg.setServerConnection(serverConnection); + chunkedResponseMsg.setServerConnection(servConn); chunkedResponseMsg.setLastChunkAndNumParts(true, numParts); - chunkedResponseMsg.sendChunk(serverConnection); + chunkedResponseMsg.sendChunk(servConn); } } }
http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/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 a0594ad..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 @@ -46,7 +46,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; /** * @since GemFire 6.5 @@ -63,8 +62,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { private ExecuteRegionFunctionSingleHop() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection servConn, long start) + throws IOException { String regionName = null; Object function = null; @@ -78,13 +77,13 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { int removedNodesSize = 0; Set<Object> removedNodesSet = null; int filterSize = 0, bucketIdsSize = 0, partNumber = 0; - CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); + CachedRegionHelper crHelper = servConn.getCachedRegionHelper(); int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT; try { byte[] bytes = clientMessage.getPart(0).getSerializedForm(); functionState = bytes[0]; if (bytes.length >= 5 - && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { + && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) { functionTimeout = Part.decodeInt(bytes, 1); } if (functionState != 1) { @@ -93,8 +92,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { hasResult = functionState; } if (hasResult == 1) { - serverConnection.setAsTrue(REQUIRES_RESPONSE); - serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); + servConn.setAsTrue(REQUIRES_RESPONSE); + servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE); } regionName = clientMessage.getPart(1).getString(); function = clientMessage.getPart(2).getStringOrObject(); @@ -147,8 +146,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), exception); if (hasResult == 1) { - writeChunkedException(clientMessage, exception, serverConnection); - serverConnection.setAsTrue(RESPONDED); + writeChunkedException(clientMessage, exception, servConn); + servConn.setAsTrue(RESPONDED); return; } } @@ -164,8 +163,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("region"); } - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } @@ -174,11 +173,11 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_REGION_NAMED_0_WAS_NOT_FOUND_DURING_EXECUTE_FUNCTION_REQUEST .toLocalizedString(regionName); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } - HandShake handShake = (HandShake) serverConnection.getHandshake(); + HandShake handShake = (HandShake) servConn.getHandshake(); int earlierClientReadTimeout = handShake.getClientReadTimeout(); handShake.setClientReadTimeout(functionTimeout); ServerToClientFunctionResultSender resultSender = null; @@ -190,8 +189,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { String message = LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } else { byte functionStateOnServer = AbstractExecution.getFunctionState(functionObject.isHA(), @@ -200,8 +199,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { String message = LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER .toLocalizedString(function); - logger.warn("{}: {}", serverConnection.getName(), message); - sendError(hasResult, clientMessage, message, serverConnection); + logger.warn("{}: {}", servConn.getName(), message); + sendError(hasResult, clientMessage, message, servConn); return; } } @@ -209,10 +208,10 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { functionObject = (Function) function; } - securityService.authorizeDataWrite(); + this.securityService.authorizeDataWrite(); // check if the caller is authorized to do this operation on server - AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); + AuthorizeRequest authzRequest = servConn.getAuthzRequest(); final String functionName = functionObject.getId(); final String regionPath = region.getFullPath(); ExecuteFunctionOperationContext executeContext = null; @@ -223,11 +222,10 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { // Construct execution AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region); - ChunkedMessage m = serverConnection.getFunctionResponseMessage(); + ChunkedMessage m = servConn.getFunctionResponseMessage(); m.setTransactionId(clientMessage.getTransactionId()); - resultSender = - new ServerToClientFunctionResultSender65(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT, - serverConnection, functionObject, executeContext); + resultSender = new ServerToClientFunctionResultSender65(m, + MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext); if (isExecuteOnAllBuckets == 1) { PartitionedRegion pr = (PartitionedRegion) region; @@ -252,7 +250,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("Executing Function: {} on Server: {} with Execution: {}", - functionObject.getId(), serverConnection, execution); + functionObject.getId(), servConn, execution); } if (hasResult == 1) { if (function instanceof String) { @@ -293,7 +291,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { function), ioe); final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY .toLocalizedString(); - sendException(hasResult, clientMessage, message, serverConnection, ioe); + sendException(hasResult, clientMessage, message, servConn, ioe); } catch (FunctionException fe) { String message = fe.getMessage(); @@ -311,45 +309,45 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), fe); - sendException(hasResult, clientMessage, message, serverConnection, fe); + sendException(hasResult, clientMessage, message, servConn, fe); } } catch (Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, function), e); String message = e.getMessage(); - sendException(hasResult, clientMessage, message, serverConnection, e); + sendException(hasResult, clientMessage, message, servConn, e); } finally { handShake.setClientReadTimeout(earlierClientReadTimeout); ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0); } } - private void sendException(byte hasResult, Message msg, String message, - ServerConnection serverConnection, Throwable e) throws IOException { + private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn, + Throwable e) throws IOException { synchronized (msg) { if (hasResult == 1) { - writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e); - serverConnection.setAsTrue(RESPONDED); + writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e); + servConn.setAsTrue(RESPONDED); } } } - private void sendError(byte hasResult, Message msg, String message, - ServerConnection serverConnection) throws IOException { + private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn) + throws IOException { synchronized (msg) { if (hasResult == 1) { writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, - serverConnection); - serverConnection.setAsTrue(RESPONDED); + servConn); + servConn.setAsTrue(RESPONDED); } } } protected static void writeFunctionResponseException(Message origMsg, int messageType, - String message, ServerConnection serverConnection, Throwable e) throws IOException { - ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage(); - ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage(); + String message, ServerConnection servConn, Throwable e) throws IOException { + ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage(); + ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage(); int numParts = 0; if (functionResponseMsg.headerHasBeenSent()) { if (e instanceof FunctionException @@ -368,12 +366,12 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { numParts = 2; } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk while reply in progress: ", - serverConnection.getName(), e); + logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(), + e); } - functionResponseMsg.setServerConnection(serverConnection); + functionResponseMsg.setServerConnection(servConn); functionResponseMsg.setLastChunkAndNumParts(true, numParts); - functionResponseMsg.sendChunk(serverConnection); + functionResponseMsg.sendChunk(servConn); } else { chunkedResponseMsg.setMessageType(messageType); chunkedResponseMsg.setTransactionId(origMsg.getTransactionId()); @@ -394,11 +392,11 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand { numParts = 2; } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e); + logger.debug("{}: Sending exception chunk: ", servConn.getName(), e); } - chunkedResponseMsg.setServerConnection(serverConnection); + chunkedResponseMsg.setServerConnection(servConn); chunkedResponseMsg.setLastChunkAndNumParts(true, numParts); - chunkedResponseMsg.sendChunk(serverConnection); + chunkedResponseMsg.sendChunk(servConn); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java index 12e494a..d489b88 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java @@ -33,6 +33,7 @@ import org.apache.geode.internal.Version; import org.apache.geode.internal.cache.EntryEventImpl; import org.apache.geode.internal.cache.EventID; import org.apache.geode.internal.cache.EventIDHolder; +import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.LocalRegion; import org.apache.geode.internal.cache.tier.CachedRegionHelper; @@ -48,7 +49,6 @@ import org.apache.geode.internal.cache.wan.GatewayReceiverStats; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.internal.util.BlobHelper; import org.apache.geode.pdx.PdxConfigurationException; import org.apache.geode.pdx.PdxRegistryMismatchException; @@ -79,8 +79,8 @@ public class GatewayReceiverCommand extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null, key = null; http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java index 62644eb..2ca8804 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Get70.java @@ -43,7 +43,6 @@ import org.apache.geode.internal.offheap.annotations.Retained; import org.apache.geode.internal.offheap.annotations.Unretained; import org.apache.geode.internal.security.AuthorizeRequest; import org.apache.geode.internal.security.AuthorizeRequestPP; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class Get70 extends BaseCommand { @@ -55,8 +54,8 @@ public class Get70 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long startparam) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam) + throws IOException { long start = startparam; Part regionNamePart = null, keyPart = null, valuePart = null; String regionName = null; @@ -132,7 +131,7 @@ public class Get70 extends BaseCommand { GetOperationContext getContext = null; try { // for integrated security - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { @@ -189,7 +188,7 @@ public class Get70 extends BaseCommand { } // post process - data = securityService.postProcess(regionName, key, data, entry.isObject); + data = this.securityService.postProcess(regionName, key, data, entry.isObject); long oldStart = start; start = DistributionStats.getStatTime(); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java index e214ce1..01c5c9c 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll.java @@ -33,7 +33,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; import org.apache.geode.internal.security.AuthorizeRequestPP; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class GetAll extends BaseCommand { @@ -45,8 +44,8 @@ public class GetAll extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keysPart = null; String regionName = null; Object[] keys = null; @@ -68,7 +67,7 @@ public class GetAll extends BaseCommand { } if (logger.isDebugEnabled()) { - StringBuilder buffer = new StringBuilder(); + StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") .append(clientMessage.getPayloadLength()).append(" bytes) from ") .append(serverConnection.getSocketString()).append(" for region ").append(regionName) @@ -116,7 +115,7 @@ public class GetAll extends BaseCommand { // Send chunk response try { - fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, securityService); + fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it @@ -130,7 +129,7 @@ public class GetAll extends BaseCommand { } private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys, - ServerConnection servConn, SecurityService securityService) throws IOException { + ServerConnection servConn) throws IOException { // Interpret null keys object as a request to get all key,value entry pairs // of the region; otherwise iterate each key and perform the get behavior. @@ -185,7 +184,7 @@ public class GetAll extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); } catch (NotAuthorizedException ex) { logger.warn(LocalizedMessage.create( LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1, @@ -229,7 +228,7 @@ public class GetAll extends BaseCommand { } // post process - value = securityService.postProcess(regionName, key, value, isObject); + value = this.securityService.postProcess(regionName, key, value, isObject); if (logger.isDebugEnabled()) { logger.debug("{}: Returning value for key={}: {}", servConn.getName(), key, value); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java index aacfc6d..ad8ef49 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651.java @@ -33,7 +33,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; import org.apache.geode.internal.security.AuthorizeRequestPP; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class GetAll651 extends BaseCommand { @@ -45,8 +44,8 @@ public class GetAll651 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keysPart = null; String regionName = null; Object[] keys = null; @@ -68,7 +67,7 @@ public class GetAll651 extends BaseCommand { } if (logger.isDebugEnabled()) { - StringBuilder buffer = new StringBuilder(); + StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") .append(clientMessage.getPayloadLength()).append(" bytes) from ") .append(serverConnection.getSocketString()).append(" for region ").append(regionName) @@ -114,7 +113,7 @@ public class GetAll651 extends BaseCommand { // Send chunk response try { - fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, securityService); + fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it @@ -128,7 +127,7 @@ public class GetAll651 extends BaseCommand { } private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys, - ServerConnection servConn, SecurityService securityService) throws IOException { + ServerConnection servConn) throws IOException { // Interpret null keys object as a request to get all key,value entry pairs // of the region; otherwise iterate each key and perform the get behavior. @@ -184,7 +183,7 @@ public class GetAll651 extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); } catch (NotAuthorizedException ex) { logger.warn(LocalizedMessage.create( LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1, @@ -200,7 +199,7 @@ public class GetAll651 extends BaseCommand { request.getValueAndIsObject(region, key, null, servConn, valueAndIsObject); Object value = valueAndIsObject[0]; boolean isObject = ((Boolean) valueAndIsObject[1]).booleanValue(); - keyNotPresent = ((Boolean) valueAndIsObject[2]).booleanValue(); + keyNotPresent = ((Boolean) valueAndIsObject[2]).booleanValue();; if (isDebugEnabled) { logger.debug("{}: Retrieved value for key={}: {}", servConn.getName(), key, value); } @@ -227,7 +226,7 @@ public class GetAll651 extends BaseCommand { continue; } } - value = securityService.postProcess(regionName, key, value, isObject); + value = this.securityService.postProcess(regionName, key, value, isObject); if (isDebugEnabled) { logger.debug("{}: Returning value for key={}: {}", servConn.getName(), key, value); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java index 0449447..267a5b2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70.java @@ -39,7 +39,6 @@ import org.apache.geode.internal.offheap.OffHeapHelper; import org.apache.geode.internal.offheap.annotations.Retained; import org.apache.geode.internal.security.AuthorizeRequest; import org.apache.geode.internal.security.AuthorizeRequestPP; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class GetAll70 extends BaseCommand { @@ -51,8 +50,8 @@ public class GetAll70 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keysPart = null; String regionName = null; Object[] keys = null; @@ -77,7 +76,7 @@ public class GetAll70 extends BaseCommand { requestSerializedValues = clientMessage.getPart(partIdx++).getInt() == 1; if (logger.isDebugEnabled()) { - StringBuilder buffer = new StringBuilder(); + StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") .append(clientMessage.getPayloadLength()).append(" bytes) from ") .append(serverConnection.getSocketString()).append(" for region ").append(regionName) @@ -124,7 +123,7 @@ public class GetAll70 extends BaseCommand { // Send chunk response try { fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, - requestSerializedValues, securityService); + requestSerializedValues); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it @@ -138,8 +137,7 @@ public class GetAll70 extends BaseCommand { } private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys, - ServerConnection servConn, boolean requestSerializedValues, SecurityService securityService) - throws IOException { + ServerConnection servConn, boolean requestSerializedValues) throws IOException { // Interpret null keys object as a request to get all key,value entry pairs // of the region; otherwise iterate each key and perform the get behavior. @@ -210,7 +208,7 @@ public class GetAll70 extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); } catch (NotAuthorizedException ex) { logger.warn(LocalizedMessage.create( LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1, @@ -260,7 +258,7 @@ public class GetAll70 extends BaseCommand { } } - data = securityService.postProcess(regionName, key, data, entry.isObject); + data = this.securityService.postProcess(regionName, key, data, entry.isObject); // Add the entry to the list that will be returned to the client if (keyNotPresent) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java index 9f970a5..db97d53 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallback.java @@ -39,11 +39,12 @@ import org.apache.geode.internal.offheap.OffHeapHelper; import org.apache.geode.internal.offheap.annotations.Retained; import org.apache.geode.internal.security.AuthorizeRequest; import org.apache.geode.internal.security.AuthorizeRequestPP; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; /** * Initial version copied from GetAll70.java r48777. + * + * */ public class GetAllWithCallback extends BaseCommand { private static final Logger logger = LogService.getLogger(); @@ -55,8 +56,8 @@ public class GetAllWithCallback extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keysPart = null, callbackPart = null; String regionName = null; Object[] keys = null; @@ -88,7 +89,7 @@ public class GetAllWithCallback extends BaseCommand { } if (logger.isDebugEnabled()) { - StringBuilder buffer = new StringBuilder(); + StringBuffer buffer = new StringBuffer(); buffer.append(serverConnection.getName()).append(": Received getAll request (") .append(clientMessage.getPayloadLength()).append(" bytes) from ") .append(serverConnection.getSocketString()).append(" for region ").append(regionName) @@ -133,8 +134,7 @@ public class GetAllWithCallback extends BaseCommand { // Send chunk response try { - fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback, - securityService); + fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it @@ -145,11 +145,12 @@ public class GetAllWithCallback extends BaseCommand { serverConnection.setAsTrue(RESPONDED); return; } + + } private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys, - ServerConnection servConn, Object callback, SecurityService securityService) - throws IOException { + ServerConnection servConn, Object callback) throws IOException { assert keys != null; int numKeys = keys.length; @@ -191,7 +192,7 @@ public class GetAllWithCallback extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName, key.toString()); + this.securityService.authorizeRegionRead(regionName, key.toString()); } catch (NotAuthorizedException ex) { logger.warn(LocalizedMessage.create( LocalizedStrings.GetAll_0_CAUGHT_THE_FOLLOWING_EXCEPTION_ATTEMPTING_TO_GET_VALUE_FOR_KEY_1, http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java index 67a8fa6..201b5c0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java @@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; -import org.apache.geode.internal.security.SecurityService; /** * {@link Command} for {@link GetClientPRMetadataCommand} @@ -50,8 +49,7 @@ public class GetClientPRMetadataCommand extends BaseCommand { private GetClientPRMetadataCommand() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException, InterruptedException { String regionFullPath = null; CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java index a7aa2ad..7b370fe 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java @@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; -import org.apache.geode.internal.security.SecurityService; /** * {@link Command} for {@link GetClientPRMetadataCommand66} @@ -48,8 +47,7 @@ public class GetClientPRMetadataCommand66 extends BaseCommand { private GetClientPRMetadataCommand66() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException, InterruptedException { String regionFullPath = null; CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java index ded577a..6be9353 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java @@ -28,7 +28,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; -import org.apache.geode.internal.security.SecurityService; /** * {@link Command} for {@link GetClientPartitionAttributesOp} operation @@ -46,8 +45,7 @@ public class GetClientPartitionAttributesCommand extends BaseCommand { @SuppressWarnings("unchecked") @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException, InterruptedException { String regionFullPath = null; regionFullPath = clientMessage.getPart(0).getString(); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java index 709cc5e..251f4da 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java @@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; -import org.apache.geode.internal.security.SecurityService; /** * {@link Command} for {@link GetClientPartitionAttributesOp} operation for 6.6 clients @@ -51,8 +50,7 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand { @SuppressWarnings("unchecked") @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException, InterruptedException { String regionFullPath = null; regionFullPath = clientMessage.getPart(0).getString(); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java index 76cc4a5..2c1f26c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; -import org.apache.geode.internal.security.SecurityService; import java.io.IOException; @@ -35,8 +34,8 @@ public class GetFunctionAttribute extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { serverConnection.setAsTrue(REQUIRES_RESPONSE); String functionId = clientMessage.getPart(0).getString(); if (functionId == null) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java index 5e59640..15215de 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.pdx.internal.EnumInfo; import org.apache.geode.pdx.internal.TypeRegistry; @@ -37,8 +36,7 @@ public class GetPDXEnumById extends BaseCommand { private GetPDXEnumById() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java index b0ebaf2..40c62a7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.pdx.internal.EnumInfo; import org.apache.geode.pdx.internal.TypeRegistry; @@ -37,8 +36,7 @@ public class GetPDXIdForEnum extends BaseCommand { private GetPDXIdForEnum() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java index caa0661..c1de0fc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.pdx.internal.PdxType; import org.apache.geode.pdx.internal.TypeRegistry; @@ -37,8 +36,7 @@ public class GetPDXIdForType extends BaseCommand { private GetPDXIdForType() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java index e46445b..16e9dd0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.pdx.internal.PdxType; import org.apache.geode.pdx.internal.TypeRegistry; @@ -37,8 +36,7 @@ public class GetPDXTypeById extends BaseCommand { private GetPDXTypeById() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java index 3fe9750..7753584 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java @@ -23,7 +23,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.pdx.internal.EnumInfo; public class GetPdxEnums70 extends BaseCommand { @@ -37,8 +36,7 @@ public class GetPdxEnums70 extends BaseCommand { private GetPdxEnums70() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java index e64683f..c31a375 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java @@ -23,7 +23,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.pdx.internal.PdxType; public class GetPdxTypes70 extends BaseCommand { @@ -37,8 +36,7 @@ public class GetPdxTypes70 extends BaseCommand { private GetPdxTypes70() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java index 5066b12..040e1c2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java @@ -22,7 +22,6 @@ import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.*; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; -import org.apache.geode.internal.security.SecurityService; import java.io.IOException; @@ -37,8 +36,8 @@ public class Invalid extends BaseCommand { private Invalid() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { logger.error( LocalizedMessage.create(LocalizedStrings.Invalid_0_INVALID_MESSAGE_TYPE_WITH_TX_1_FROM_2, new Object[] {serverConnection.getName(), http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java index 3952b0f..801b3ad 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate.java @@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.versions.VersionTag; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.internal.util.Breadcrumbs; import org.apache.geode.security.GemFireSecurityException; @@ -49,13 +48,13 @@ public class Invalidate extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keyPart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null, key = null; Part eventPart = null; - StringBuilder errMessage = new StringBuilder(); + StringBuffer errMessage = new StringBuffer(); CacheServerStats stats = serverConnection.getCacheServerStats(); serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -135,7 +134,7 @@ public class Invalidate extends BaseCommand { try { // for integrated security - securityService.authorizeRegionWrite(regionName, key.toString()); + this.securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java index 202d91f..66de347 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java @@ -37,7 +37,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; import org.apache.geode.internal.security.AuthorizeRequestPP; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.NotAuthorizedException; public class KeySet extends BaseCommand { @@ -49,8 +48,8 @@ public class KeySet extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null; String regionName = null; serverConnection.setAsTrue(REQUIRES_RESPONSE); @@ -94,7 +93,7 @@ public class KeySet extends BaseCommand { } try { - securityService.authorizeRegionRead(regionName); + this.securityService.authorizeRegionRead(regionName); } catch (NotAuthorizedException ex) { writeChunkedException(clientMessage, ex, serverConnection); serverConnection.setAsTrue(RESPONDED); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java index bc023ad..ac9901c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java @@ -20,8 +20,6 @@ package org.apache.geode.internal.cache.tier.sockets.command; import org.apache.geode.internal.cache.tier.Command; import org.apache.geode.internal.cache.tier.sockets.*; -import org.apache.geode.internal.security.SecurityService; - import java.io.IOException; @@ -36,8 +34,7 @@ public class MakePrimary extends BaseCommand { private MakePrimary() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); Part isClientReadyPart = clientMessage.getPart(0); http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java index 2cb33bc..9a79540 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ManagementCommand.java @@ -19,7 +19,6 @@ import java.io.IOException; import org.apache.geode.internal.cache.tier.sockets.BaseCommand; import org.apache.geode.internal.cache.tier.sockets.Message; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; -import org.apache.geode.internal.security.SecurityService; /** * TODO: Javadoc everything and edit as needed @@ -29,8 +28,7 @@ import org.apache.geode.internal.security.SecurityService; public class ManagementCommand extends BaseCommand { @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException, InterruptedException { // TODO Auto-generated method stub } http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java index ff8c9f2..121ec37 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java @@ -20,8 +20,6 @@ package org.apache.geode.internal.cache.tier.sockets.command; import org.apache.geode.internal.cache.EventID; import org.apache.geode.internal.cache.tier.Command; import org.apache.geode.internal.cache.tier.sockets.*; -import org.apache.geode.internal.security.SecurityService; - import java.io.IOException; public class PeriodicAck extends BaseCommand { @@ -35,8 +33,7 @@ public class PeriodicAck extends BaseCommand { private PeriodicAck() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException, ClassNotFoundException { serverConnection.setAsTrue(REQUIRES_RESPONSE); if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java index 5408e29..adcfd14 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java @@ -17,12 +17,14 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; +import org.apache.geode.i18n.LogWriterI18n; +import org.apache.geode.internal.Version; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.cache.tier.Command; import org.apache.geode.internal.cache.tier.MessageType; import org.apache.geode.internal.cache.tier.sockets.*; import org.apache.geode.distributed.internal.DistributionStats; -import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.distributed.internal.InternalDistributedSystem; import java.io.IOException; @@ -37,8 +39,8 @@ public class Ping extends BaseCommand { private Ping() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { final boolean isDebugEnabled = logger.isDebugEnabled(); if (isDebugEnabled) { logger.debug("{}: rcv tx: {} from {} rcvTime: {}", serverConnection.getName(), http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java index 27f8cc5..76c8184 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put.java @@ -37,7 +37,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.GemFireSecurityException; public class Put extends BaseCommand { @@ -48,9 +47,10 @@ public class Put extends BaseCommand { return singleton; } + @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null, key = null; @@ -114,7 +114,8 @@ public class Put extends BaseCommand { errMessage = LocalizedStrings.Put_THE_INPUT_REGION_NAME_FOR_THE_PUT_REQUEST_IS_NULL .toLocalizedString(); } - writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage, serverConnection); + writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -150,7 +151,7 @@ public class Put extends BaseCommand { byte[] value = valuePart.getSerializedForm(); boolean isObject = valuePart.isObject(); - securityService.authorizeRegionWrite(regionName, key.toString()); + this.securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java index 60870d7..6f1583a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put61.java @@ -12,6 +12,9 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ +/** + * + */ package org.apache.geode.internal.cache.tier.sockets.command; import java.io.IOException; @@ -38,7 +41,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.GemFireSecurityException; /** @@ -53,15 +55,14 @@ public class Put61 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long p_start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start) throws IOException, InterruptedException { long start = p_start; Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null, key = null; Part eventPart = null; - StringBuilder errMessage = new StringBuilder(); + StringBuffer errMessage = new StringBuffer(); boolean isDelta = false; CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); @@ -173,7 +174,7 @@ public class Put61 extends BaseCommand { boolean isMetaRegion = region.isUsedForMetaRegion(); clientMessage.setMetaRegion(isMetaRegion); - securityService.authorizeRegionWrite(regionName, key.toString()); + this.securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = null; if (!isMetaRegion) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java index 8f65b9b..a078372 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put65.java @@ -48,7 +48,6 @@ import org.apache.geode.internal.cache.versions.VersionTag; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.internal.util.Breadcrumbs; import org.apache.geode.security.GemFireSecurityException; @@ -64,15 +63,14 @@ public class Put65 extends BaseCommand { } @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long p_start) + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start) throws IOException, InterruptedException { long start = p_start; Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null; String regionName = null; Object callbackArg = null, key = null; Part eventPart = null; - StringBuilder errMessage = new StringBuilder(); + StringBuffer errMessage = new StringBuffer(); boolean isDelta = false; CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); @@ -233,7 +231,7 @@ public class Put65 extends BaseCommand { boolean isMetaRegion = region.isUsedForMetaRegion(); clientMessage.setMetaRegion(isMetaRegion); - securityService.authorizeRegionWrite(regionName, key.toString()); + this.securityService.authorizeRegionWrite(regionName, key.toString()); AuthorizeRequest authzRequest = null; if (!isMetaRegion) { http://git-wip-us.apache.org/repos/asf/geode/blob/fd638d52/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java index f8cd57f..ba8b145 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutAll.java @@ -12,6 +12,9 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ +/** + * Author: Gester Zhou + */ package org.apache.geode.internal.cache.tier.sockets.command; import java.io.IOException; @@ -43,7 +46,6 @@ import org.apache.geode.internal.cache.versions.VersionTag; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.geode.internal.security.AuthorizeRequest; -import org.apache.geode.internal.security.SecurityService; public class PutAll extends BaseCommand { @@ -57,14 +59,14 @@ public class PutAll extends BaseCommand { private PutAll() {} @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, - final SecurityService securityService, long start) throws IOException, InterruptedException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException, InterruptedException { Part regionNamePart = null, numberOfKeysPart = null, keyPart = null, valuePart = null; String regionName = null; int numberOfKeys = 0; Object key = null; Part eventPart = null; - StringBuilder errMessage = new StringBuilder(); + StringBuffer errMessage = new StringBuffer(); CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); boolean replyWithMetaData = false; @@ -164,7 +166,7 @@ public class PutAll extends BaseCommand { serverConnection.setRequestSpecificTimeout(timeout); } - securityService.authorizeRegionWrite(regionName); + this.securityService.authorizeRegionWrite(regionName); AuthorizeRequest authzRequest = serverConnection.getAuthzRequest(); if (authzRequest != null) {
