You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/06/13 00:30:00 UTC
[25/50] [abbrv] geode git commit: GEODE-2632: use immutable
SecurityService impls to improve performance
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 4fda244..26d5d3f 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,6 +49,7 @@ 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
@@ -64,8 +65,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
private ExecuteRegionFunction66() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
- throws IOException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException {
String regionName = null;
Object function = null;
Object args = null;
@@ -77,14 +78,14 @@ public class ExecuteRegionFunction66 extends BaseCommand {
int removedNodesSize = 0;
Set<Object> removedNodesSet = null;
int filterSize = 0, partNumber = 0;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.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
- && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
+ && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
functionTimeout = Part.decodeInt(bytes, 1);
}
if (functionState != 1) {
@@ -93,8 +94,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
hasResult = functionState;
}
if (hasResult == 1) {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
regionName = clientMessage.getPart(1).getString();
function = clientMessage.getPart(2).getStringOrObject();
@@ -107,7 +108,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
}
}
byte[] flags = clientMessage.getPart(5).getSerializedForm();
- if (servConn.getClientVersion().ordinal() > Version.GFE_81.ordinal()) {
+ if (serverConnection.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 {
@@ -140,11 +141,11 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(clientMessage, exception, servConn);
+ writeChunkedException(clientMessage, exception, serverConnection);
} else {
- writeException(clientMessage, exception, false, servConn);
+ writeException(clientMessage, exception, false, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
if (function == null || regionName == null) {
@@ -159,8 +160,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("region");
}
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
@@ -169,11 +170,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("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
- HandShake handShake = (HandShake) servConn.getHandshake();
+ HandShake handShake = (HandShake) serverConnection.getHandshake();
int earlierClientReadTimeout = handShake.getClientReadTimeout();
handShake.setClientReadTimeout(functionTimeout);
ServerToClientFunctionResultSender resultSender = null;
@@ -185,8 +186,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
} else {
byte functionStateOnServerSide = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -199,8 +200,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
String message =
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
}
@@ -208,10 +209,10 @@ public class ExecuteRegionFunction66 extends BaseCommand {
functionObject = (Function) function;
}
- this.securityService.authorizeDataWrite();
+ securityService.authorizeDataWrite();
// check if the caller is authorized to do this operation on server
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
final String functionName = functionObject.getId();
final String regionPath = region.getFullPath();
ExecuteFunctionOperationContext executeContext = null;
@@ -222,10 +223,11 @@ public class ExecuteRegionFunction66 extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
- ChunkedMessage m = servConn.getFunctionResponseMessage();
+ ChunkedMessage m = serverConnection.getFunctionResponseMessage();
m.setTransactionId(clientMessage.getTransactionId());
- resultSender = new ServerToClientFunctionResultSender65(m,
- MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
+ resultSender =
+ new ServerToClientFunctionResultSender65(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT,
+ serverConnection, functionObject, executeContext);
if (execution instanceof PartitionedRegionFunctionExecutor) {
if ((hasResult == 1) && filter != null && filter.size() == 1) {
@@ -243,7 +245,8 @@ public class ExecuteRegionFunction66 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug(
"Executing Function: {} on Server: {} with Execution: {} functionState={} reExecute={} hasResult={}",
- functionObject.getId(), servConn, execution, functionState, isReExecute, hasResult);
+ functionObject.getId(), serverConnection, execution, functionState, isReExecute,
+ hasResult);
}
if (hasResult == 1) {
if (function instanceof String) {
@@ -277,7 +280,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
} else {
execution.execute(functionObject);
}
- writeReply(clientMessage, servConn);
+ writeReply(clientMessage, serverConnection);
}
} catch (IOException ioe) {
logger.warn(LocalizedMessage.create(
@@ -285,7 +288,7 @@ public class ExecuteRegionFunction66 extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, clientMessage, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, serverConnection, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
Object cause = fe.getCause();
@@ -322,7 +325,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, servConn, fe);
+ sendException(hasResult, clientMessage, message, serverConnection, fe);
}
} catch (Exception e) {
@@ -330,42 +333,43 @@ public class ExecuteRegionFunction66 extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), e);
String message = e.getMessage();
- sendException(hasResult, clientMessage, message, servConn, e);
+ sendException(hasResult, clientMessage, message, serverConnection, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
}
}
- private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
- Throwable e) throws IOException {
+ private void sendException(byte hasResult, Message msg, String message,
+ ServerConnection serverConnection, Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e);
} else {
- writeException(msg, e, false, servConn);
+ writeException(msg, e, false, serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
- private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn)
- throws IOException {
+ private void sendError(byte hasResult, Message msg, String message,
+ ServerConnection serverConnection) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message,
- servConn);
+ serverConnection);
} else {
- writeErrorResponse(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message, servConn);
+ writeErrorResponse(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message,
+ serverConnection);
}
- servConn.setAsTrue(RESPONDED);
+ serverConnection.setAsTrue(RESPONDED);
}
}
protected static void writeFunctionResponseException(Message origMsg, int messageType,
- String message, ServerConnection servConn, Throwable e) throws IOException {
- ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ String message, ServerConnection serverConnection, Throwable e) throws IOException {
+ ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
int numParts = 0;
if (functionResponseMsg.headerHasBeenSent()) {
if (e instanceof FunctionException
@@ -384,13 +388,13 @@ public class ExecuteRegionFunction66 extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(),
- e);
+ logger.debug("{}: Sending exception chunk while reply in progress: ",
+ serverConnection.getName(), e);
}
- functionResponseMsg.setServerConnection(servConn);
+ functionResponseMsg.setServerConnection(serverConnection);
functionResponseMsg.setLastChunkAndNumParts(true, numParts);
// functionResponseMsg.setLastChunk(true);
- functionResponseMsg.sendChunk(servConn);
+ functionResponseMsg.sendChunk(serverConnection);
} else {
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setTransactionId(origMsg.getTransactionId());
@@ -411,11 +415,11 @@ public class ExecuteRegionFunction66 extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: ", servConn.getName(), e);
+ logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e);
}
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setLastChunkAndNumParts(true, numParts);
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 d4edde9..8c3bb38 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,6 +46,7 @@ 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
@@ -62,8 +63,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
private ExecuteRegionFunctionSingleHop() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection servConn, long start)
- throws IOException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException {
String regionName = null;
Object function = null;
@@ -77,13 +78,13 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
int removedNodesSize = 0;
Set<Object> removedNodesSet = null;
int filterSize = 0, bucketIdsSize = 0, partNumber = 0;
- CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+ CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
int functionTimeout = ConnectionImpl.DEFAULT_CLIENT_FUNCTION_TIMEOUT;
try {
byte[] bytes = clientMessage.getPart(0).getSerializedForm();
functionState = bytes[0];
if (bytes.length >= 5
- && servConn.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
+ && serverConnection.getClientVersion().ordinal() >= Version.GFE_8009.ordinal()) {
functionTimeout = Part.decodeInt(bytes, 1);
}
if (functionState != 1) {
@@ -92,8 +93,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
hasResult = functionState;
}
if (hasResult == 1) {
- servConn.setAsTrue(REQUIRES_RESPONSE);
- servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_RESPONSE);
+ serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
}
regionName = clientMessage.getPart(1).getString();
function = clientMessage.getPart(2).getStringOrObject();
@@ -146,8 +147,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0,
function), exception);
if (hasResult == 1) {
- writeChunkedException(clientMessage, exception, servConn);
- servConn.setAsTrue(RESPONDED);
+ writeChunkedException(clientMessage, exception, serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
return;
}
}
@@ -163,8 +164,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
.toLocalizedString("region");
}
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
@@ -173,11 +174,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("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
- HandShake handShake = (HandShake) servConn.getHandshake();
+ HandShake handShake = (HandShake) serverConnection.getHandshake();
int earlierClientReadTimeout = handShake.getClientReadTimeout();
handShake.setClientReadTimeout(functionTimeout);
ServerToClientFunctionResultSender resultSender = null;
@@ -189,8 +190,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
String message =
LocalizedStrings.ExecuteRegionFunction_THE_FUNCTION_0_HAS_NOT_BEEN_REGISTERED
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
} else {
byte functionStateOnServer = AbstractExecution.getFunctionState(functionObject.isHA(),
@@ -199,8 +200,8 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
String message =
LocalizedStrings.FunctionService_FUNCTION_ATTRIBUTE_MISMATCH_CLIENT_SERVER
.toLocalizedString(function);
- logger.warn("{}: {}", servConn.getName(), message);
- sendError(hasResult, clientMessage, message, servConn);
+ logger.warn("{}: {}", serverConnection.getName(), message);
+ sendError(hasResult, clientMessage, message, serverConnection);
return;
}
}
@@ -208,10 +209,10 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
functionObject = (Function) function;
}
- this.securityService.authorizeDataWrite();
+ securityService.authorizeDataWrite();
// check if the caller is authorized to do this operation on server
- AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+ AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
final String functionName = functionObject.getId();
final String regionPath = region.getFullPath();
ExecuteFunctionOperationContext executeContext = null;
@@ -222,10 +223,11 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
// Construct execution
AbstractExecution execution = (AbstractExecution) FunctionService.onRegion(region);
- ChunkedMessage m = servConn.getFunctionResponseMessage();
+ ChunkedMessage m = serverConnection.getFunctionResponseMessage();
m.setTransactionId(clientMessage.getTransactionId());
- resultSender = new ServerToClientFunctionResultSender65(m,
- MessageType.EXECUTE_REGION_FUNCTION_RESULT, servConn, functionObject, executeContext);
+ resultSender =
+ new ServerToClientFunctionResultSender65(m, MessageType.EXECUTE_REGION_FUNCTION_RESULT,
+ serverConnection, functionObject, executeContext);
if (isExecuteOnAllBuckets == 1) {
PartitionedRegion pr = (PartitionedRegion) region;
@@ -250,7 +252,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug("Executing Function: {} on Server: {} with Execution: {}",
- functionObject.getId(), servConn, execution);
+ functionObject.getId(), serverConnection, execution);
}
if (hasResult == 1) {
if (function instanceof String) {
@@ -291,7 +293,7 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
function), ioe);
final String message = LocalizedStrings.ExecuteRegionFunction_SERVER_COULD_NOT_SEND_THE_REPLY
.toLocalizedString();
- sendException(hasResult, clientMessage, message, servConn, ioe);
+ sendException(hasResult, clientMessage, message, serverConnection, ioe);
} catch (FunctionException fe) {
String message = fe.getMessage();
@@ -309,45 +311,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, servConn, fe);
+ sendException(hasResult, clientMessage, message, serverConnection, 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, servConn, e);
+ sendException(hasResult, clientMessage, message, serverConnection, e);
} finally {
handShake.setClientReadTimeout(earlierClientReadTimeout);
ServerConnection.executeFunctionOnLocalNodeOnly((byte) 0);
}
}
- private void sendException(byte hasResult, Message msg, String message, ServerConnection servConn,
- Throwable e) throws IOException {
+ private void sendException(byte hasResult, Message msg, String message,
+ ServerConnection serverConnection, Throwable e) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
- writeFunctionResponseException(msg, MessageType.EXCEPTION, message, servConn, e);
- servConn.setAsTrue(RESPONDED);
+ writeFunctionResponseException(msg, MessageType.EXCEPTION, message, serverConnection, e);
+ serverConnection.setAsTrue(RESPONDED);
}
}
}
- private void sendError(byte hasResult, Message msg, String message, ServerConnection servConn)
- throws IOException {
+ private void sendError(byte hasResult, Message msg, String message,
+ ServerConnection serverConnection) throws IOException {
synchronized (msg) {
if (hasResult == 1) {
writeFunctionResponseError(msg, MessageType.EXECUTE_REGION_FUNCTION_ERROR, message,
- servConn);
- servConn.setAsTrue(RESPONDED);
+ serverConnection);
+ serverConnection.setAsTrue(RESPONDED);
}
}
}
protected static void writeFunctionResponseException(Message origMsg, int messageType,
- String message, ServerConnection servConn, Throwable e) throws IOException {
- ChunkedMessage functionResponseMsg = servConn.getFunctionResponseMessage();
- ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+ String message, ServerConnection serverConnection, Throwable e) throws IOException {
+ ChunkedMessage functionResponseMsg = serverConnection.getFunctionResponseMessage();
+ ChunkedMessage chunkedResponseMsg = serverConnection.getChunkedResponseMessage();
int numParts = 0;
if (functionResponseMsg.headerHasBeenSent()) {
if (e instanceof FunctionException
@@ -366,12 +368,12 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk while reply in progress: ", servConn.getName(),
- e);
+ logger.debug("{}: Sending exception chunk while reply in progress: ",
+ serverConnection.getName(), e);
}
- functionResponseMsg.setServerConnection(servConn);
+ functionResponseMsg.setServerConnection(serverConnection);
functionResponseMsg.setLastChunkAndNumParts(true, numParts);
- functionResponseMsg.sendChunk(servConn);
+ functionResponseMsg.sendChunk(serverConnection);
} else {
chunkedResponseMsg.setMessageType(messageType);
chunkedResponseMsg.setTransactionId(origMsg.getTransactionId());
@@ -392,11 +394,11 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
numParts = 2;
}
if (logger.isDebugEnabled()) {
- logger.debug("{}: Sending exception chunk: ", servConn.getName(), e);
+ logger.debug("{}: Sending exception chunk: ", serverConnection.getName(), e);
}
- chunkedResponseMsg.setServerConnection(servConn);
+ chunkedResponseMsg.setServerConnection(serverConnection);
chunkedResponseMsg.setLastChunkAndNumParts(true, numParts);
- chunkedResponseMsg.sendChunk(servConn);
+ chunkedResponseMsg.sendChunk(serverConnection);
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 d489b88..12e494a 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,7 +33,6 @@ 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;
@@ -49,6 +48,7 @@ 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(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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/0211029b/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 2ca8804..62644eb 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,6 +43,7 @@ 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 {
@@ -54,8 +55,8 @@ public class Get70 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long startparam)
- throws IOException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long startparam) throws IOException {
long start = startparam;
Part regionNamePart = null, keyPart = null, valuePart = null;
String regionName = null;
@@ -131,7 +132,7 @@ public class Get70 extends BaseCommand {
GetOperationContext getContext = null;
try {
// for integrated security
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ securityService.authorizeRegionRead(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
@@ -188,7 +189,7 @@ public class Get70 extends BaseCommand {
}
// post process
- data = this.securityService.postProcess(regionName, key, data, entry.isObject);
+ data = securityService.postProcess(regionName, key, data, entry.isObject);
long oldStart = start;
start = DistributionStats.getStatTime();
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 01c5c9c..e214ce1 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,6 +33,7 @@ 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 {
@@ -44,8 +45,8 @@ public class GetAll extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
Object[] keys = null;
@@ -67,7 +68,7 @@ public class GetAll extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -115,7 +116,7 @@ public class GetAll extends BaseCommand {
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -129,7 +130,7 @@ public class GetAll extends BaseCommand {
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn) throws IOException {
+ ServerConnection servConn, SecurityService securityService) 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 +185,7 @@ public class GetAll extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ 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,
@@ -228,7 +229,7 @@ public class GetAll extends BaseCommand {
}
// post process
- value = this.securityService.postProcess(regionName, key, value, isObject);
+ value = 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/0211029b/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 ad8ef49..aacfc6d 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,6 +33,7 @@ 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 {
@@ -44,8 +45,8 @@ public class GetAll651 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
Object[] keys = null;
@@ -67,7 +68,7 @@ public class GetAll651 extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -113,7 +114,7 @@ public class GetAll651 extends BaseCommand {
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -127,7 +128,7 @@ public class GetAll651 extends BaseCommand {
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn) throws IOException {
+ ServerConnection servConn, SecurityService securityService) 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.
@@ -183,7 +184,7 @@ public class GetAll651 extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ 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,
@@ -199,7 +200,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);
}
@@ -226,7 +227,7 @@ public class GetAll651 extends BaseCommand {
continue;
}
}
- value = this.securityService.postProcess(regionName, key, value, isObject);
+ value = 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/0211029b/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 267a5b2..0449447 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,6 +39,7 @@ 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 {
@@ -50,8 +51,8 @@ public class GetAll70 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null;
String regionName = null;
Object[] keys = null;
@@ -76,7 +77,7 @@ public class GetAll70 extends BaseCommand {
requestSerializedValues = clientMessage.getPart(partIdx++).getInt() == 1;
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -123,7 +124,7 @@ public class GetAll70 extends BaseCommand {
// Send chunk response
try {
fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection,
- requestSerializedValues);
+ requestSerializedValues, securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -137,7 +138,8 @@ public class GetAll70 extends BaseCommand {
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn, boolean requestSerializedValues) throws IOException {
+ ServerConnection servConn, boolean requestSerializedValues, SecurityService securityService)
+ 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.
@@ -208,7 +210,7 @@ public class GetAll70 extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ 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,
@@ -258,7 +260,7 @@ public class GetAll70 extends BaseCommand {
}
}
- data = this.securityService.postProcess(regionName, key, data, entry.isObject);
+ data = 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/0211029b/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 db97d53..9f970a5 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,12 +39,11 @@ 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();
@@ -56,8 +55,8 @@ public class GetAllWithCallback extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null, keysPart = null, callbackPart = null;
String regionName = null;
Object[] keys = null;
@@ -89,7 +88,7 @@ public class GetAllWithCallback extends BaseCommand {
}
if (logger.isDebugEnabled()) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(serverConnection.getName()).append(": Received getAll request (")
.append(clientMessage.getPayloadLength()).append(" bytes) from ")
.append(serverConnection.getSocketString()).append(" for region ").append(regionName)
@@ -134,7 +133,8 @@ public class GetAllWithCallback extends BaseCommand {
// Send chunk response
try {
- fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback);
+ fillAndSendGetAllResponseChunks(region, regionName, keys, serverConnection, callback,
+ securityService);
serverConnection.setAsTrue(RESPONDED);
} catch (Exception e) {
// If an interrupted exception is thrown , rethrow it
@@ -145,12 +145,11 @@ public class GetAllWithCallback extends BaseCommand {
serverConnection.setAsTrue(RESPONDED);
return;
}
-
-
}
private void fillAndSendGetAllResponseChunks(Region region, String regionName, Object[] keys,
- ServerConnection servConn, Object callback) throws IOException {
+ ServerConnection servConn, Object callback, SecurityService securityService)
+ throws IOException {
assert keys != null;
int numKeys = keys.length;
@@ -192,7 +191,7 @@ public class GetAllWithCallback extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName, key.toString());
+ 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/0211029b/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 201b5c0..67a8fa6 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,6 +31,7 @@ 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}
@@ -49,7 +50,8 @@ public class GetClientPRMetadataCommand extends BaseCommand {
private GetClientPRMetadataCommand() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 7b370fe..a7aa2ad 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,6 +29,7 @@ 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}
@@ -47,7 +48,8 @@ public class GetClientPRMetadataCommand66 extends BaseCommand {
private GetClientPRMetadataCommand66() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 6be9353..ded577a 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,6 +28,7 @@ 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
@@ -45,7 +46,8 @@ public class GetClientPartitionAttributesCommand extends BaseCommand {
@SuppressWarnings("unchecked")
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
regionFullPath = clientMessage.getPart(0).getString();
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 251f4da..709cc5e 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,6 +31,7 @@ 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
@@ -50,7 +51,8 @@ public class GetClientPartitionAttributesCommand66 extends BaseCommand {
@SuppressWarnings("unchecked")
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
String regionFullPath = null;
regionFullPath = clientMessage.getPart(0).getString();
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 2c1f26c..76cc4a5 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,6 +22,7 @@ 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;
@@ -34,8 +35,8 @@ public class GetFunctionAttribute extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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/0211029b/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 15215de..5e59640 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,6 +22,7 @@ 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;
@@ -36,7 +37,8 @@ public class GetPDXEnumById extends BaseCommand {
private GetPDXEnumById() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 40c62a7..b0ebaf2 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,6 +22,7 @@ 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;
@@ -36,7 +37,8 @@ public class GetPDXIdForEnum extends BaseCommand {
private GetPDXIdForEnum() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 c1de0fc..caa0661 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,6 +22,7 @@ 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;
@@ -36,7 +37,8 @@ public class GetPDXIdForType extends BaseCommand {
private GetPDXIdForType() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 16e9dd0..e46445b 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,6 +22,7 @@ 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;
@@ -36,7 +37,8 @@ public class GetPDXTypeById extends BaseCommand {
private GetPDXTypeById() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 7753584..3fe9750 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,6 +23,7 @@ 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 {
@@ -36,7 +37,8 @@ public class GetPdxEnums70 extends BaseCommand {
private GetPdxEnums70() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 c31a375..e64683f 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,6 +23,7 @@ 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 {
@@ -36,7 +37,8 @@ public class GetPdxTypes70 extends BaseCommand {
private GetPdxTypes70() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 040e1c2..5066b12 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,6 +22,7 @@ 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;
@@ -36,8 +37,8 @@ public class Invalid extends BaseCommand {
private Invalid() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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/0211029b/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 801b3ad..3952b0f 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,6 +36,7 @@ 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;
@@ -48,13 +49,13 @@ public class Invalidate extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null, key = null;
Part eventPart = null;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CacheServerStats stats = serverConnection.getCacheServerStats();
serverConnection.setAsTrue(REQUIRES_RESPONSE);
@@ -134,7 +135,7 @@ public class Invalidate extends BaseCommand {
try {
// for integrated security
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 66de347..202d91f 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,6 +37,7 @@ 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 {
@@ -48,8 +49,8 @@ public class KeySet extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null;
String regionName = null;
serverConnection.setAsTrue(REQUIRES_RESPONSE);
@@ -93,7 +94,7 @@ public class KeySet extends BaseCommand {
}
try {
- this.securityService.authorizeRegionRead(regionName);
+ securityService.authorizeRegionRead(regionName);
} catch (NotAuthorizedException ex) {
writeChunkedException(clientMessage, ex, serverConnection);
serverConnection.setAsTrue(RESPONDED);
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 ac9901c..bc023ad 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,6 +20,8 @@ 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;
@@ -34,7 +36,8 @@ public class MakePrimary extends BaseCommand {
private MakePrimary() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
Part isClientReadyPart = clientMessage.getPart(0);
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 9a79540..2cb33bc 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,6 +19,7 @@ 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
@@ -28,7 +29,8 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
public class ManagementCommand extends BaseCommand {
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException, InterruptedException {
// TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 121ec37..ff8c9f2 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,6 +20,8 @@ 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 {
@@ -33,7 +35,8 @@ public class PeriodicAck extends BaseCommand {
private PeriodicAck() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start)
throws IOException, ClassNotFoundException {
serverConnection.setAsTrue(REQUIRES_RESPONSE);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 adcfd14..5408e29 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,14 +17,12 @@
*/
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.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.security.SecurityService;
import java.io.IOException;
@@ -39,8 +37,8 @@ public class Ping extends BaseCommand {
private Ping() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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/0211029b/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 76c8184..27f8cc5 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,6 +37,7 @@ 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 {
@@ -47,10 +48,9 @@ public class Put extends BaseCommand {
return singleton;
}
-
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, long start) throws IOException, InterruptedException {
Part regionNamePart = null, keyPart = null, valuePart = null, callbackArgPart = null;
String regionName = null;
Object callbackArg = null, key = null;
@@ -114,8 +114,7 @@ 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.toString(),
- serverConnection);
+ writeErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage, serverConnection);
serverConnection.setAsTrue(RESPONDED);
return;
}
@@ -151,7 +150,7 @@ public class Put extends BaseCommand {
byte[] value = valuePart.getSerializedForm();
boolean isObject = valuePart.isObject();
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 6f1583a..60870d7 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,9 +12,6 @@
* 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;
@@ -41,6 +38,7 @@ 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;
/**
@@ -55,14 +53,15 @@ public class Put61 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
boolean isDelta = false;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -174,7 +173,7 @@ public class Put61 extends BaseCommand {
boolean isMetaRegion = region.isUsedForMetaRegion();
clientMessage.setMetaRegion(isMetaRegion);
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = null;
if (!isMetaRegion) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 a078372..8f65b9b 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,6 +48,7 @@ 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;
@@ -63,14 +64,15 @@ public class Put65 extends BaseCommand {
}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long p_start)
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
boolean isDelta = false;
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
@@ -231,7 +233,7 @@ public class Put65 extends BaseCommand {
boolean isMetaRegion = region.isUsedForMetaRegion();
clientMessage.setMetaRegion(isMetaRegion);
- this.securityService.authorizeRegionWrite(regionName, key.toString());
+ securityService.authorizeRegionWrite(regionName, key.toString());
AuthorizeRequest authzRequest = null;
if (!isMetaRegion) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0211029b/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 ba8b145..f8cd57f 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,9 +12,6 @@
* 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;
@@ -46,6 +43,7 @@ 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 {
@@ -59,14 +57,14 @@ public class PutAll extends BaseCommand {
private PutAll() {}
@Override
- public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start)
- throws IOException, InterruptedException {
+ public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection,
+ final SecurityService securityService, 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;
- StringBuffer errMessage = new StringBuffer();
+ StringBuilder errMessage = new StringBuilder();
CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper();
CacheServerStats stats = serverConnection.getCacheServerStats();
boolean replyWithMetaData = false;
@@ -166,7 +164,7 @@ public class PutAll extends BaseCommand {
serverConnection.setRequestSpecificTimeout(timeout);
}
- this.securityService.authorizeRegionWrite(regionName);
+ securityService.authorizeRegionWrite(regionName);
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {