This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5bd8fcfef43156a0df574a2c7abd27fb73ce4821 Author: kohlmu-pivotal <[email protected]> AuthorDate: Wed Oct 25 12:45:57 2017 -0700 GEODE-3903: Moved serialization package to under protocol.serialization moved META-INF services from protobuf to client-protocol --- .../geode/internal/protocol/operations/OperationHandler.java | 2 +- .../{ => protocol}/serialization/SerializationService.java | 6 +++--- .../{ => protocol}/serialization/SerializationType.java | 2 +- .../internal/{ => protocol}/serialization/TypeCodec.java | 2 +- .../{ => protocol}/serialization/codec/JSONCodec.java | 6 +++--- .../exception/UnsupportedEncodingTypeException.java | 2 +- .../serialization/registry/SerializationCodecRegistry.java | 10 +++++----- .../exception/CodecAlreadyRegisteredForTypeException.java | 2 +- .../exception/CodecNotRegisteredForTypeException.java | 2 +- ...rg.apache.geode.internal.protocol.serialization.TypeCodec | 1 + .../internal/protocol/protobuf/EncodingTypeTranslator.java | 4 ++-- .../internal/protocol/protobuf/ProtobufOpsProcessor.java | 2 +- .../protocol/protobuf/ProtobufSerializationService.java | 12 ++++++------ .../protobuf/operations/GetAllRequestOperationHandler.java | 6 +++--- .../operations/GetAvailableServersOperationHandler.java | 2 +- .../operations/GetRegionNamesRequestOperationHandler.java | 2 +- .../operations/GetRegionRequestOperationHandler.java | 2 +- .../protobuf/operations/GetRequestOperationHandler.java | 6 +++--- .../protobuf/operations/PutAllRequestOperationHandler.java | 6 +++--- .../protobuf/operations/PutRequestOperationHandler.java | 6 +++--- .../protobuf/operations/RemoveRequestOperationHandler.java | 6 +++--- .../security/AuthenticationRequestOperationHandler.java | 2 +- .../protocol/protobuf/utilities/ProtobufUtilities.java | 6 +++--- .../org.apache.geode.internal.serialization.TypeCodec | 1 - .../java/org/apache/geode/internal/protocol/MessageUtil.java | 6 +++--- .../java/org/apache/geode/internal/protocol/OpsHandler.java | 2 +- .../protocol/acceptance/CacheConnectionJUnitTest.java | 2 +- .../protocol/acceptance/CacheConnectionTimeoutJUnitTest.java | 2 +- .../protocol/acceptance/CacheOperationsJUnitTest.java | 6 +++--- .../EncodingTypeToSerializationTypeTranslatorJUnitTest.java | 4 ++-- .../operations/GetAllRequestOperationHandlerJUnitTest.java | 4 ++-- .../GetRegionNamesRequestOperationHandlerJUnitTest.java | 2 -- .../operations/GetRequestOperationHandlerJUnitTest.java | 4 ++-- .../protobuf/operations/OperationHandlerJUnitTest.java | 2 +- .../operations/PutAllRequestOperationHandlerJUnitTest.java | 4 ++-- .../operations/PutRequestOperationHandlerJUnitTest.java | 4 ++-- .../operations/RemoveRequestOperationHandlerJUnitTest.java | 4 ++-- .../internal/serialization/codec/JSONCodecJUnitTest.java | 1 + .../serialization/registry/CodecRegistryJUnitTest.java | 5 +++-- 39 files changed, 75 insertions(+), 75 deletions(-) diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java index a388166..def4134 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/operations/OperationHandler.java @@ -18,7 +18,7 @@ import org.apache.geode.annotations.Experimental; import org.apache.geode.internal.protocol.MessageExecutionContext; import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.Result; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; /** * This interface is implemented by a object capable of handling request types 'Req' and returning diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/SerializationService.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/SerializationService.java similarity index 84% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/SerializationService.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/SerializationService.java index 5ca2b7c..8e6a265 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/SerializationService.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/SerializationService.java @@ -12,11 +12,11 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization; +package org.apache.geode.internal.protocol.serialization; import org.apache.geode.annotations.Experimental; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; /** * This interface takes an protocol specific encodingTypeValue enum and converts between objects and diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/SerializationType.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/SerializationType.java similarity index 95% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/SerializationType.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/SerializationType.java index 292cac9..2cb86fd 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/SerializationType.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/SerializationType.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization; +package org.apache.geode.internal.protocol.serialization; import org.apache.geode.annotations.Experimental; import org.apache.geode.pdx.PdxInstance; diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/TypeCodec.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/TypeCodec.java similarity index 95% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/TypeCodec.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/TypeCodec.java index 0e36d4e..55fce2a 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/TypeCodec.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/TypeCodec.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization; +package org.apache.geode.internal.protocol.serialization; import org.apache.geode.annotations.Experimental; diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/codec/JSONCodec.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java similarity index 86% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/codec/JSONCodec.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java index 9248589..93ec694 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/codec/JSONCodec.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/codec/JSONCodec.java @@ -12,13 +12,13 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization.codec; +package org.apache.geode.internal.protocol.serialization.codec; import org.apache.geode.annotations.Experimental; import org.apache.geode.pdx.JSONFormatter; import org.apache.geode.pdx.PdxInstance; -import org.apache.geode.internal.serialization.SerializationType; -import org.apache.geode.internal.serialization.TypeCodec; +import org.apache.geode.internal.protocol.serialization.SerializationType; +import org.apache.geode.internal.protocol.serialization.TypeCodec; @Experimental public class JSONCodec implements TypeCodec<PdxInstance> { diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/exception/UnsupportedEncodingTypeException.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/exception/UnsupportedEncodingTypeException.java similarity index 94% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/exception/UnsupportedEncodingTypeException.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/exception/UnsupportedEncodingTypeException.java index 02c2d24..c7b425e 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/exception/UnsupportedEncodingTypeException.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/exception/UnsupportedEncodingTypeException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization.exception; +package org.apache.geode.internal.protocol.serialization.exception; import org.apache.geode.annotations.Experimental; diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/SerializationCodecRegistry.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java similarity index 84% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/SerializationCodecRegistry.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java index 61f159d..6140beb 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/SerializationCodecRegistry.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/SerializationCodecRegistry.java @@ -12,17 +12,17 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization.registry; +package org.apache.geode.internal.protocol.serialization.registry; import java.util.HashMap; import java.util.ServiceLoader; import org.apache.geode.GemFireConfigException; import org.apache.geode.annotations.Experimental; -import org.apache.geode.internal.serialization.SerializationType; -import org.apache.geode.internal.serialization.TypeCodec; -import org.apache.geode.internal.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationType; +import org.apache.geode.internal.protocol.serialization.TypeCodec; @Experimental public class SerializationCodecRegistry { diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java similarity index 93% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java index b5adb34..45284ba 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/exception/CodecAlreadyRegisteredForTypeException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization.registry.exception; +package org.apache.geode.internal.protocol.serialization.registry.exception; import org.apache.geode.annotations.Experimental; diff --git a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/exception/CodecNotRegisteredForTypeException.java b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/exception/CodecNotRegisteredForTypeException.java similarity index 93% rename from geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/exception/CodecNotRegisteredForTypeException.java rename to geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/exception/CodecNotRegisteredForTypeException.java index d7a703b..3d554db 100644 --- a/geode-client-protocol/src/main/java/org/apache/geode/internal/serialization/registry/exception/CodecNotRegisteredForTypeException.java +++ b/geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serialization/registry/exception/CodecNotRegisteredForTypeException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.serialization.registry.exception; +package org.apache.geode.internal.protocol.serialization.registry.exception; import org.apache.geode.annotations.Experimental; diff --git a/geode-client-protocol/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.serialization.TypeCodec b/geode-client-protocol/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.serialization.TypeCodec new file mode 100644 index 0000000..fcbbeaf --- /dev/null +++ b/geode-client-protocol/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.serialization.TypeCodec @@ -0,0 +1 @@ +org.apache.geode.internal.protocol.serialization.codec.JSONCodec diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeTranslator.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeTranslator.java index 5ec3908..429aef2 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeTranslator.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeTranslator.java @@ -21,8 +21,8 @@ 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.serialization.SerializationType; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationType; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; /** * This class maps protobuf specific encoding types and the corresponding serialization types. diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufOpsProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufOpsProcessor.java index 5968e8e..79784eb 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufOpsProcessor.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufOpsProcessor.java @@ -26,7 +26,7 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.protobuf.registry.ProtobufOperationContextRegistry; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.security.SecurityProcessor; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; import org.apache.geode.security.AuthenticationRequiredException; import org.apache.geode.security.NotAuthorizedException; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSerializationService.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSerializationService.java index 8b8dbb3..c8d3f31 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSerializationService.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSerializationService.java @@ -15,12 +15,12 @@ package org.apache.geode.internal.protocol.protobuf; import org.apache.geode.annotations.Experimental; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.SerializationType; -import org.apache.geode.internal.serialization.TypeCodec; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.SerializationCodecRegistry; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationType; +import org.apache.geode.internal.protocol.serialization.TypeCodec; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.SerializationCodecRegistry; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; @Experimental public class ProtobufSerializationService implements SerializationService<BasicTypes.EncodingType> { diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandler.java index f697a68..9cf784f 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandler.java @@ -38,9 +38,9 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import static org.apache.geode.internal.protocol.ProtocolErrorCode.*; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAvailableServersOperationHandler.java index 87842ae..e466662 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAvailableServersOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAvailableServersOperationHandler.java @@ -29,7 +29,7 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.internal.protocol.protobuf.ServerAPI; import org.apache.geode.internal.protocol.Success; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; @Experimental public class GetAvailableServersOperationHandler implements diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java index f3f6007..2043440 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java @@ -26,7 +26,7 @@ import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; @Experimental public class GetRegionNamesRequestOperationHandler implements diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandler.java index 1e320ff..d79971b 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandler.java @@ -30,7 +30,7 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; import static org.apache.geode.internal.protocol.ProtocolErrorCode.*; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandler.java index ec43bee..3f8cb0f 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandler.java @@ -30,9 +30,9 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import static org.apache.geode.internal.protocol.ProtocolErrorCode.*; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandler.java index 6a1b12a..847fdc8 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandler.java @@ -34,9 +34,9 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import static org.apache.geode.internal.protocol.ProtocolErrorCode.*; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandler.java index 59d4519..772f217 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandler.java @@ -30,9 +30,9 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import static org.apache.geode.internal.protocol.ProtocolErrorCode.*; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandler.java index 9c50f5c..ffb7d69 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandler.java @@ -29,9 +29,9 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufResponseUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import static org.apache.geode.internal.protocol.ProtocolErrorCode.*; diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/security/AuthenticationRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/security/AuthenticationRequestOperationHandler.java index 876e845..b15e856 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/security/AuthenticationRequestOperationHandler.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/security/AuthenticationRequestOperationHandler.java @@ -32,7 +32,7 @@ import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.internal.protocol.security.exception.IncompatibleAuthenticationMechanismsException; import org.apache.geode.internal.protocol.security.processors.AuthorizationSecurityProcessor; import org.apache.geode.internal.protocol.security.Authenticator; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; import org.apache.geode.security.AuthenticationFailedException; public class AuthenticationRequestOperationHandler implements diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufUtilities.java index 320a10c..0578d8f 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufUtilities.java +++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufUtilities.java @@ -25,9 +25,9 @@ import org.apache.geode.internal.protocol.protobuf.EncodingTypeTranslator; import org.apache.geode.internal.protocol.protobuf.ProtobufSerializationService; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.protobuf.utilities.exception.UnknownProtobufPrimitiveType; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; /** * This class contains helper functions for assistance in creating protobuf objects. This class is diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.TypeCodec b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.TypeCodec deleted file mode 100644 index 2c0fcdc..0000000 --- a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.TypeCodec +++ /dev/null @@ -1 +0,0 @@ -org.apache.geode.internal.serialization.codec.JSONCodec diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/MessageUtil.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/MessageUtil.java index 9f1e0c6..5767165 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/MessageUtil.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/MessageUtil.java @@ -19,9 +19,9 @@ import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; public class MessageUtil { diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/OpsHandler.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/OpsHandler.java index 2f86903..c0c83f5 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/OpsHandler.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/OpsHandler.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.protocol; -import org.apache.geode.internal.serialization.registry.SerializationCodecRegistry; +import org.apache.geode.internal.protocol.serialization.registry.SerializationCodecRegistry; public interface OpsHandler<Req, Resp> { Resp process(SerializationCodecRegistry serializationCodecRegistry, Req request); diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionJUnitTest.java index 8160cb8..a81a173 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionJUnitTest.java @@ -67,7 +67,7 @@ import org.apache.geode.internal.protocol.protobuf.ProtobufSerializationService; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.internal.protocol.protobuf.statistics.ProtobufClientStatisticsImpl; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.geode.util.test.TestUtil; diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionTimeoutJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionTimeoutJUnitTest.java index b0b7518..61a09f2 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionTimeoutJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionTimeoutJUnitTest.java @@ -47,7 +47,7 @@ import org.apache.geode.internal.protocol.MessageUtil; import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.internal.protocol.protobuf.ProtobufSerializationService; import org.apache.geode.internal.protocol.protobuf.serializer.ProtobufProtocolSerializer; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; import org.apache.geode.test.junit.categories.IntegrationTest; /** diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheOperationsJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheOperationsJUnitTest.java index 3a2b46e..4653cdb 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheOperationsJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheOperationsJUnitTest.java @@ -67,9 +67,9 @@ import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.protobuf.serializer.ProtobufProtocolSerializer; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.SerializationService; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.geode.util.test.TestUtil; diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java index 883b0f6..0052dff 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertSame; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.serialization.SerializationType; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationType; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java index 6465b64..288c92b 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java @@ -41,8 +41,8 @@ import org.apache.geode.internal.protocol.protobuf.BasicTypes; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java index c4268c7..3139579 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java @@ -36,8 +36,6 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java index dc9a211..5ca4ddc 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java @@ -35,8 +35,8 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/OperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/OperationHandlerJUnitTest.java index f1da7c8..247e354 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/OperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/OperationHandlerJUnitTest.java @@ -21,7 +21,7 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.Cache; import org.apache.geode.internal.protocol.operations.OperationHandler; -import org.apache.geode.internal.serialization.SerializationService; +import org.apache.geode.internal.protocol.serialization.SerializationService; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java index 66c99dc..174747e 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java @@ -37,8 +37,8 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java index 8f87b45..8e6a287 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java @@ -39,8 +39,8 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java index 14d15ba..cccd764 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java @@ -37,8 +37,8 @@ import org.apache.geode.internal.protocol.Result; import org.apache.geode.internal.protocol.Success; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/codec/JSONCodecJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/codec/JSONCodecJUnitTest.java index 5aaff81..cb039d4 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/codec/JSONCodecJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/codec/JSONCodecJUnitTest.java @@ -24,6 +24,7 @@ import org.apache.geode.cache.CacheFactory; import org.apache.geode.distributed.ConfigurationProperties; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.InternalCache; +import org.apache.geode.internal.protocol.serialization.codec.JSONCodec; import org.apache.geode.pdx.JSONFormatter; import org.apache.geode.pdx.PdxInstance; import org.apache.geode.pdx.PdxInstanceFactory; diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/registry/CodecRegistryJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/registry/CodecRegistryJUnitTest.java index c3c3a61..03d1d08 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/registry/CodecRegistryJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/serialization/registry/CodecRegistryJUnitTest.java @@ -21,8 +21,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.serialization.SerializationType; -import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.internal.protocol.serialization.SerializationType; +import org.apache.geode.internal.protocol.serialization.registry.SerializationCodecRegistry; +import org.apache.geode.internal.protocol.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
