GEODE-3402: Mark ProtoBuf interface as experimental. This now closes #698 Signed-off-by: Alexander Murmann <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a6000684 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a6000684 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a6000684 Branch: refs/heads/feature/GEODE-1279 Commit: a600068477bb07abb04206ab9540dfef09e89506 Parents: 87bee08 Author: Bruce Schuchardt <[email protected]> Authored: Tue Aug 8 16:29:29 2017 -0700 Committer: Udo Kohlmeyer <[email protected]> Committed: Mon Aug 14 17:06:13 2017 -0700 ---------------------------------------------------------------------- .../InvalidProtocolMessageException.java | 3 +++ .../protocol/operations/OperationHandler.java | 2 ++ .../protobuf/EncodingTypeTranslator.java | 2 ++ .../apache/geode/protocol/protobuf/Failure.java | 3 +++ .../protocol/protobuf/OperationContext.java | 6 ++++-- .../protocol/protobuf/ProtobufOpsProcessor.java | 2 ++ .../protobuf/ProtobufSerializationService.java | 2 ++ .../protobuf/ProtobufStreamProcessor.java | 2 ++ .../apache/geode/protocol/protobuf/Result.java | 3 +++ .../apache/geode/protocol/protobuf/Success.java | 3 +++ .../GetAllRequestOperationHandler.java | 10 ++++++---- .../GetAvailableServersOperationHandler.java | 19 +++++++++++-------- .../GetRegionNamesRequestOperationHandler.java | 2 ++ .../GetRegionRequestOperationHandler.java | 2 ++ .../operations/GetRequestOperationHandler.java | 2 ++ .../PutAllRequestOperationHandler.java | 13 ++++++++----- .../operations/PutRequestOperationHandler.java | 2 ++ .../RemoveRequestOperationHandler.java | 7 +++++-- .../registry/OperationContextRegistry.java | 2 ++ .../serializer/ProtobufProtocolSerializer.java | 2 ++ .../utilities/ProtobufPrimitiveTypes.java | 2 ++ .../utilities/ProtobufRequestUtilities.java | 4 ++++ .../utilities/ProtobufResponseUtilities.java | 9 ++++++--- .../protobuf/utilities/ProtobufUtilities.java | 2 ++ .../exception/UnknownProtobufPrimitiveType.java | 3 +++ .../protocol/serializer/ProtocolSerializer.java | 2 ++ .../serialization/SerializationService.java | 2 ++ .../geode/serialization/SerializationType.java | 2 ++ .../apache/geode/serialization/TypeCodec.java | 3 +++ .../geode/serialization/codec/BinaryCodec.java | 2 ++ .../geode/serialization/codec/BooleanCodec.java | 6 ++++-- .../geode/serialization/codec/ByteCodec.java | 2 ++ .../geode/serialization/codec/DoubleCodec.java | 2 ++ .../geode/serialization/codec/FloatCodec.java | 2 ++ .../geode/serialization/codec/IntCodec.java | 2 ++ .../geode/serialization/codec/JSONCodec.java | 2 ++ .../geode/serialization/codec/LongCodec.java | 2 ++ .../geode/serialization/codec/ShortCodec.java | 2 ++ .../geode/serialization/codec/StringCodec.java | 2 ++ .../UnsupportedEncodingTypeException.java | 3 +++ .../registry/SerializationCodecRegistry.java | 2 ++ .../CodecAlreadyRegisteredForTypeException.java | 3 +++ .../CodecNotRegisteredForTypeException.java | 3 +++ geode-protobuf/src/main/proto/basicTypes.proto | 6 ++++++ .../src/main/proto/clientProtocol.proto | 5 +++++ geode-protobuf/src/main/proto/region_API.proto | 5 +++++ geode-protobuf/src/main/proto/server_API.proto | 5 +++++ 47 files changed, 148 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java index 8903b8a..29f5a01 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java @@ -14,9 +14,12 @@ */ package org.apache.geode.protocol.exception; +import org.apache.geode.annotations.Experimental; + /** * Indicates that a message didn't properly follow its protocol specification. */ +@Experimental public class InvalidProtocolMessageException extends Exception { public InvalidProtocolMessageException(String message) { super(message); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java ---------------------------------------------------------------------- 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 92a844f..aa6d79e 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 @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.operations; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.protocol.protobuf.ProtobufOpsProcessor; import org.apache.geode.protocol.protobuf.Result; @@ -25,6 +26,7 @@ import org.apache.geode.serialization.SerializationService; * * See {@link ProtobufOpsProcessor} */ +@Experimental public interface OperationHandler<Req, Resp> { /** * Decode the message, deserialize contained values using the serialization service, do the work http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 ec12661..2a3bf54 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 @@ -16,6 +16,7 @@ package org.apache.geode.protocol.protobuf; 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.serialization.SerializationType; @@ -24,6 +25,7 @@ import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException /** * This class maps protobuf specific encoding types and the corresponding serialization types. */ +@Experimental public abstract class EncodingTypeTranslator { static final HashMap<Class, BasicTypes.EncodingType> typeToEncodingMap = intializeTypeMap(); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 fcbbb50..f8de911 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 @@ -16,6 +16,9 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; +import org.apache.geode.annotations.Experimental; + +@Experimental public class Failure<SuccessType> implements Result<SuccessType> { private final BasicTypes.ErrorResponse errorResponse; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 72e4d75..5191007 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 @@ -15,10 +15,12 @@ package org.apache.geode.protocol.protobuf; -import org.apache.geode.protocol.operations.OperationHandler; - import java.util.function.Function; +import org.apache.geode.annotations.Experimental; +import org.apache.geode.protocol.operations.OperationHandler; + +@Experimental public class OperationContext<OperationRequest, OperationResponse> { private final OperationHandler<OperationRequest, OperationResponse> operationHandler; private final Function<ClientProtocol.Request, OperationRequest> fromRequest; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 c11b534..7d75b4a 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 @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.protobuf; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry; import org.apache.geode.serialization.SerializationService; @@ -22,6 +23,7 @@ import org.apache.geode.serialization.SerializationService; * This handles protobuf requests by determining the operation type of the request and dispatching * it to the appropriate handler. */ +@Experimental public class ProtobufOpsProcessor { private final OperationContextRegistry operationContextRegistry; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 38bf56a..8246f1c 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 @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.protobuf; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; @@ -22,6 +23,7 @@ import org.apache.geode.serialization.registry.SerializationCodecRegistry; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; +@Experimental public class ProtobufSerializationService implements SerializationService<BasicTypes.EncodingType> { private SerializationCodecRegistry serializationCodecRegistry = new SerializationCodecRegistry(); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 118ccc4..648ab3c 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 @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler; @@ -33,6 +34,7 @@ import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredF * messages, hands the requests to an appropriate handler, wraps the response in a protobuf message, * and then pushes it to the output stream. */ +@Experimental public class ProtobufStreamProcessor implements ClientProtocolMessageHandler { private final ProtobufProtocolSerializer protobufProtocolSerializer; private final ProtobufOpsProcessor protobufOpsProcessor; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 14168bc..5f62997 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 @@ -16,6 +16,9 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; +import org.apache.geode.annotations.Experimental; + +@Experimental public interface Result<SuccessType> { <T> T map(Function<SuccessType, T> successFunction, Function<BasicTypes.ErrorResponse, T> errorFunction); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 2c409dd..63f8b3f 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 @@ -16,6 +16,9 @@ package org.apache.geode.protocol.protobuf; import java.util.function.Function; +import org.apache.geode.annotations.Experimental; + +@Experimental public class Success<SuccessType> implements Result<SuccessType> { private final SuccessType successResponse; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 7c8685f..7f2ffe4 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 @@ -14,6 +14,11 @@ */ package org.apache.geode.protocol.protobuf.operations; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -28,10 +33,7 @@ import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - +@Experimental public class GetAllRequestOperationHandler implements OperationHandler<RegionAPI.GetAllRequest, RegionAPI.GetAllResponse> { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 39c837a..e58c8cd 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 @@ -14,7 +14,17 @@ */ package org.apache.geode.protocol.protobuf.operations; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.HashSet; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.stream.Collectors; + import org.apache.commons.lang.StringUtils; + +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.internal.locator.GetAllServersRequest; import org.apache.geode.cache.client.internal.locator.GetAllServersResponse; @@ -32,14 +42,7 @@ import org.apache.geode.protocol.protobuf.ServerAPI; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.serialization.SerializationService; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Collection; -import java.util.HashSet; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.stream.Collectors; - +@Experimental public class GetAvailableServersOperationHandler implements OperationHandler<ServerAPI.GetAvailableServersRequest, ServerAPI.GetAvailableServersResponse> { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 50e121e..e5d216a 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 @@ -16,6 +16,7 @@ package org.apache.geode.protocol.protobuf.operations; import java.util.Set; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -25,6 +26,7 @@ import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.serialization.SerializationService; +@Experimental public class GetRegionNamesRequestOperationHandler implements OperationHandler<RegionAPI.GetRegionNamesRequest, RegionAPI.GetRegionNamesResponse> { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 5ad0cc1..3814bf6 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 @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.protobuf.operations; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -26,6 +27,7 @@ import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.serialization.SerializationService; +@Experimental public class GetRegionRequestOperationHandler implements OperationHandler<RegionAPI.GetRegionRequest, RegionAPI.GetRegionResponse> { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 861e518..1086bca 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 @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.protobuf.operations; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -28,6 +29,7 @@ import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; +@Experimental public class GetRequestOperationHandler implements OperationHandler<RegionAPI.GetRequest, RegionAPI.GetResponse> { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 49fd811..33e3ade 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 @@ -14,6 +14,13 @@ */ package org.apache.geode.protocol.protobuf.operations; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -28,12 +35,8 @@ 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.CodecNotRegisteredForTypeException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.Objects; -import java.util.stream.Collectors; +@Experimental public class PutAllRequestOperationHandler implements OperationHandler<RegionAPI.PutAllRequest, RegionAPI.PutAllResponse> { private static Logger logger = LogManager.getLogger(); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 9c51c87..637d8f1 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 @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.protobuf.operations; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -28,6 +29,7 @@ import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; +@Experimental public class PutRequestOperationHandler implements OperationHandler<RegionAPI.PutRequest, RegionAPI.PutResponse> { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 296f8b2..dbc58bf 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 @@ -14,6 +14,10 @@ */ package org.apache.geode.protocol.protobuf.operations; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.operations.OperationHandler; @@ -28,9 +32,8 @@ 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.CodecNotRegisteredForTypeException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +@Experimental public class RemoveRequestOperationHandler implements OperationHandler<RegionAPI.RemoveRequest, RegionAPI.RemoveResponse> { private static Logger logger = LogManager.getLogger(); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 b160adc..dfe975c 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 @@ -18,6 +18,7 @@ package org.apache.geode.protocol.protobuf.registry; 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.protocol.protobuf.OperationContext; @@ -30,6 +31,7 @@ import org.apache.geode.protocol.protobuf.operations.PutAllRequestOperationHandl import org.apache.geode.protocol.protobuf.operations.PutRequestOperationHandler; import org.apache.geode.protocol.protobuf.operations.RemoveRequestOperationHandler; +@Experimental public class OperationContextRegistry { private Map<RequestAPICase, OperationContext> operationContexts = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 1c6e847..d82f9b9 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 @@ -18,10 +18,12 @@ import java.io.IOException; import java.io.InputStream; 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.protocol.serializer.ProtocolSerializer; +@Experimental public class ProtobufProtocolSerializer implements ProtocolSerializer<ClientProtocol.Message> { @Override public ClientProtocol.Message deserialize(InputStream inputStream) http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufPrimitiveTypes.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufPrimitiveTypes.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufPrimitiveTypes.java index b26de20..90ce308 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufPrimitiveTypes.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufPrimitiveTypes.java @@ -14,8 +14,10 @@ */ package org.apache.geode.protocol.protobuf.utilities; +import org.apache.geode.annotations.Experimental; import org.apache.geode.protocol.protobuf.utilities.exception.UnknownProtobufPrimitiveType; +@Experimental public enum ProtobufPrimitiveTypes { STRING(String.class), http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 e184592..520daef 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,6 +14,9 @@ */ 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; @@ -27,6 +30,7 @@ import java.util.Set; * Response building helpers can be found in {@link ProtobufResponseUtilities}, while more general * purpose helpers can be found in {@link ProtobufUtilities} */ +@Experimental public abstract class ProtobufRequestUtilities { /** * Creates a request object containing a RegionAPI.GetRequest http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 bb3ef98..7bc766e 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 @@ -14,13 +14,15 @@ */ package org.apache.geode.protocol.protobuf.utilities; +import java.util.Set; + +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.protocol.protobuf.ProtocolErrorCode; import org.apache.geode.protocol.protobuf.RegionAPI; -import org.apache.logging.log4j.Logger; - -import java.util.Set; /** * This class contains helper functions for generating ClientProtocol.Response objects. @@ -28,6 +30,7 @@ import java.util.Set; * Request building helpers can be found in {@link ProtobufRequestUtilities}, while more general * purpose helpers can be found in {@link ProtobufUtilities} */ +@Experimental public abstract class ProtobufResponseUtilities { /** http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 fd35803..8310632 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 @@ -16,6 +16,7 @@ package org.apache.geode.protocol.protobuf.utilities; 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; @@ -37,6 +38,7 @@ import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTy * {@link ProtobufResponseUtilities} Helper functions specific to creating ClientProtocol.Requests * can be found at {@link ProtobufRequestUtilities} */ +@Experimental public abstract class ProtobufUtilities { /** * Creates a object containing the type and value encoding of a piece of data http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/exception/UnknownProtobufPrimitiveType.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/exception/UnknownProtobufPrimitiveType.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/exception/UnknownProtobufPrimitiveType.java index 675a2f0..ca1dc72 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/exception/UnknownProtobufPrimitiveType.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/exception/UnknownProtobufPrimitiveType.java @@ -14,6 +14,9 @@ */ package org.apache.geode.protocol.protobuf.utilities.exception; +import org.apache.geode.annotations.Experimental; + +@Experimental public class UnknownProtobufPrimitiveType extends Exception { public UnknownProtobufPrimitiveType(String message) { super(message); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/serializer/ProtocolSerializer.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/serializer/ProtocolSerializer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/serializer/ProtocolSerializer.java index 0a48e1b..36fc8ec 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/serializer/ProtocolSerializer.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/serializer/ProtocolSerializer.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.geode.annotations.Experimental; import org.apache.geode.protocol.exception.InvalidProtocolMessageException; /** @@ -25,6 +26,7 @@ import org.apache.geode.protocol.exception.InvalidProtocolMessageException; * * @param <T> The message type of the protocol. */ +@Experimental public interface ProtocolSerializer<T> { T deserialize(InputStream inputStream) throws InvalidProtocolMessageException; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationService.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationService.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationService.java index cdeb170..3373d44 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationService.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationService.java @@ -14,6 +14,7 @@ */ package org.apache.geode.serialization; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; @@ -23,6 +24,7 @@ import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTy * * @param <T> the enumeration of types known to a particular protocol */ +@Experimental public interface SerializationService<T> { Object decode(T encodingTypeValue, byte[] value) throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java index 91466a1..10a3e51 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java @@ -14,11 +14,13 @@ */ package org.apache.geode.serialization; +import org.apache.geode.annotations.Experimental; import org.apache.geode.pdx.PdxInstance; /** * Enumerates the serialization types currently available to wire protocols. */ +@Experimental public enum SerializationType { STRING(String.class), BINARY(byte[].class), http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/TypeCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/TypeCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/TypeCodec.java index 8506a53..f9edc09 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/TypeCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/TypeCodec.java @@ -14,6 +14,8 @@ */ package org.apache.geode.serialization; +import org.apache.geode.annotations.Experimental; + /** * This interface converts a particular type to and from its binary representation. * @@ -21,6 +23,7 @@ package org.apache.geode.serialization; * * @param <T> the type this codec knows how to convert */ +@Experimental public interface TypeCodec<T> { T decode(byte[] incoming); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java index c1bee43..cca88dd 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java @@ -14,9 +14,11 @@ */ package org.apache.geode.serialization.codec; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class BinaryCodec implements TypeCodec<byte[]> { @Override public byte[] decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java index e3e234d..ca0443c 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java @@ -14,11 +14,13 @@ */ package org.apache.geode.serialization.codec; +import java.nio.ByteBuffer; + +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; -import java.nio.ByteBuffer; - +@Experimental public class BooleanCodec implements TypeCodec<Boolean> { @Override public Boolean decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java index 8e71149..847d210 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.ByteBuffer; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class ByteCodec implements TypeCodec<Byte> { @Override public Byte decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java index ab09537..8f01639 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.ByteBuffer; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class DoubleCodec implements TypeCodec<Double> { @Override public Double decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java index 5ff79ce..75c1e0d 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.ByteBuffer; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class FloatCodec implements TypeCodec<Float> { @Override public Float decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java index ae4e4da..4366c84 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.ByteBuffer; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class IntCodec implements TypeCodec<Integer> { @Override public Integer decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/JSONCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/JSONCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/JSONCodec.java index eb1ebc3..b481375 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/JSONCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/JSONCodec.java @@ -14,11 +14,13 @@ */ package org.apache.geode.serialization.codec; +import org.apache.geode.annotations.Experimental; import org.apache.geode.pdx.JSONFormatter; import org.apache.geode.pdx.PdxInstance; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class JSONCodec implements TypeCodec<PdxInstance> { @Override public PdxInstance decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java index 7691db2..b6b8053 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.ByteBuffer; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class LongCodec implements TypeCodec<Long> { @Override public Long decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java index e927b11..df79fb0 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.ByteBuffer; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class ShortCodec implements TypeCodec<Short> { @Override public Short decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java index b137ad5..027f4ca 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java @@ -16,9 +16,11 @@ package org.apache.geode.serialization.codec; import java.nio.charset.Charset; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; +@Experimental public class StringCodec implements TypeCodec<String> { private static final Charset UTF8 = Charset.forName("UTF-8"); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/exception/UnsupportedEncodingTypeException.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/exception/UnsupportedEncodingTypeException.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/exception/UnsupportedEncodingTypeException.java index 1056002..4a18619 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/exception/UnsupportedEncodingTypeException.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/exception/UnsupportedEncodingTypeException.java @@ -14,9 +14,12 @@ */ package org.apache.geode.serialization.exception; +import org.apache.geode.annotations.Experimental; + /** * This indicates an encoding type that we don't know how to handle. */ +@Experimental public class UnsupportedEncodingTypeException extends Exception { public UnsupportedEncodingTypeException(String message) { super(message); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java index ec93a72..387d33f 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java @@ -17,11 +17,13 @@ package org.apache.geode.serialization.registry; import java.util.HashMap; import java.util.ServiceLoader; +import org.apache.geode.annotations.Experimental; import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; +@Experimental public class SerializationCodecRegistry { private HashMap<SerializationType, TypeCodec> codecRegistry = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java index 66ae850..dcab478 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java @@ -14,10 +14,13 @@ */ package org.apache.geode.serialization.registry.exception; +import org.apache.geode.annotations.Experimental; + /** * This indicates that we're attempting to register a codec for a type which we already have a * handler for. */ +@Experimental public class CodecAlreadyRegisteredForTypeException extends Exception { public CodecAlreadyRegisteredForTypeException(String message) { super(message); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecNotRegisteredForTypeException.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecNotRegisteredForTypeException.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecNotRegisteredForTypeException.java index 58cb691..18f255b 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecNotRegisteredForTypeException.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/exception/CodecNotRegisteredForTypeException.java @@ -14,9 +14,12 @@ */ package org.apache.geode.serialization.registry.exception; +import org.apache.geode.annotations.Experimental; + /** * This indicates we're attempting to handle a type for which we don't have a registered codec. */ +@Experimental public class CodecNotRegisteredForTypeException extends Exception { public CodecNotRegisteredForTypeException(String message) { super(message); http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 330b53b..684e4c8 100644 --- a/geode-protobuf/src/main/proto/basicTypes.proto +++ b/geode-protobuf/src/main/proto/basicTypes.proto @@ -13,6 +13,12 @@ * the License. */ +/* +* These ProtoBuf files are part of an experimental interface. +* Use this interface at your own risk. +*/ + + syntax = "proto3"; package org.apache.geode.protocol.protobuf; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 c64d4de..8203c43 100644 --- a/geode-protobuf/src/main/proto/clientProtocol.proto +++ b/geode-protobuf/src/main/proto/clientProtocol.proto @@ -13,6 +13,11 @@ * the License. */ +/* +* These ProtoBuf files are part of an experimental interface. +* Use this interface at your own risk. +*/ + syntax = "proto3"; package org.apache.geode.protocol.protobuf; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 2a93a7d..40bf882 100644 --- a/geode-protobuf/src/main/proto/region_API.proto +++ b/geode-protobuf/src/main/proto/region_API.proto @@ -13,6 +13,11 @@ * the License. */ +/* +* These ProtoBuf files are part of an experimental interface. +* Use this interface at your own risk. +*/ + syntax = "proto3"; package org.apache.geode.protocol.protobuf; http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/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 81622cc..201db8f 100644 --- a/geode-protobuf/src/main/proto/server_API.proto +++ b/geode-protobuf/src/main/proto/server_API.proto @@ -13,6 +13,11 @@ * the License. */ +/* +* These ProtoBuf files are part of an experimental interface. +* Use this interface at your own risk. +*/ + syntax = "proto3"; package org.apache.geode.protocol.protobuf;
