Repository: geode Updated Branches: refs/heads/develop 8309d44ed -> 174fe1bd3
GEODE-3473: Initial commit of the internal package renaming refactor, starting with proto file package location. Changing the protobuf file refactor first. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/174fe1bd Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/174fe1bd Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/174fe1bd Branch: refs/heads/develop Commit: 174fe1bd35ac183a0a8661bc16bbd37ca560c4f5 Parents: 8309d44 Author: Udo Kohlmeyer <[email protected]> Authored: Thu Aug 24 12:54:38 2017 -0700 Committer: Udo Kohlmeyer <[email protected]> Committed: Fri Aug 25 09:05:57 2017 -0700 ---------------------------------------------------------------------- .../geode/protocol/protobuf/EncodingTypeTranslator.java | 1 + .../java/org/apache/geode/protocol/protobuf/Failure.java | 1 + .../apache/geode/protocol/protobuf/OperationContext.java | 2 ++ .../geode/protocol/protobuf/ProtobufOpsProcessor.java | 1 + .../protocol/protobuf/ProtobufSerializationService.java | 1 + .../protocol/protobuf/ProtobufSimpleAuthenticator.java | 1 + .../geode/protocol/protobuf/ProtobufStreamProcessor.java | 1 + .../java/org/apache/geode/protocol/protobuf/Result.java | 1 + .../java/org/apache/geode/protocol/protobuf/Success.java | 1 + .../operations/GetAllRequestOperationHandler.java | 4 ++-- .../operations/GetAvailableServersOperationHandler.java | 4 ++-- .../GetRegionNamesRequestOperationHandler.java | 2 +- .../operations/GetRegionRequestOperationHandler.java | 4 ++-- .../protobuf/operations/GetRequestOperationHandler.java | 4 ++-- .../operations/PutAllRequestOperationHandler.java | 4 ++-- .../protobuf/operations/PutRequestOperationHandler.java | 4 ++-- .../operations/RemoveRequestOperationHandler.java | 2 +- .../protobuf/registry/OperationContextRegistry.java | 4 ++-- .../protobuf/serializer/ProtobufProtocolSerializer.java | 2 +- .../protobuf/utilities/ProtobufRequestUtilities.java | 10 ++++------ .../protobuf/utilities/ProtobufResponseUtilities.java | 4 ++-- .../protocol/protobuf/utilities/ProtobufUtilities.java | 6 +++--- geode-protobuf/src/main/proto/authentication_API.proto | 2 +- geode-protobuf/src/main/proto/basicTypes.proto | 2 +- geode-protobuf/src/main/proto/clientProtocol.proto | 2 +- geode-protobuf/src/main/proto/region_API.proto | 2 +- geode-protobuf/src/main/proto/server_API.proto | 2 +- .../geode/protocol/AuthenticationIntegrationTest.java | 7 +++---- .../test/java/org/apache/geode/protocol/MessageUtil.java | 6 +++--- .../protocol/RoundTripCacheConnectionJUnitTest.java | 6 +++--- .../protocol/RoundTripLocatorConnectionJUnitTest.java | 11 +++-------- ...codingTypeToSerializationTypeTranslatorJUnitTest.java | 1 + .../protobuf/ProtobufSimpleAuthenticatorJUnitTest.java | 1 + .../GetAllRequestOperationHandlerJUnitTest.java | 4 ++-- .../GetAvailableServersOperationHandlerJUnitTest.java | 7 +++---- .../GetRegionNamesRequestOperationHandlerJUnitTest.java | 2 +- .../GetRegionRequestOperationHandlerJUnitTest.java | 6 +++--- .../operations/GetRequestOperationHandlerJUnitTest.java | 4 ++-- .../PutAllRequestOperationHandlerJUnitTest.java | 4 ++-- .../operations/PutRequestOperationHandlerJUnitTest.java | 4 ++-- .../RemoveRequestOperationHandlerJUnitTest.java | 6 +++--- .../protobuf/utilities/ProtobufUtilitiesJUnitTest.java | 2 +- .../serializer/ProtobufProtocolSerializerJUnitTest.java | 2 +- 43 files changed, 75 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java index 2a3bf54..ab2d118 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java @@ -19,6 +19,7 @@ import java.util.HashMap; import org.apache.geode.annotations.Experimental; import org.apache.geode.pdx.JSONFormatter; import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java index f8de911..efddcca 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java @@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; import org.apache.geode.annotations.Experimental; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; @Experimental public class Failure<SuccessType> implements Result<SuccessType> { http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java index 5191007..efaa40d 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java @@ -18,6 +18,8 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; import org.apache.geode.annotations.Experimental; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.operations.OperationHandler; @Experimental http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java ---------------------------------------------------------------------- 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 3619e0d..b3eeb3a 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 @@ -17,6 +17,7 @@ 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.cache.tier.sockets.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.serialization.SerializationService; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java index 8246f1c..4abf19e 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java @@ -15,6 +15,7 @@ package org.apache.geode.protocol.protobuf; import org.apache.geode.annotations.Experimental; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java index 00285bb..02111dd 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java @@ -15,6 +15,7 @@ package org.apache.geode.protocol.protobuf; import org.apache.geode.management.internal.security.ResourceConstants; +import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI; import org.apache.geode.security.StreamAuthenticator; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.SecurityManager; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java ---------------------------------------------------------------------- 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 accb899..f28c310 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 @@ -23,6 +23,7 @@ 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.protocol.exception.InvalidProtocolMessageException; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry; import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java index 5f62997..ff673bc 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java @@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; import org.apache.geode.annotations.Experimental; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; @Experimental public interface Result<SuccessType> { http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java index 63f8b3f..00b7aef 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java @@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; import org.apache.geode.annotations.Experimental; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; @Experimental public class Success<SuccessType> implements Result<SuccessType> { http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java ---------------------------------------------------------------------- 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 77cef67..c503f4e 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 @@ -23,10 +23,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java ---------------------------------------------------------------------- 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 c1c3e99..58446fa 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 @@ -24,9 +24,9 @@ import org.apache.geode.distributed.internal.ServerLocation; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Result; -import org.apache.geode.protocol.protobuf.ServerAPI; +import org.apache.geode.internal.protocol.protobuf.ServerAPI; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.serialization.SerializationService; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java ---------------------------------------------------------------------- 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 e2edfed..3b5c47d 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 @@ -21,7 +21,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java ---------------------------------------------------------------------- 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 5a8d4d3..3388e39 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 @@ -18,11 +18,11 @@ 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.cache.tier.sockets.InvalidExecutionContextException; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java ---------------------------------------------------------------------- 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 504189e..9e2c151 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 @@ -19,10 +19,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java ---------------------------------------------------------------------- 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 99c7766..5bbf27b 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 @@ -25,10 +25,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java ---------------------------------------------------------------------- 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 e94127b..ac84a2e 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 @@ -19,10 +19,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java ---------------------------------------------------------------------- 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 94e3504..9203899 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 @@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextExcep import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java index dfe975c..599d15d 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.geode.annotations.Experimental; -import org.apache.geode.protocol.protobuf.ClientProtocol; -import org.apache.geode.protocol.protobuf.ClientProtocol.Request.RequestAPICase; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol.Request.RequestAPICase; import org.apache.geode.protocol.protobuf.OperationContext; import org.apache.geode.protocol.protobuf.operations.GetAllRequestOperationHandler; import org.apache.geode.protocol.protobuf.operations.GetAvailableServersOperationHandler; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java index d82f9b9..6da3253 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java @@ -20,7 +20,7 @@ import java.io.OutputStream; import org.apache.geode.annotations.Experimental; import org.apache.geode.protocol.exception.InvalidProtocolMessageException; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.serializer.ProtocolSerializer; @Experimental http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java index 520daef..fb0256b 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java @@ -14,13 +14,11 @@ */ package org.apache.geode.protocol.protobuf.utilities; -import java.util.Set; - import org.apache.geode.annotations.Experimental; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; -import org.apache.geode.protocol.protobuf.RegionAPI; -import org.apache.geode.protocol.protobuf.ServerAPI; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.ServerAPI; import java.util.Set; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java index cedb11a..0528bd6 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java @@ -20,9 +20,9 @@ import org.apache.logging.log4j.Logger; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; /** http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java index 8310632..b819680 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java @@ -19,11 +19,11 @@ import com.google.protobuf.ByteString; import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.EncodingTypeTranslator; import org.apache.geode.protocol.protobuf.ProtobufSerializationService; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.utilities.exception.UnknownProtobufPrimitiveType; import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/authentication_API.proto ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/proto/authentication_API.proto b/geode-protobuf/src/main/proto/authentication_API.proto index 0e651bd..be6721e 100644 --- a/geode-protobuf/src/main/proto/authentication_API.proto +++ b/geode-protobuf/src/main/proto/authentication_API.proto @@ -14,7 +14,7 @@ */ syntax = "proto3"; -package org.apache.geode.protocol.protobuf; +package org.apache.geode.internal.protocol.protobuf; message SimpleAuthenticationRequest { string username = 1; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/basicTypes.proto ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/proto/basicTypes.proto b/geode-protobuf/src/main/proto/basicTypes.proto index 5f63f6c..2d042c9 100644 --- a/geode-protobuf/src/main/proto/basicTypes.proto +++ b/geode-protobuf/src/main/proto/basicTypes.proto @@ -20,7 +20,7 @@ syntax = "proto3"; -package org.apache.geode.protocol.protobuf; +package org.apache.geode.internal.protocol.protobuf; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/clientProtocol.proto ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/proto/clientProtocol.proto b/geode-protobuf/src/main/proto/clientProtocol.proto index 91783b2..9168c4f 100644 --- a/geode-protobuf/src/main/proto/clientProtocol.proto +++ b/geode-protobuf/src/main/proto/clientProtocol.proto @@ -19,7 +19,7 @@ */ syntax = "proto3"; -package org.apache.geode.protocol.protobuf; +package org.apache.geode.internal.protocol.protobuf; import "google/protobuf/any.proto"; import "region_API.proto"; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/region_API.proto ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/proto/region_API.proto b/geode-protobuf/src/main/proto/region_API.proto index 40bf882..77a164b 100644 --- a/geode-protobuf/src/main/proto/region_API.proto +++ b/geode-protobuf/src/main/proto/region_API.proto @@ -19,7 +19,7 @@ */ syntax = "proto3"; -package org.apache.geode.protocol.protobuf; +package org.apache.geode.internal.protocol.protobuf; import "basicTypes.proto"; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/server_API.proto ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/proto/server_API.proto b/geode-protobuf/src/main/proto/server_API.proto index 201db8f..ae608da 100644 --- a/geode-protobuf/src/main/proto/server_API.proto +++ b/geode-protobuf/src/main/proto/server_API.proto @@ -19,7 +19,7 @@ */ syntax = "proto3"; -package org.apache.geode.protocol.protobuf; +package org.apache.geode.internal.protocol.protobuf; import "basicTypes.proto"; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java index f138538..afd5de1 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java @@ -17,13 +17,12 @@ package org.apache.geode.protocol; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.server.CacheServer; -import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.management.internal.security.ResourceConstants; -import org.apache.geode.protocol.protobuf.AuthenticationAPI; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.ProtobufSerializationService; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.security.SecurityManager; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java index 4798fd5..a639c33 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java @@ -14,9 +14,9 @@ */ package org.apache.geode.protocol; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.serialization.SerializationService; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java ---------------------------------------------------------------------- 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 0fbf9a9..a7d633e 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 @@ -61,10 +61,10 @@ import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnect import org.apache.geode.internal.net.SocketCreator; import org.apache.geode.internal.net.SocketCreatorFactory; import org.apache.geode.protocol.exception.InvalidProtocolMessageException; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.ProtobufSerializationService; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java index 14d8c44..019210b 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java @@ -40,21 +40,17 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.distributed.Locator; -import org.apache.geode.distributed.internal.InternalLocator; -import org.apache.geode.internal.AvailablePort; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl; import org.apache.geode.protocol.exception.InvalidProtocolMessageException; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.ServerAPI; +import org.apache.geode.internal.protocol.protobuf.ServerAPI; import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.test.dunit.DistributedTestUtils; import org.apache.geode.test.dunit.Host; -import org.apache.geode.test.dunit.LogWriterUtils; -import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.junit.categories.DistributedTest; @@ -63,7 +59,6 @@ public class RoundTripLocatorConnectionJUnitTest extends JUnit4CacheTestCase { private Socket socket; private DataOutputStream dataOutputStream; - private Locator locator; @Rule public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); @@ -72,7 +67,7 @@ public class RoundTripLocatorConnectionJUnitTest extends JUnit4CacheTestCase { public void setup() throws IOException { Host host = Host.getHost(0); int locatorPort = DistributedTestUtils.getDUnitLocatorPort(); - int cacheServer1Port = startCacheWithCacheServer(); + startCacheWithCacheServer(); Host.getLocator().invoke(() -> System.setProperty("geode.feature-protobuf-protocol", "true")); http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java index fc1a96d..0c8a4dc 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java @@ -16,6 +16,7 @@ package org.apache.geode.protocol.protobuf; import static org.junit.Assert.assertSame; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java index 71f4daf..c80b7c8 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java @@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf; import org.apache.geode.examples.security.ExampleSecurityManager; import org.apache.geode.management.internal.security.ResourceConstants; +import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.ResourcePermission; import org.apache.geode.security.SecurityManager; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 64ee50b..582dcb2 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 @@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 406beea..accb3f4 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 @@ -20,10 +20,10 @@ import org.apache.geode.distributed.internal.ServerLocation; import org.apache.geode.distributed.internal.ServerLocator; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Result; -import org.apache.geode.protocol.protobuf.ServerAPI; -import org.apache.geode.protocol.protobuf.ServerAPI.GetAvailableServersResponse; +import org.apache.geode.internal.protocol.protobuf.ServerAPI; +import org.apache.geode.internal.protocol.protobuf.ServerAPI.GetAvailableServersResponse; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.test.junit.categories.UnitTest; @@ -32,7 +32,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import java.util.ArrayList; -import java.util.HashMap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 2fcf575..50853b1 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 @@ -29,7 +29,7 @@ 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.cache.tier.sockets.InvalidExecutionContextException; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 60d4985..b836562 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 @@ -22,11 +22,11 @@ import org.apache.geode.cache.Scope; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException; import org.apache.geode.protocol.MessageUtil; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 6885666..d5272e8 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 @@ -18,10 +18,10 @@ 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.cache.tier.sockets.InvalidExecutionContextException; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 955013f..1a59a81 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 @@ -17,8 +17,8 @@ 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.cache.tier.sockets.InvalidExecutionContextException; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 d36ad41..a27987c 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 @@ -18,10 +18,10 @@ 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.cache.tier.sockets.InvalidExecutionContextException; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- 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 4350ece..41b806e 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 @@ -18,11 +18,11 @@ 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.cache.tier.sockets.InvalidExecutionContextException; -import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; -import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java index 46597a5..14b4b77 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.utilities; import com.google.protobuf.ByteString; -import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.utilities.exception.UnknownProtobufPrimitiveType; import org.apache.geode.test.junit.categories.UnitTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java index 0f6435a..af5b54e 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java @@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category; import org.apache.geode.protocol.MessageUtil; import org.apache.geode.protocol.exception.InvalidProtocolMessageException; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.test.junit.categories.UnitTest;
