This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch feature/GEODE-3604 in repository https://gitbox.apache.org/repos/asf/geode.git
commit a0a3d3ea1dbec8d71bb27e05f5d280e3a5e80b05 Author: kohlmu-pivotal <[email protected]> AuthorDate: Mon Sep 11 16:33:09 2017 -0700 refactored some more code --- .../distributed/internal/tcpserver/TcpServer.java | 4 ++-- .../geode/internal/cache/CacheServerImpl.java | 4 ++-- .../sockets/GenericProtocolServerConnection.java | 6 ++++-- .../cache/tier/sockets/ServerConnectionFactory.java | 3 ++- .../cache/tier/sockets/TcpServerFactory.java | 1 + .../ClientProtocolMessageHandler.java | 5 ++++- .../MessageExecutionContext.java | 4 ++-- .../ProtocolMessageHandlerLookupService.java | 4 +++- .../security/server/Authenticator.java | 2 +- .../security/server/AuthenticatorLookupService.java | 16 +++++++++++++++- .../{ => protocol}/security/server/Authorizer.java | 2 +- .../security/server/NoOpAuthenticator.java | 2 +- .../security/server/NoOpAuthorizer.java | 2 +- .../{ => protocol}/security/server/package.html | 0 ....internal.protocol.security.server.Authenticator | 1 + ...che.geode.internal.security.server.Authenticator | 1 - .../geode/protocol/operations/OperationHandler.java | 2 +- .../protocol/protobuf/ProtobufOpsProcessor.java | 6 +++--- .../protocol/protobuf/ProtobufStreamProcessor.java | 4 ++-- .../operations/GetAllRequestOperationHandler.java | 2 +- .../GetAvailableServersOperationHandler.java | 2 +- .../GetRegionNamesRequestOperationHandler.java | 2 +- .../GetRegionRequestOperationHandler.java | 2 +- .../operations/GetRequestOperationHandler.java | 2 +- .../operations/PutAllRequestOperationHandler.java | 2 +- .../operations/PutRequestOperationHandler.java | 2 +- .../operations/RemoveRequestOperationHandler.java | 2 +- .../server/ProtobufSimpleAuthenticator.java | 4 ++-- .../security/server/ProtobufSimpleAuthorizer.java | 2 +- ....internal.protocol.ClientProtocolMessageHandler} | 0 ...internal.protocol.security.server.Authenticator} | 0 .../GenericProtocolServerConnectionTest.java | 3 ++- .../protocol/RoundTripCacheConnectionJUnitTest.java | 21 ++++++++------------- .../protobuf/ProtobufStreamProcessorTest.java | 4 ++-- .../GetAllRequestOperationHandlerJUnitTest.java | 4 ++-- ...etAvailableServersOperationHandlerJUnitTest.java | 2 +- ...RegionNamesRequestOperationHandlerJUnitTest.java | 4 ++-- .../GetRegionRequestOperationHandlerJUnitTest.java | 4 ++-- .../GetRequestOperationHandlerJUnitTest.java | 4 ++-- .../PutAllRequestOperationHandlerJUnitTest.java | 4 ++-- .../PutRequestOperationHandlerJUnitTest.java | 4 ++-- .../RemoveRequestOperationHandlerJUnitTest.java | 4 ++-- .../server}/AuthenticationIntegrationTest.java | 2 +- .../server}/AuthorizationIntegrationTest.java | 2 +- 44 files changed, 86 insertions(+), 67 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java index cc8a8bb..bbf8be8 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java @@ -58,9 +58,9 @@ import org.apache.geode.internal.VersionedDataInputStream; import org.apache.geode.internal.VersionedDataOutputStream; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.CommunicationMode; -import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler; +import org.apache.geode.internal.protocol.ClientProtocolMessageHandler; import org.apache.geode.internal.cache.tier.sockets.HandShake; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.net.SocketCreator; import org.apache.geode.internal.net.SocketCreatorFactory; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java index bcd8b32..b5327a8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection; import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory; import org.apache.logging.log4j.Logger; @@ -37,7 +38,6 @@ import org.apache.geode.InvalidValueException; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.ClientSession; import org.apache.geode.cache.DataPolicy; -import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.DiskStoreFactory; import org.apache.geode.cache.DynamicRegionFactory; import org.apache.geode.cache.EvictionAction; @@ -95,7 +95,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution /** * The server connection factory, that provides either a * {@link org.apache.geode.internal.cache.tier.sockets.LegacyServerConnection} or a new - * {@link org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection} + * {@link GenericProtocolServerConnection} */ private final ServerConnectionFactory serverConnectionFactory = new ServerConnectionFactory(); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java index 01d5acc..1e69243 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java @@ -18,9 +18,11 @@ package org.apache.geode.internal.cache.tier.sockets; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; +import org.apache.geode.internal.protocol.ClientProtocolMessageHandler; +import org.apache.geode.internal.protocol.MessageExecutionContext; +import org.apache.geode.internal.protocol.security.server.Authenticator; +import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService; import org.apache.geode.internal.security.SecurityService; -import org.apache.geode.internal.security.server.Authenticator; -import org.apache.geode.internal.security.server.AuthenticatorLookupService; import org.apache.geode.security.SecurityManager; import java.io.EOFException; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java index 7b13fd0..c86ab83 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java @@ -23,8 +23,9 @@ import java.net.Socket; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; +import org.apache.geode.internal.protocol.ProtocolMessageHandlerLookupService; import org.apache.geode.internal.security.SecurityService; -import org.apache.geode.internal.security.server.AuthenticatorLookupService; +import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService; /** * Creates instances of ServerConnection based on the connection mode provided. diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java index cd1e76a..15dff3b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java @@ -28,6 +28,7 @@ import org.apache.geode.distributed.internal.PoolStatHelper; import org.apache.geode.distributed.internal.tcpserver.TcpHandler; import org.apache.geode.distributed.internal.tcpserver.TcpServer; import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.protocol.ClientProtocolMessageHandler; public class TcpServerFactory { private ClientProtocolMessageHandler protocolHandler; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java similarity index 87% rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java index 0ced3aa..3c9be1c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java @@ -13,12 +13,15 @@ * the License. */ -package org.apache.geode.internal.cache.tier.sockets; +package org.apache.geode.internal.protocol; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection; +import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory; + /** * This is an interface that other modules can implement to hook into diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java similarity index 95% rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java index 416cb28..f895688 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java @@ -13,13 +13,13 @@ * the License. */ -package org.apache.geode.internal.cache.tier.sockets; +package org.apache.geode.internal.protocol; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.distributed.Locator; import org.apache.geode.internal.exception.InvalidExecutionContextException; -import org.apache.geode.internal.security.server.Authorizer; +import org.apache.geode.internal.protocol.security.server.Authorizer; @Experimental public class MessageExecutionContext { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java similarity index 88% rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java index ca1cecd..418eecc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java @@ -1,8 +1,10 @@ -package org.apache.geode.internal.cache.tier.sockets; +package org.apache.geode.internal.protocol; import java.util.Iterator; import java.util.ServiceLoader; +import org.apache.geode.internal.cache.tier.sockets.ServiceLoadingFailureException; + public class ProtocolMessageHandlerLookupService { private ClientProtocolMessageHandler protocolHandler; diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java similarity index 97% rename from geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java index eddf190..f4d2b14 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.security.server; +package org.apache.geode.internal.protocol.security.server; import java.io.IOException; import java.io.InputStream; diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java similarity index 65% rename from geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java index 3ce811a..06c92e3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java @@ -1,4 +1,18 @@ -package org.apache.geode.internal.security.server; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.internal.protocol.security.server; import java.util.HashMap; import java.util.Map; diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java similarity index 94% rename from geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java index 861d2c0..b9c69fe 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.security.server; +package org.apache.geode.internal.protocol.security.server; import org.apache.geode.annotations.Experimental; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java similarity index 96% rename from geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java index 24d3a18..4b41c9f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.security.server; +package org.apache.geode.internal.protocol.security.server; import java.io.IOException; import java.io.InputStream; diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java similarity index 94% rename from geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java index d7f50b1..3f0e01a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.security.server; +package org.apache.geode.internal.protocol.security.server; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/package.html b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/package.html similarity index 100% rename from geode-core/src/main/java/org/apache/geode/internal/security/server/package.html rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/package.html diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator new file mode 100644 index 0000000..e115aae --- /dev/null +++ b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator @@ -0,0 +1 @@ +org.apache.geode.internal.protocol.security.server.NoOpAuthenticator \ No newline at end of file diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator deleted file mode 100644 index f459a51..0000000 --- a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator +++ /dev/null @@ -1 +0,0 @@ -org.apache.geode.internal.security.server.NoOpAuthenticator \ No newline at end of file diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java index e1a6f9f..8e9e4c0 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java @@ -15,7 +15,7 @@ package org.apache.geode.protocol.operations; import org.apache.geode.annotations.Experimental; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.protobuf.ProtobufOpsProcessor; import org.apache.geode.protocol.responses.Result; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java index a06c655..555c189 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java @@ -15,13 +15,13 @@ package org.apache.geode.protocol.protobuf; import org.apache.geode.annotations.Experimental; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; -import org.apache.geode.internal.security.server.Authorizer; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.Authorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.protocol.responses.Failure; import org.apache.geode.protocol.responses.Result; import org.apache.geode.serialization.SerializationService; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java index f28c310..22534ab 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java @@ -20,8 +20,8 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.geode.annotations.Experimental; -import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.ClientProtocolMessageHandler; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.protocol.exception.InvalidProtocolMessageException; import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java index 85a3f81..9715ea8 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java @@ -19,7 +19,7 @@ import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.PartitionedRegionStorageException; import org.apache.geode.cache.Region; import org.apache.geode.cache.TimeoutException; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.internal.protocol.protobuf.RegionAPI; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java index eefd9f0..1c9a6fa 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.geode.annotations.Experimental; import org.apache.geode.distributed.internal.InternalLocator; import org.apache.geode.distributed.internal.ServerLocation; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.internal.protocol.protobuf.ServerAPI; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java index 98a24c0..e819b1f 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java @@ -18,7 +18,7 @@ import java.util.Set; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.internal.protocol.protobuf.RegionAPI; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java index fcf0cfa..2e94cb8 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.operations.OperationHandler; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java index eeea966..5f37a76 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.internal.protocol.protobuf.BasicTypes; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java index 845f6cf..03f7379 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.internal.protocol.protobuf.BasicTypes; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java index bcd0fdd..3a89fa2 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.internal.protocol.protobuf.BasicTypes; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java index 51ff1e2..6d9b7a8 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java @@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.protocol.responses.Failure; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java index 3d6bf58..ed2b9ec 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java @@ -17,10 +17,10 @@ package org.apache.geode.protocol.protobuf.security.server; import org.apache.geode.management.internal.security.ResourceConstants; import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI; import org.apache.geode.security.AuthenticationRequiredException; -import org.apache.geode.internal.security.server.Authenticator; +import org.apache.geode.internal.protocol.security.server.Authenticator; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.SecurityManager; -import org.apache.geode.internal.security.server.Authorizer; +import org.apache.geode.internal.protocol.security.server.Authorizer; import java.io.EOFException; import java.io.IOException; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java index e0d7474..a67f9c4 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.security.server; import org.apache.geode.security.ResourcePermission; import org.apache.geode.security.SecurityManager; -import org.apache.geode.internal.security.server.Authorizer; +import org.apache.geode.internal.protocol.security.server.Authorizer; public class ProtobufSimpleAuthorizer implements Authorizer { private final Object authenticatedPrincipal; diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler similarity index 100% rename from geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler rename to geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator similarity index 100% rename from geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator rename to geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java index 50ef5b1..6020b58 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java @@ -23,8 +23,9 @@ import org.apache.geode.internal.Assert; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.cache.tier.CommunicationMode; +import org.apache.geode.internal.protocol.ClientProtocolMessageHandler; import org.apache.geode.internal.security.SecurityService; -import org.apache.geode.internal.security.server.AuthenticatorLookupService; +import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService; import org.apache.geode.test.junit.categories.UnitTest; import org.junit.Test; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java index b38771b..cf67a10 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java @@ -71,7 +71,6 @@ import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.geode.util.test.TestUtil; @@ -276,18 +275,16 @@ public class RoundTripCacheConnectionJUnitTest { @Test public void testConnectionCountIsProperlyDecremented() throws Exception { - CacheServer cacheServer = this.cache.getCacheServers().stream().findFirst().get(); + CacheServer cacheServer = this.cache.getCacheServers().get(0); AcceptorImpl acceptor = ((CacheServerImpl) cacheServer).getAcceptor(); - Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> { - return acceptor.getClientServerCnxCount() == 1; - }); + Awaitility.await().atMost(30, TimeUnit.SECONDS) + .until(() -> acceptor.getClientServerCnxCount() == 1); // run another test that creates a connection to the server testNewProtocolGetRegionNamesCallSucceeds(); assertFalse(socket.isClosed()); socket.close(); - Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> { - return acceptor.getClientServerCnxCount() == 0; - }); + Awaitility.await().atMost(30, TimeUnit.SECONDS) + .until(() -> acceptor.getClientServerCnxCount() == 0); } @Test @@ -404,8 +401,7 @@ public class RoundTripCacheConnectionJUnitTest { private void validateGetResponse(Socket socket, ProtobufProtocolSerializer protobufProtocolSerializer, Object expectedValue) - throws InvalidProtocolMessageException, IOException, UnsupportedEncodingTypeException, - CodecNotRegisteredForTypeException, CodecAlreadyRegisteredForTypeException { + throws InvalidProtocolMessageException, IOException { ClientProtocol.Response response = deserializeResponse(socket, protobufProtocolSerializer, TEST_GET_CORRELATION_ID); @@ -457,9 +453,8 @@ public class RoundTripCacheConnectionJUnitTest { } private void validateGetAllResponse(Socket socket, - ProtobufProtocolSerializer protobufProtocolSerializer) - throws InvalidProtocolMessageException, IOException, UnsupportedEncodingTypeException, - CodecNotRegisteredForTypeException, CodecAlreadyRegisteredForTypeException { + ProtobufProtocolSerializer protobufProtocolSerializer) throws InvalidProtocolMessageException, + IOException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { ClientProtocol.Response response = deserializeResponse(socket, protobufProtocolSerializer, TEST_GET_CORRELATION_ID); assertEquals(ClientProtocol.Response.ResponseAPICase.GETALLRESPONSE, diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java index 6e93129..44f5158 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.MessageExecutionContext; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java index 9b1bc44..9b75a7c 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.internal.protocol.protobuf.RegionAPI; @@ -41,7 +41,7 @@ import org.apache.geode.protocol.responses.Result; import org.apache.geode.protocol.responses.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java index 32bf5db..a38767a 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java @@ -19,7 +19,7 @@ import org.apache.geode.distributed.internal.LocatorLoadSnapshot; import org.apache.geode.distributed.internal.ServerLocation; import org.apache.geode.distributed.internal.ServerLocator; import org.apache.geode.internal.exception.InvalidExecutionContextException; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.responses.Result; import org.apache.geode.internal.protocol.protobuf.ServerAPI; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java index 7f79f25..dfb5798 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java @@ -27,13 +27,13 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.responses.Result; import org.apache.geode.protocol.responses.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java index 15c84c3..ae6fdec 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java @@ -19,7 +19,7 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.protocol.MessageUtil; import org.apache.geode.internal.protocol.protobuf.BasicTypes; @@ -28,7 +28,7 @@ import org.apache.geode.protocol.responses.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.responses.Result; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java index 370ed41..e45c9b7 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import com.google.protobuf.ByteString; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.responses.Failure; @@ -26,7 +26,7 @@ import org.apache.geode.protocol.responses.Result; import org.apache.geode.protocol.responses.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java index 816ea5e..b0acb22 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java @@ -15,7 +15,7 @@ package org.apache.geode.protocol.protobuf.operations; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.internal.protocol.protobuf.RegionAPI; @@ -23,7 +23,7 @@ import org.apache.geode.protocol.responses.Result; import org.apache.geode.protocol.responses.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java index c3c4e73..d4d988c 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import com.google.protobuf.ByteString; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.responses.Failure; @@ -26,7 +26,7 @@ import org.apache.geode.protocol.responses.Result; import org.apache.geode.protocol.responses.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java index b149fbe..9c89e74 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import com.google.protobuf.ByteString; import org.apache.geode.cache.Region; -import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; +import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.internal.protocol.protobuf.ClientProtocol; @@ -27,7 +27,7 @@ import org.apache.geode.protocol.responses.Result; import org.apache.geode.protocol.responses.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.security.server.NoOpAuthorizer; +import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java similarity index 99% rename from geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java rename to geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java index 02a053f..9db8342 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.protocol; +package org.apache.geode.protocol.security.server; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthorizationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java similarity index 99% rename from geode-protobuf/src/test/java/org/apache/geode/protocol/AuthorizationIntegrationTest.java rename to geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java index 47bdbf5..c518ca8 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthorizationIntegrationTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.protocol; +package org.apache.geode.protocol.security.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
